diff --git a/assets/img/wm01.jpg b/assets/img/wm01.jpg new file mode 100644 index 0000000..8e9c670 Binary files /dev/null and b/assets/img/wm01.jpg differ diff --git a/assets/img/wm02.jpg b/assets/img/wm02.jpg new file mode 100644 index 0000000..eda9ae1 Binary files /dev/null and b/assets/img/wm02.jpg differ diff --git a/assets/img/wm03.jpg b/assets/img/wm03.jpg new file mode 100644 index 0000000..16d4290 Binary files /dev/null and b/assets/img/wm03.jpg differ diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 660084f..aa4fb21 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -146,11 +146,11 @@ Page({ var data = { couponChannelId: "" + that.data.couponChannelId, couponId: "" + that.data.couponId - } - if (that.data.couponChannelId == null) { + }; + if (that.data.couponChannelId == null) { data = { couponId: "" + that.data.couponId - } + }; } /** * orderSave 下单 diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml index 0a1c65f..a603f71 100644 --- a/pages/couponorder/detail/index.wxml +++ b/pages/couponorder/detail/index.wxml @@ -16,7 +16,7 @@ 有效期至: {{expiredTime}} - + + + + + + + 兑换码:{{code}} + 适用门店 diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 4edb81d..a9be4cd 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -58,7 +58,18 @@ justify-content: flex-end; align-items: center; } - +.qrcode image{ + position: absolute; + width: 160rpx; + height: 160rpx; + right:0; + bottom: 0; + top: 0; + left: 0; + margin: auto; + z-index: 1000000000; + border-radius:50%; +} .qrcode > canvas { width: 400rpx; height: 400rpx; diff --git a/pages/getphoneInfo/index.wxml b/pages/getphoneInfo/index.wxml index 46961da..2567ef5 100755 --- a/pages/getphoneInfo/index.wxml +++ b/pages/getphoneInfo/index.wxml @@ -4,7 +4,6 @@ 请升级微信版本 --> -