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 @@
请升级微信版本
-->
-
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index b70ea7e..ed41afe 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -19,57 +19,20 @@ Page({
*/
powerDrawer: function(e) {
- // var currentStatu = e.currentTarget.dataset.statu;
+
+ // couponOrderStatus
+ // 0 未使用
+ // 1 已使用
+ // 2 已过期
+ // 3 已经退款
+ console.log(e);
+
wx.navigateTo({
- url: `/pages/youhuiquanma/index?quancode=${e.currentTarget.dataset.quancode}&title=${e.currentTarget.dataset.title}&subtitle=${e.currentTarget.dataset.subtitle}&remark=${e.currentTarget.dataset.remark}`,
+ url: `/pages/youhuiquanma/index?quancode=${e.currentTarget.dataset.quancode}&title=${e.currentTarget.dataset.title}&subtitle=${e.currentTarget.dataset.subtitle}&remark=${e.currentTarget.dataset.remark}&couponorderstatus=${e.currentTarget.dataset.couponorderstatus}`,
})
- // console.log(e.currentTarget.dataset.statu);
console.log(e.currentTarget.dataset.quancode);
- // this.utils(currentStatu, e.currentTarget.dataset.quancode);
+ console.log(e.currentTarget.dataset.couponorderstatus);
},
- // utils: function(currentStatu, quancode) {
- // /* 动画部分 */
- // // 第1步:创建动画实例
- // var animation = wx.createAnimation({
- // duration: 200, //动画时长
- // timingFunction: "linear", //线性
- // delay: 0 //0则不延迟
- // }); // 第2步:这个动画实例赋给当前的动画实例
- // this.animation = animation; // 第3步:执行第一组动画
- // animation.opacity(0).step(); // 第4步:导出动画对象赋给数据对象储存
- // this.setData({
- // animationData: animation.export()
- // }); // 第5步:设置定时器到指定时候后,执行第二组动画
- // setTimeout(
- // function() {
- // // 执行第二组动画
- // animation.opacity(1).step(); // 给数据对象储存的第一组动画,更替为执行完第二组动画的动画对象
- // this.setData({
- // animationData: animation
- // }); //关闭
- // if (currentStatu == "close") {
- // this.setData({
- // showModalStatus: false
- // });
- // }
- // }.bind(this),
- // 20
- // );
- // // 显示
- // if (currentStatu == "open") {
- // this.setData({
- // showModalStatus: true
- // });
- // this.data.flag++;
-
- // console.log(this.data.flag);
- // util.barcode("barcode" + this.data.flag, quancode, 500, 100);
- // util.qrcode("qrcode" + this.data.flag, quancode, 350, 350);
- // this.setData({
- // flag: this.data.flag
- // });
- // }
- // },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 968198b..1bcd5f5 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -29,15 +29,27 @@
适用门店
{{order.merchantName}}
-
-
+
+
+
兑换码
- {{order.id}}
+ {{order.couponOrderId}}
+
+
+
+
+
下单时间
{{createDate}}
@@ -56,18 +68,3 @@
-
-
-
-
\ No newline at end of file
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index b38a0b1..b72e94f 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -126,7 +126,6 @@
}
.classif > view text {
font-size: 30rpx;
- margin-right:6rpx;
}
.classif > view text:nth-child(2) {
color: #b8b8b8;
diff --git a/pages/rushToBuy/index.wxml b/pages/rushToBuy/index.wxml
index 525f005..1aa1d65 100644
--- a/pages/rushToBuy/index.wxml
+++ b/pages/rushToBuy/index.wxml
@@ -1,7 +1,7 @@
-
+
@@ -19,14 +19,16 @@
- 剩余时间:{{day}}天 {{hour}}小时{{minute}}分钟
+
+ 剩余时间:
+ {{day}}天{{hour}}小时{{minute}}分钟
+
剩余件数:{{item.remainInventory}}件
购买
- 领取
+ 领取
-
\ No newline at end of file
diff --git a/pages/youhuiquanma/index.js b/pages/youhuiquanma/index.js
index 84f0690..bd233f7 100644
--- a/pages/youhuiquanma/index.js
+++ b/pages/youhuiquanma/index.js
@@ -22,7 +22,8 @@ Page({
code:options.quancode,
title:options.title,
subtitle:options.subtitle,
- remark:options.remark
+ remark:options.remark,
+ couponorderstatus:options.couponorderstatus
})
},
diff --git a/pages/youhuiquanma/index.wxml b/pages/youhuiquanma/index.wxml
index b9efbeb..09ae6db 100644
--- a/pages/youhuiquanma/index.wxml
+++ b/pages/youhuiquanma/index.wxml
@@ -2,12 +2,22 @@
{{title}}
{{subtitle}}
+
+
+
+
兑换码:{{code}}
diff --git a/pages/youhuiquanma/index.wxss b/pages/youhuiquanma/index.wxss
index 441a35d..e35643c 100644
--- a/pages/youhuiquanma/index.wxss
+++ b/pages/youhuiquanma/index.wxss
@@ -3,7 +3,6 @@ page {
}
.couponbg {
position: relative;
- height: 100%;
width: 100%;
}
.couponbg image {
@@ -17,7 +16,7 @@ page {
right: 0;
margin: auto;
z-index: -19999;
- border-radius: 20rpx;
+ border-radius: 26rpx;
}
.title {
font-size: 33rpx;
@@ -37,7 +36,7 @@ page {
width: 600rpx;
border-radius: 10rpx;
background-color: #fff;
- margin: 144rpx auto 0;
+ margin: 22rpx auto 0;
padding: 30rpx 0;
position: relative;
z-index: 10000000000;
@@ -78,12 +77,25 @@ page {
}
.qrcode {
- height: 380rpx;
+ position: relative;
+ height: 360rpx;
display: flex;
flex-direction: column;
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: 350rpx;
@@ -116,14 +128,15 @@ page {
margin-top:40rpx;
}
.gou{
- padding-left: 80rpx;
- color: #878d95;
- padding-top:30rpx;
- font-size: 30rpx;
+ width: 87%;
+ margin: 0 auto;
+ color: #878d95;
+ font-size: 26rpx;
+ padding-bottom:74rpx;
}
.mai{
- color: #666;
+ color: #333;
}
.remark{
- padding-top: 37rpx;
+ padding-top: 17rpx;
}
\ No newline at end of file