diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 1ca3ad7..02f661a 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -90,8 +90,7 @@ Page({ }&title=${e.currentTarget.dataset.title}&subtitle=${ e.currentTarget.dataset.subtitle }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ - e.currentTarget.dataset.couponorderstatus - }` + e.currentTarget.dataset.couponorderstatus}&validstatus=${e.currentTarget.dataset.validstatus}` }); } else { wx.navigateTo({ @@ -100,8 +99,7 @@ Page({ }&title=${e.currentTarget.dataset.title}&subtitle=${ e.currentTarget.dataset.subtitle }&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${ - that.data.mystatus - }` + that.data.mystatus}&validstatus=${e.currentTarget.dataset.validstatus}` }); } }, diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index 05b03a6..421dcbb 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -35,10 +35,10 @@ 只有支付完成的时 才显示兑换码 --> - + 兑换码 - {{order.couponOrderId}} + {{order.couponOrderId}} diff --git a/pages/orderquanma/index.js b/pages/orderquanma/index.js index 72a8ba1..d21f660 100644 --- a/pages/orderquanma/index.js +++ b/pages/orderquanma/index.js @@ -9,6 +9,7 @@ Page({ wm01Url: imgurl.wm01.url, wm02Url: imgurl.wm02.url, wm03Url: imgurl.wm03.url, + wm04Url: imgurl.wm04.url, code: "", //存储计时器 setInter: "", @@ -50,15 +51,16 @@ Page({ }, onLoad: function (options) { let that = this; + console.log(options) let value = JSON.stringify({ END: "C", TYPE: "couponorder", ID: options.quancode}) - // util.barcode("barcode", value, 500, 100); util.qrcode("qrcode", value, 350, 350); that.setData({ code: options.quancode, title: options.title, subtitle: options.subtitle, remark: options.remark, - couponorderstatus: options.couponorderstatus + couponorderstatus: options.couponorderstatus, + validStatus: options.validstatus }); /** * 如果没有核销 diff --git a/pages/orderquanma/index.wxml b/pages/orderquanma/index.wxml index e977290..47f6ee8 100644 --- a/pages/orderquanma/index.wxml +++ b/pages/orderquanma/index.wxml @@ -14,10 +14,8 @@ - - + +