From 28fefee660349f121c25686dfe07ac5cc7d25064 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 6 May 2019 14:50:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=A4=E4=BA=92=E3=80=91=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=88=B8=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=A1=B6=E9=83=A8title=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=B8=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 34 ++-- pages/coupon/detail/index.json | 2 +- pages/joinFrDpell/index.js | 1 - pages/main/spellGroup/index.js | 18 +- pages/spellGroup/mySpellGroup/index.js | 269 ++++++++++++------------- 5 files changed, 160 insertions(+), 164 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 9510b32..f8f5be2 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -375,7 +375,11 @@ Page({ that.setData({ onshow: false }) - that.getDetail(options.couponChannelId, 'notendclock'); + + if (options && options.couponChannelId){ + that.getDetail(options.couponChannelId, 'notendclock'); + } + /** * 转赠判断 */ @@ -414,23 +418,26 @@ Page({ showPage: true }) } - if (res.data.type == 100) { - wx.setNavigationBarTitle({ - title: "卡详情" - }) - } + /** + * 将优惠券优惠卡的详情的BarTitle + * 设置成券的名称 + */ + wx.setNavigationBarTitle({ + title: res.data.title + }) var EndTime = res.data.validStartDate; var NowTime = new Date().getTime(); - console.log(flag); + /** + * activityStatus==0 活动未开始 + * activityStatus==1 活动已开始 + * flag == endclock 说明倒计时已经结束 + */ if (res.data.endTime && res.data.beginTime) { that.setData({ begin_time: res.data.beginTime, end_time: res.data.endTime, }) - //activityStatus==0 活动未开始 - //activityStatus==1 活动已开始 - // flag == endclock 说明倒计时已经结束 if (res.data.activityStatus == 0 && flag != 'endclock') { that.countdown(res.data.beginTime); } else if (res.data.activityStatus != 0 && flag != 'endclock') { @@ -560,9 +567,8 @@ Page({ }) .catch(err => { if (err.code == 11005) { - // 用户手机未授权 /** - * 将值传到用户手机号授权的页面 + * 手机号没有授权,将值传到用户手机号授权的页面 * */ wx.redirectTo({ @@ -587,8 +593,7 @@ Page({ * 发起支付 */ orderFunc(discount) { - console.log(discount) - var that = this; + let that = this; Http.get({ url: config.api.checkPhoneStatus, data: {} @@ -715,7 +720,6 @@ Page({ } }) .then(res => { - console.log(res) if (discount != 'discount') { if (typeof(res) != "undefined") { let orderId = "" + res.data.id; diff --git a/pages/coupon/detail/index.json b/pages/coupon/detail/index.json index 38d079e..f7e2842 100644 --- a/pages/coupon/detail/index.json +++ b/pages/coupon/detail/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "券详情", + "navigationBarTitleText": "", "backgroundColor":"#f4f4f4", "enablePullDownRefresh": true } \ No newline at end of file diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index e177597..4302a7e 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -209,7 +209,6 @@ Page({ * 去拼团 */ goToOrderGroup(orderId, orderGroupId, _this) { - console.log(22222222) let that = this; // 支付成功 Http.post({ diff --git a/pages/main/spellGroup/index.js b/pages/main/spellGroup/index.js index 048f31f..a7bcdda 100644 --- a/pages/main/spellGroup/index.js +++ b/pages/main/spellGroup/index.js @@ -1,7 +1,6 @@ // pages/index/sw/index.js let config = require("../../../config/config.js"); let Http = require("../../../utils/HttpBasics"); -// let Http = require("../../../utils/HttpBasics"); const app = getApp(); const imgurl = require("../../../utils/imgurl"); Component({ @@ -60,15 +59,14 @@ Component({ total: res.data.total }); }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) + .catch(err => { + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) } }, ready() { diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index ef81906..eeb1f79 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -11,43 +11,43 @@ Page({ data: { teljpgUrl: imgurl.teljpg.url, wmhome: imgurl.wmhome.url, - couponChannelId:'', - couponId:'', - data:null, - spellData:null, - canSpell:true, - canBuyIf:true, + couponChannelId: '', + couponId: '', + data: null, + spellData: null, + canSpell: true, + canBuyIf: true, clock: "00", day: "00", hour: "00", min: "00", sec: "00", - showTime:true + showTime: true }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function(options) { this.setData({ couponChannelId: options.couponChannelId, couponId: options.couponId }) - if (options&&options.couponChannelId){ + if (options && options.couponChannelId) { this.getDetail(options.couponChannelId); } - if (options&&options.couponId){ + if (options && options.couponId) { this.getOneSpell(options.couponId) } this.getUserInfo(); }, - getUserInfo: function () { + getUserInfo: function() { let that = this; // 获取用户信息 Http.get({ - url: config.api.getScore, - data: {} - }) + url: config.api.getScore, + data: {} + }) .then(res => { console.log(res) that.setData({ @@ -56,7 +56,7 @@ Page({ }) }) }, - gotoIndex: function () { + gotoIndex: function() { wx.switchTab({ url: '/pages/main/index', }) @@ -64,7 +64,7 @@ Page({ /** * 拨打电话 */ - phone: function (e) { + phone: function(e) { let that = this; wx.makePhoneCall({ phoneNumber: e.target.dataset.merchantlinkphone @@ -73,11 +73,10 @@ Page({ /** * 直接购买 */ - gotoBuy(e){ - console.log(22222) + gotoBuy(e) { this.setData({ canBuyIf: false, - formId:e.detail.formId + formId: e.detail.formId }) this.orderFunc() }, @@ -105,14 +104,13 @@ Page({ countdown(time) { let that = this; var EndTime = time; - if (that.data.spellData!=null){ + if (that.data.spellData != null) { EndTime = that.data.spellData.expiredDate; } var NowTime = new Date().getTime(); var total_micro_second = EndTime - NowTime || []; // 渲染倒计时时钟 let obj = that.dateformat(total_micro_second); - console.log(obj) if (total_micro_second > 0) { that.setData({ clock: obj, @@ -123,17 +121,15 @@ Page({ }) } else { that.setData({ - // spellData:null, clock: "00", day: "00", hour: "00", min: "00", sec: "00", }) - // that.getOneSpell(that.data.couponId) } - if(that.data.showTime){ - setTimeout(function () { + if (that.data.showTime) { + setTimeout(function() { total_micro_second -= 1000; that.countdown(); }, 1000) @@ -142,15 +138,14 @@ Page({ /** * 发起拼团 */ - gotoSpell(){ - console.log(111111111) + gotoSpell() { this.setData({ - canSpell:false + canSpell: false }) this.orderFunc(0) }, //参与别人的拼团 - gotoPartner(){ + gotoPartner() { wx.navigateTo({ url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&couponChannelId=${this.data.couponChannelId}&avatarUrl=${this.data.spellData.avatarUrl}&nickName=${this.data.spellData.nickName}` }); @@ -158,7 +153,7 @@ Page({ /** * 获取一个拼团信息 */ - getOneSpell(couponId){ + getOneSpell(couponId) { let that = this; Http.get({ url: config.api.queryRemainOne, @@ -167,7 +162,7 @@ Page({ } }).then(res => { wx.stopPullDownRefresh(); - if(res.data){ + if (res.data) { that.countdown(res.data.expiredDate); that.setData({ spellData: res.data @@ -178,7 +173,7 @@ Page({ /** * 获取券详情信息 */ - getDetail(couponChannelId){ + getDetail(couponChannelId) { let that = this; Http.get({ url: config.api.couponDetail, @@ -188,9 +183,12 @@ Page({ }).then(res => { wx.stopPullDownRefresh(); let data = res.data; + wx.setNavigationBarTitle({ + title: res.data.title + }) data.price = (data.price / 100).toFixed(2) data.salePrice = (data.salePrice / 100).toFixed(2); - data.validStartDate = utils.formatTime(data.validStartDate,'yyyy-MM-dd') + data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') that.setData({ data @@ -200,8 +198,7 @@ Page({ /** * 去拼团 */ - goToOrderGroup(orderId, orderGroupId, _this){ - console.log(22222222) + goToOrderGroup(orderId, orderGroupId, _this) { let that = this; // 支付成功 Http.post({ @@ -212,21 +209,20 @@ Page({ couponId: _this.data.data.couponId } }) - .then(res => { - wx.navigateTo({ - url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}&couponChannelId=${_this.data.couponChannelId}` - }); - }) - .catch(err => { - console.log(err); - }) - // return; + .then(res => { + wx.navigateTo({ + url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}&couponChannelId=${_this.data.couponChannelId}` + }); + }) + .catch(err => { + console.log(err); + }) }, /** * 支付订单更新 */ payOrderUpdate: (orderId, payOrderId, status, reason, _this, orderGroupId) => { - console.log(orderGroupId,7777) + console.log(orderGroupId, 7777) let that = this; // 支付成功 Http.post({ @@ -238,24 +234,23 @@ Page({ reason: reason } }) - .then(res => { - wx.hideLoading() - if (orderGroupId==undefined){ - wx.navigateTo({ - url: '/pages/order/detail/index?orderId='+res.data.id, - }) - }else{ - _this.goToOrderGroup(orderId, res.data.orderGroupId, _this) - } - }) - .catch(err => { - console.log(err); - if (err.code!=12002){ - setTimeout(function () { - _this.payOrderUpdate(orderId, payOrderId, status, reason, _this, orderGroupId); - }, 2000) - } - }) + .then(res => { + wx.hideLoading() + if (orderGroupId == undefined) { + wx.navigateTo({ + url: '/pages/order/detail/index?orderId=' + res.data.id, + }) + } else { + _this.goToOrderGroup(orderId, res.data.orderGroupId, _this) + } + }) + .catch(err => { + if (err.code != 12002) { + setTimeout(function() { + _this.payOrderUpdate(orderId, payOrderId, status, reason, _this, orderGroupId); + }, 2000) + } + }) }, /** * 发起支付 @@ -264,19 +259,19 @@ Page({ let data = { couponChannelId: this.data.data.id, couponId: this.data.data.couponId, - formId:this.data.formId + formId: this.data.formId } /** * 拼团订单 */ - if (orderGroupId==0){ + let that = this; + if (orderGroupId == 0) { data.orderGroupId = orderGroupId } - var that = this; Http.get({ - url: config.api.checkPhoneStatus, - data: {} - }) + url: config.api.checkPhoneStatus, + data: {} + }) .then(res => { /** * orderSave 下单 @@ -376,7 +371,7 @@ Page({ }) .then(res => { console.log(res) - if (typeof (res) != "undefined") { + if (typeof(res) != "undefined") { let orderId = "" + res.data.id; that.setData({ orderId: orderId, @@ -388,79 +383,79 @@ Page({ * 支付订单创建 */ Http.post({ - url: config.api.payOrderCreate, - data: { - orderId: orderId - } - }) - .then(res => { - var payOrderId = "" + res.data.payOrderId; - wx.hideLoading(); - wx.requestPayment({ - timeStamp: res.data.timeStamp, - nonceStr: res.data.nonceStr, - package: res.data.package, - signType: (res.data.signType) ? res.data.signType : "MD5", - paySign: res.data.paySign, - success: res => { - that.setData({ - canSpell: false - }) - wx.showLoading({ - title: '订单正在处理中...', - }) - setTimeout(function () { - wx.hideLoading() - }, 5000) - that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', that, orderGroupId); - if (res.errMsg == "requestPayment:ok") { - setTimeout(function () { - wx.hideLoading(); - }, 2000); - } - }, - fail: res => { - /** - * 支付失败,需要更新订单的状态 - */ - that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', that, orderGroupId); - that.setData({ - showbutton: false, - canSpell: true, - canBuyIf: true - }) - return; - }, - complete: res => { } - }); - /// End payment -------- - }) - .catch(err => { - that.setData({ - canSpell: true, - canBuyIf: true + url: config.api.payOrderCreate, + data: { + orderId: orderId + } + }) + .then(res => { + var payOrderId = "" + res.data.payOrderId; + wx.hideLoading(); + wx.requestPayment({ + timeStamp: res.data.timeStamp, + nonceStr: res.data.nonceStr, + package: res.data.package, + signType: (res.data.signType) ? res.data.signType : "MD5", + paySign: res.data.paySign, + success: res => { + that.setData({ + canSpell: false + }) + wx.showLoading({ + title: '订单正在处理中...', + }) + setTimeout(function() { + wx.hideLoading() + }, 5000) + that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', that, orderGroupId); + if (res.errMsg == "requestPayment:ok") { + setTimeout(function() { + wx.hideLoading(); + }, 2000); + } + }, + fail: res => { + /** + * 支付失败,需要更新订单的状态 + */ + that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', that, orderGroupId); + that.setData({ + showbutton: false, + canSpell: true, + canBuyIf: true + }) + return; + }, + complete: res => {} + }); + /// End payment -------- + }) + .catch(err => { + that.setData({ + canSpell: true, + canBuyIf: true + }) + wx.showToast({ + title: err.message, + icon: 'none', + duration: 2000, + mask: false + }); }) - wx.showToast({ - title: err.message, - icon: 'none', - duration: 2000, - mask: false - }); - }) } - + }) }, /** * 生命周期函数--监听页面显示 */ - onShow: function () { + onShow: function() { this.setData({ - canSpell:true, - canBuyIf:true, + canSpell: true, + canBuyIf: true, showTime: true }) - if(this.data.spellData!=null){ + if (this.data.spellData != null) { this.countdown() } }, @@ -468,7 +463,7 @@ Page({ /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { + onHide: function() { this.setData({ showTime: false }) @@ -477,7 +472,7 @@ Page({ /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { + onUnload: function() { this.setData({ showTime: false }) @@ -486,8 +481,8 @@ Page({ /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function (e) { - let that=this; + onPullDownRefresh: function(e) { + let that = this; that.getDetail(that.data.couponChannelId); that.getOneSpell(that.data.couponId) },