From 58bfaeffe69f534eeda46487e23f3feac04c48cd Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 13 Mar 2019 15:25:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E3=80=90ID1001079=E3=80=91C=E7=AB=AF=E6=9C=AA=E5=88=B0?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=A5=E6=9C=9F=E7=9A=84=E5=8A=B5=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=BA=94=E6=8A=8A=E5=85=91=E6=8D=A2=E7=A0=81=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5=20=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/detail/index.js | 6 ++---- pages/order/detail/index.wxml | 4 ++-- pages/orderquanma/index.js | 6 ++++-- pages/orderquanma/index.wxml | 6 ++---- 4 files changed, 10 insertions(+), 12 deletions(-) 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 @@ - - + +