diff --git a/app.json b/app.json index 11cfc49..5a23a61 100644 --- a/app.json +++ b/app.json @@ -29,11 +29,8 @@ "pages/passCar/couponDetail/couponDetail", "pages/managelicenseplate/managelicenseplate", "pages/payrule/payrule", -<<<<<<< HEAD - "pages/game/index" -======= + "pages/game/index", "pages/grade/grade" ->>>>>>> [成长值][增加]:成长值增加 ], "tabBar": { "color": "#9F9F9F", diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 9bfbd25..fd43320 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -192,9 +192,6 @@ Page({ }) .catch(err => { console.log(err); - console.log(that.data.couponChannelId); - console.log(that.data.couponId); - //console.log("我即将要跳转到用户手机号授权的页面"); if (err.code == "2011") { wx.showToast({ title: "商户信息没找到", @@ -325,25 +322,34 @@ Page({ that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 console.log(res); if (res.errMsg == "requestPayment:ok") { - wx.showToast({ - title: "购买成功", - image: "./../../../assets/img/success.png", - duration: 1000, - mask: false, - success: function () { - setTimeout(function () { - wx.hideLoading(); - }, 1600); - setTimeout(() => { - wx.navigateTo({ - url: `/pages/order/detail/index?orderId=${ - that.data.orderId - }` - }); - }, 1000) - } - }); - + // wx.showToast({ + // title: "购买成功", + // image: "./../../../assets/img/success.png", + // duration: 1000, + // mask: false, + // success: function () { + // setTimeout(function () { + // wx.hideLoading(); + // }, 2000); + // setTimeout(() => { + // wx.navigateTo({ + // url: `/pages/order/detail/index?orderId=${ + // that.data.orderId + // }` + // }); + // }, 1000) + // } + // }); + setTimeout(function () { + wx.hideLoading(); + }, 2000); + setTimeout(() => { + wx.navigateTo({ + url: `/pages/order/detail/index?orderId=${ + that.data.orderId + }` + }); + }, 1000) /** * 用户支付成功以后跳转到券包列表 */ @@ -405,22 +411,22 @@ Page({ key: 'couponNum', data: "couponNum" }) - wx.showToast({ - title: "领取成功", - image: "./../../../assets/img/success.png", - duration: 1000, - mask: false, - success: function () { - setTimeout(function () { - wx.navigateTo({ - url: `/pages/order/detail/index?orderId=${ - that.data.orderId - }` - }); - }, 1000) - } - }); - + // wx.showToast({ + // title: "领取成功", + // image: "./../../../assets/img/success.png", + // duration: 1000, + // mask: false, + // success: function () { + + // } + // }); + setTimeout(function () { + wx.navigateTo({ + url: `/pages/order/detail/index?orderId=${ + that.data.orderId + }` + }); + }, 1000) //////////////////////////停车券 console.log(that.data.data.type) if (that.data.data.type == 5) { diff --git a/pages/grade/grade.wxml b/pages/grade/grade.wxml index e9b0ab5..e7ed8ce 100644 --- a/pages/grade/grade.wxml +++ b/pages/grade/grade.wxml @@ -62,12 +62,12 @@ - - - - - - + + + + + + {{item.level}} diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 5bcd798..dde4692 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -61,7 +61,7 @@ Page({ }); setTimeout(function () { wx.hideLoading(); - }, 500); + }, 1500); // that.data.setInter = setInterval(function() { Http.get({