diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 14d1754..bb17c7a 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -7,26 +7,30 @@ Page({
couponId: null,
orderId: ''
},
- onLoad(e) {
- console.log(e)
+ onLoad(options) {
+ console.log("00000000000000----------");
+ console.log(options);
+ let that = this;
wx.showLoading({
- title: '加载中...',
- })
- if (e.flag == 'pay') {
+ title: "加载中..."
+ });
+
+ if (options.flag == "pay") {
this.orderFunc();
} else {
Http.get({
url: config.api.couponDetail,
data: {
- id: e.id
+ id: options.id
}
}).then(res => {
+ console.log(res);
wx.hideLoading();
- this.setData({
- data: res,
- couponId: e.id
- })
- })
+ that.setData({
+ data: res.data,
+ couponId: options.id
+ });
+ });
}
},
/**
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 72b8556..c66d570 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -14,6 +14,8 @@
¥{{data.priceStr}}
+
+
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index f7a06d8..f56fff4 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -6,6 +6,7 @@
position: relative;
display: flex;
flex-direction: column;
+ overflow: hidden;
}
.coupons-body{
flex: 1;
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index a793b7e..510f266 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -1,5 +1,5 @@
//index.js
-const util = require('../../utils/util');
+const util = require('../../../utils/util');
Page({
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 6aa57d3..b966cf6 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -15,11 +15,10 @@
{{item.subTitle}}
- 有效期至:{{item.expiredTime}}
-
-
- 立即使用
+ 有效期至:
+ {{item.expiredTime}}
+ 立即使用
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index fcd6471..88fec41 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -29,14 +29,14 @@
}
.logo {
- width: 248rpx;
+ width: 348rpx;
height: 184rpx;
- border-radius: 30rpx;
}
.logo image {
width: 100%;
height: 100%;
+ border-radius: 15rpx;
}
.info view:nth-child(1) {
@@ -70,14 +70,24 @@
justify-content: space-between;
}
-.info view:nth-child(3) text:nth-child(2) {
- width: 170rpx;
- height: 50rpx;
- color: #fff;
- line-height: 50rpx;
+
+.btns{
+ width: 200rpx;
+ height: 60rpx;
+ line-height: 60rpx;
text-align: center;
- background: #00c0ff;
- border-radius: 10px;
- font-size: 28rpx;
- margin-top: 40rpx;
+ background: #00C0FF;
+ color: #fff;
+ float: right;
+ border-radius:15rpx;
+ font-size: 30rpx;
+}
+
+.txt1{
+ font-size: 22rpx;
+ color: #999;
+}
+.txt2{
+ font-size: 22rpx;
+ color: red;
}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1f4efb9..3e9ab84 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,8 +1,10 @@
-
-
- {{market.name}}
-
-
-
-
-
\ No newline at end of file
+
+
+
+ {{market.name}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1e70c86..aa4f892 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,14 +1,21 @@
.index-position {
- background: rgba(0, 0, 0, 0.5);
- height: 88rpx;
- position: absolute;
- top: 0;
- width: 100%;
- font-family: PingFangSC-Semibold;
- font-size: 30rpx;
- color: #FFFFFF;
- letter-spacing: 0.75rpx;
- z-index: 9;
- line-height: 88rpx;
- padding: 0 30rpx;
+ background: rgba(0, 0, 0, 0.5);
+ height: 88rpx;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ font-family: PingFangSC-Semibold;
+ font-size: 30rpx;
+ color: #ffffff;
+ letter-spacing: 0.75rpx;
+ z-index: 9;
+ line-height: 88rpx;
+ overflow: hidden;
+}
+page {
+ width: 100%;
+ overflow-x: hidden;
+}
+.txt{
+ margin-left: 20rpx;
}
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index ba58c87..a39de91 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -50,7 +50,7 @@
.user-btns .user-btn>view {
flex: 1;
- padding: 0 32px;
+ padding: 0 10px 0 32rpx;
}
.user-btns .user-btn>view:last-child {
@@ -61,7 +61,7 @@
.user-btns .user-btn>view:last-child .iconfont {
color: #A8A8A8;
- font-size: 75rpx;
+ font-size: 44rpx;
}
.user-out-btn {