diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 43d7f69..fab3517 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -25,8 +25,8 @@ Page({ questionnaire: { title: "小主,您有娃吗 ?" , questions: [ - { ques: "有" }, - { ques: "木有" }] + { ques: "要你管" }, + { ques: "有萌娃" }] }, }, onShow:function(){ @@ -164,7 +164,6 @@ Page({ * 支付订单更新 */ payOrderUpdate: (orderId, payOrderId, status, reason) => { - // 支付成功 Http.post({ url: config.api.payOrderUpdate, data: { @@ -175,6 +174,7 @@ Page({ } }) .then(res => { + console.log(res); console.log("payOrderUpdate then", res); }) .catch(err => { @@ -354,10 +354,7 @@ Page({ wx.switchTab({ url: '/pages/passCar/passCar' }); - }, 1600); - // this.initUsrCarList() - // 领取 5.停车券 - // TODO 选取用户下的车牌 + }, 1600) } } }, diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index ee4b4ce..491a14e 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -272,9 +272,11 @@ page { right: 0; padding-bottom: 22rpx; padding-top: 22rpx; + z-index: 1000; } .buy { + position: relative; background: #00c0ff; height: 94rpx; width: 670rpx; @@ -293,7 +295,7 @@ page { margin: auto; width: 50rpx; height: 50rpx; - z-index: 1000000; + z-index: 10; } .txt { diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 3e02bea..f09ac8b 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -12,26 +12,29 @@ Page({ order: null, orderId: null, //存储计时器 - setInter: "", - mystatus: '' + setInter: null, + mystatus: null }, powerDrawer: function (e) { let that = this; - // couponOrderStatus - // 0 未使用 - // 1 已使用 - // 2 已过期 - // 3 已经退款 + /** + * couponOrderStatus + * 0 未使用 + 1 已使用 + 2 已过期 + 3 已经退款 + */ + console.log(e); if (that.data.mystatus == "" || that.data.mystatus == undefined) { wx.navigateTo({ url: `/pages/orderquanma/index?quancode=${ e.currentTarget.dataset.quancode - }&title=${e.currentTarget.dataset.title}&subtitle=${ + }&title=${e.currentTarget.dataset.title}&subtitle=${ e.currentTarget.dataset.subtitle - }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ + }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ e.currentTarget.dataset.couponorderstatus }&sight=${that.data.sight}` }); @@ -40,11 +43,11 @@ Page({ wx.navigateTo({ url: `/pages/orderquanma/index?quancode=${ e.currentTarget.dataset.quancode - }&title=${e.currentTarget.dataset.title}&subtitle=${ + }&title=${e.currentTarget.dataset.title}&subtitle=${ e.currentTarget.dataset.subtitle - }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ + }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ that.data.mystatus - }&sight=${that.data.sight}` + }&sight=${that.data.sight}` }); } }, @@ -62,16 +65,12 @@ Page({ setTimeout(function () { wx.hideLoading(); }, 1500); - // that.data.setInter = setInterval(function() { - Http.get({ url: config.api.orderDetail, data: { orderId: options.orderId } }).then(res => { - console.log(res); - console.log("我是订单详情"); that.setData({ order: res.data }); @@ -83,8 +82,6 @@ Page({ createDate: createDate }); }); - - // }, 100); }, /** @@ -118,6 +115,11 @@ Page({ success: res => { console.log(res); that.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 + /** + * @Meo + * 更新订单的状态 + */ + console.log(res); if (res.errMsg == "requestPayment:ok") { wx.showToast({ @@ -129,7 +131,6 @@ Page({ wx.showLoading({ title: "加载中..." }); - setTimeout(function () { wx.hideLoading(); }, 1600); @@ -137,7 +138,7 @@ Page({ wx.navigateTo({ url: `/pages/order/detail/index?orderId=${ that.data.orderId - }` + }` }); }, 1600); } @@ -145,28 +146,10 @@ Page({ } }, fail: res => { - that.payOrderUpdate(that.data.orderId, payOrderId, 2); + that.payOrderUpdate(that.data.orderId, payOrderId, 2); console.log(res); - // wx.showToast({ - // title: "支付失败", - // image: "./../../../assets/img/fail.png", - // duration: 2000, - // mask: false - // }); return; }, - // complete: res => { - // console.log(res); - // if (res.errMsg == "requestPayment:ok") {} else { - // wx.showToast({ - // title: "支付失败", - // image: "./../../../assets/img/fail.png", - // duration: 2000, - // mask: false - // }); - // } - // return; - // } }); /// End payment -------- }); @@ -186,20 +169,16 @@ Page({ payOrderUpdate: (orderId, payOrderId, status, reason) => { // 支付成功 Http.post({ - url: config.api.payOrderUpdate, - data: { - payOrderId: payOrderId, - orderId: orderId, - status: status, - reason: reason - } - }) + url: config.api.payOrderUpdate, + data: { + payOrderId: payOrderId, + orderId: orderId, + status: status, + reason: reason + } + }) .then(res => { console.log("payOrderUpdate then", res); - // wx.showToast({ - // title: "购买成功", - // duration: 2500 - // }); }) .catch(err => { console.log("payOrderUpdate catch", err); @@ -217,26 +196,6 @@ Page({ sight: res.value }) } - }); - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () {}, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () {}, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () {}, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () {} + }) + } }); \ No newline at end of file