From 2fdb31594104a3cd59ee56582635bf62f96d586c Mon Sep 17 00:00:00 2001 From: caserKing Date: Sat, 3 Aug 2019 17:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/hot/index.js | 2 -- pages/passCar/passCar.js | 24 +++++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/components/hot/index.js b/components/hot/index.js index 586b9cd..f846bfc 100644 --- a/components/hot/index.js +++ b/components/hot/index.js @@ -52,8 +52,6 @@ Component({ url: config.api.change, data:param, }).then(res => { - console.log(res) - console.log(123) if(res.data != undefined && res.data){ if(val=='1'){ that.setData({ diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 88c8e28..4476514 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -76,10 +76,12 @@ Page({ quanid: quanid, showTicketModal: false, }); - wx.setStorage({ + + that.bindCoupon(that.data.quanid); + /* wx.setStorage({ key: 'chosed', data: 'chosed', - }) + }) */ }, /* */ @@ -93,7 +95,7 @@ Page({ url: config.api.couponOrderCarList, data: { pageNum: pageNum, - pageSize: 15, + pageSize: 4, couponOrderStatus: key } }).then(res => { @@ -242,14 +244,14 @@ Page({ * 只有用户选择了优惠券 * 才会进行券和车牌的绑定 */ - if (wx.getStorageSync("chosed") && that.data.quanid) { + /* if (wx.getStorageSync("chosed") && that.data.quanid) { that.getStopFee(that.data.listCardNum); that.bindCoupon(that.data.quanid); wx.setStorage({ key: 'chosed', data: '', }) - }; + }; */ if (app.globalData.token) { // that.initUsrCarList(); that.initUsrCarList("flags"); @@ -446,6 +448,7 @@ Page({ data: postCouponData }) .then(res => { + that.getStopFee(that.data.listCardNum); that.initUsrCarList(); }) .catch(err => { @@ -488,11 +491,14 @@ Page({ this.setData({ showTicketModal: true, allow_load: true, - + ticketList: [], + curPageNum: 1, + }) - if (!this.data.ticketList.length){ + this.getTicketList(0, 1); + /* if (!this.data.ticketList.length){ this.getTicketList(0, 1); - } + } */ }, @@ -503,7 +509,7 @@ Page({ url: config.api.couponOrderCarList + "?type=5&couponOrderStatus=0", data: { pageNum: 1, - pageSize: 15, + pageSize: 4, couponOrderStatus: 0 } }).then(res => {