diff --git a/assets/img/pass0.png b/assets/img/pass0.png
index 109c748..4b16412 100644
Binary files a/assets/img/pass0.png and b/assets/img/pass0.png differ
diff --git a/assets/img/pass1.png b/assets/img/pass1.png
index fc131a2..f91a4f0 100644
Binary files a/assets/img/pass1.png and b/assets/img/pass1.png differ
diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml
index bf2d09f..5cdca5d 100644
--- a/components/coupons/index.wxml
+++ b/components/coupons/index.wxml
@@ -15,6 +15,7 @@
仅限本店使用
+ {{data.merchantName}}
diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss
index 271e333..e251da6 100644
--- a/components/coupons/index.wxss
+++ b/components/coupons/index.wxss
@@ -44,7 +44,7 @@
}
.coupons-info-price {
- padding: 32rpx 0 0;
+ padding: 16rpx 0 0;
}
.i {
@@ -56,7 +56,7 @@
display: inline-block;
font-size: 36rpx;
color: #f96563;
- line-height: 50rpx;
+ line-height: 27rpx;
font-weight: 600;
}
@@ -115,10 +115,11 @@
width: 138rpx !important;
line-height: 50rpx !important;
}
+
.coupons-btn-gms {
- background: #999!important;
+ background: #999 !important;
border-radius: 10rpx !important;
- opacity: .6;
+ opacity: 0.6;
margin: 0 !important;
padding: 0 !important;
font-family: PingFangSC-Semibold;
@@ -129,6 +130,7 @@
width: 138rpx !important;
line-height: 50rpx !important;
}
+
.subtitle {
font-size: 24rpx;
color: #6f6f6f;
@@ -149,6 +151,18 @@
display: inline-block;
}
+.coupons-info-manjian1 {
+ color: #ccc !important;
+ font-weight: normal;
+ font-size: 20rpx;
+ line-height: 20rpx;
+ display: inline-block;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ width: 300rpx;
+}
+
/**上拉加载更多**/
.userinfo {
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index f9888a0..0f34c02 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -45,6 +45,6 @@
-
+
\ No newline at end of file
diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js
index 4b53e61..1f281a8 100644
--- a/pages/index/coupons/index.js
+++ b/pages/index/coupons/index.js
@@ -76,13 +76,13 @@ Component({
if (key == 0) {
var param = {
pageNum: pageNum,
- pageSize: 16,
+ pageSize: 6,
targetAd: 1
};
} else {
var param = {
pageNum: pageNum,
- pageSize: 16,
+ pageSize: 6,
business: key,
targetAd: 1
};
diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss
index b113b34..b6461c6 100644
--- a/pages/rushToBuy/index.wxss
+++ b/pages/rushToBuy/index.wxss
@@ -136,8 +136,8 @@
position: absolute;
top: 34rpx;
bottom: 0;
- right: 20rpx;
- width: 114rpx;
+ right: 0rpx;
+ width: 138rpx;
height: 50rpx;
line-height: 50rpx;
text-align: center;