From 2fdb31594104a3cd59ee56582635bf62f96d586c Mon Sep 17 00:00:00 2001 From: caserKing Date: Sat, 3 Aug 2019 17:16:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=B8=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=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 => { From 5f522fe3d4bf12884600fbaed366e67c13f3a816 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 3 Aug 2019 17:30:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E8=BF=94=E5=9B=9E][=E5=88=A0=E9=99=A4]:[?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E4=BB=B6=E8=BF=94=E5=9B=9E=E5=88=A4?= =?UTF-8?q?=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/navbar/navbar.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js index dd329f6..620a0aa 100644 --- a/components/navbar/navbar.js +++ b/components/navbar/navbar.js @@ -29,14 +29,6 @@ Component({ statusBarHeight: app.statusBarHeight + 'px', navigationBarHeight: (app.statusBarHeight + 44) + 'px' }, - ready(){ - let pages = getCurrentPages(); - if (pages&&pages.length>0){ - this.setData({ - back:false - }) - } - }, methods: { backHome: function () { wx.switchTab({ From f711517f1227ef83936f9ffdfd8886dfbe2b4b7c Mon Sep 17 00:00:00 2001 From: caserKing Date: Sat, 3 Aug 2019 17:49:42 +0800 Subject: [PATCH 3/4] fix --- pages/passCar/passCar.js | 4 ++-- pages/passCar/passCar.wxml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 4476514..c5d8184 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -95,7 +95,7 @@ Page({ url: config.api.couponOrderCarList, data: { pageNum: pageNum, - pageSize: 4, + pageSize: 15, couponOrderStatus: key } }).then(res => { @@ -509,7 +509,7 @@ Page({ url: config.api.couponOrderCarList + "?type=5&couponOrderStatus=0", data: { pageNum: 1, - pageSize: 4, + pageSize: 15, couponOrderStatus: 0 } }).then(res => { diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index c317396..69bb948 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -127,7 +127,7 @@ - + From 0efaa6df21135944d6feeba6e074e67d390c82df Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 3 Aug 2019 17:52:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F][=E4=BF=AE=E6=94=B9]:[=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=BF=94=E5=9B=9E=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [解决C端-砍价-答题问劵下弹出答题,支付按钮没有蒙层] --- pages/coupon/detail/index.wxss | 2 +- pages/managelicenseplate/managelicenseplate.wxml | 2 +- pages/passCar/couponList/couponList.wxml | 2 +- pages/spellGroup/paySpellGroup/index.wxml | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index f256b31..e34f940 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -566,7 +566,7 @@ button::after { bottom: 0; padding-bottom: 22rpx; padding-top: 22rpx; - z-index: 12; + z-index: 10; /* background: #fff; */ } .btnTxt{ diff --git a/pages/managelicenseplate/managelicenseplate.wxml b/pages/managelicenseplate/managelicenseplate.wxml index aa7aef1..75707d2 100644 --- a/pages/managelicenseplate/managelicenseplate.wxml +++ b/pages/managelicenseplate/managelicenseplate.wxml @@ -1,4 +1,4 @@ - + 30天内最多绑定4次车牌解绑前请确认车已经离场 diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml index b4d05bf..fc0e257 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/spellGroup/paySpellGroup/index.wxml b/pages/spellGroup/paySpellGroup/index.wxml index c093290..f55fdcc 100644 --- a/pages/spellGroup/paySpellGroup/index.wxml +++ b/pages/spellGroup/paySpellGroup/index.wxml @@ -3,9 +3,6 @@ - - -