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/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({ 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 c0c8f0a..0511bf9 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 88c8e28..c5d8184 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', - }) + }) */ }, /* */ @@ -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); - } + } */ }, 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 @@ - + 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 @@ - - -