diff --git a/components/coupons/index.wxml b/components/coupons/index.wxml
index 5ac41d0..bf2d09f 100644
--- a/components/coupons/index.wxml
+++ b/components/coupons/index.wxml
@@ -23,8 +23,9 @@
剩余: {{data.remainInventory}}
- 领取
- 购买
+ 领取
+ 购买
+ 已售罄
diff --git a/components/coupons/index.wxss b/components/coupons/index.wxss
index 603fa6c..271e333 100644
--- a/components/coupons/index.wxss
+++ b/components/coupons/index.wxss
@@ -115,7 +115,20 @@
width: 138rpx !important;
line-height: 50rpx !important;
}
-
+.coupons-btn-gms {
+ background: #999!important;
+ border-radius: 10rpx !important;
+ opacity: .6;
+ margin: 0 !important;
+ padding: 0 !important;
+ font-family: PingFangSC-Semibold;
+ font-size: 28rpx;
+ color: #fff !important;
+ letter-spacing: 0;
+ height: 50rpx !important;
+ width: 138rpx !important;
+ line-height: 50rpx !important;
+}
.subtitle {
font-size: 24rpx;
color: #6f6f6f;
@@ -157,8 +170,8 @@
.sy {
display: block;
- text-align: center;
- width: 120rpx;
+ text-align: left;
+ width: 136rpx;
font-size: 24rpx;
color: #6f6f6f;
height: 40rpx;
@@ -169,8 +182,6 @@
margin-top: 200px;
}
-/**/
-
scroll-view {
width: 100%;
}
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 692d7b3..f9888a0 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -43,7 +43,8 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index a4fd630..8fe8f78 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -6,7 +6,7 @@
position: relative;
width: 510rpx;
height: 581rpx;
- display: block;
+ display: block;
border-radius: 10rpx;
background-color: #fff;
margin: 22rpx auto 0;
diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js
index 6c878d9..b718208 100644
--- a/pages/couponorder/index/index.js
+++ b/pages/couponorder/index/index.js
@@ -27,7 +27,7 @@ Page({
page: 1,
allow_load: true,
loading: true, //"上拉加载"的变量,默认false,隐藏
- content:"",
+ content: ""
},
onLoad() {
this.getList(0, 0);
@@ -40,17 +40,7 @@ Page({
wx.navigateTo({
url: `/pages/couponorder/detail/index?quancode=${
e.currentTarget.dataset.quancode
- }`,
- success: function(res) {
- // success
- console.log("点击跳转到券详情页面");
- },
- fail: function() {
- // fail
- },
- complete: function() {
- // complete
- }
+ }`
});
},
getList(key, pageNum) {
@@ -59,14 +49,14 @@ Page({
console.log(pageNum);
if (that.data.allow_load) {
that.setData({
- loading:true,
- content:'小主,我在玩命加载中...'
- })
+ loading: true,
+ content: "小主,我在玩命加载中..."
+ });
Http.get({
url: config.api.couponOrderList,
data: {
pageNum: pageNum,
- pageSize: 8,
+ pageSize: 6,
couponOrderStatus: key
}
}).then(res => {
@@ -76,8 +66,8 @@ Page({
});
setTimeout(function() {
that.setData({
- loading:false,
- })
+ loading: false
+ });
}, 1400);
if (pageNum >= res.data.pages) {
that.setData({
@@ -85,8 +75,8 @@ Page({
});
setTimeout(function() {
that.setData({
- loading:false,
- })
+ loading: false
+ });
}, 1400);
}
/**
@@ -102,14 +92,14 @@ Page({
} else {
console.log("加载完成allow_load设置成false");
that.setData({
- loading:true,
- content:"^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
- })
- setTimeout(function(){
+ loading: true,
+ content: "^_^再拉裤子就掉啦ʅ(´◔౪◔)ʃ"
+ });
+ setTimeout(function() {
that.setData({
- loading:false,
- })
- },1400)
+ loading: false
+ });
+ }, 1400);
}
},
handleChange({ detail }) {
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index 66ce331..5680861 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -73,7 +73,7 @@
right: 20rpx;
bottom: 0;
margin: auto;
- width: 200rpx;
+ width: 180rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
diff --git a/pages/index/index.js b/pages/index/index.js
index 0a96413..0322c2e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -45,7 +45,7 @@ Page({
url: config.api.bannerlist,
data: {
pageNum: 1,
- pageSize: 10
+ pageSize: 5
}
}).then(res => {
that.setData({
diff --git a/pages/index/rushToBuy/index.wxss b/pages/index/rushToBuy/index.wxss
index 8a53f20..f66dc85 100644
--- a/pages/index/rushToBuy/index.wxss
+++ b/pages/index/rushToBuy/index.wxss
@@ -37,12 +37,10 @@
.index-scroll-view .commodity:last-child{
margin-right: 30rpx;
}
-.index-scroll-view .commodity-img {
- height: 213rpx;
-}
-.index-scroll-view .commodity-img image{
- width: 100%;
- height: 100%;
+.commodity-img{
+display: block;
+ width: 355rpx;
+ height: 213rpx;
}
.index-scroll-view .commodity-info {
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index bf70ee1..86aab37 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -49,13 +49,13 @@ Page({
if (key == 'all') {
var variable = {
pageNum: pageNum,
- pageSize: 15,
+ pageSize: 5,
paymentType:0
};
} else {
var variable = {
pageNum: pageNum,
- pageSize: 15,
+ pageSize: 5,
orderStatus: key,
paymentType:0
};
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 8648f06..a7495f2 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -38,7 +38,7 @@
支付
-
+
已过期
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index b708361..7cd147a 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -29,7 +29,7 @@
}
.logo {
- width: 248rpx;
+ width: 350rpx;
height: 184rpx;
border: 1px solid #f8f8f8;
border-radius: 16rpx;
@@ -58,22 +58,28 @@
.info view:nth-child(1) text {
font-size: 30rpx;
+ /* width: 340rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis; */
}
.info view:nth-child(1) text:nth-child(2) {
color: #f96563;
font-size: 24rpx;
+ /* width: 340rpx;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis; */
}
-.info view:nth-child(2),
-.info view:nth-child(3) {
+.info view:nth-child(2), .info view:nth-child(3) {
color: #f96563;
font-size: 24rpx;
padding-left: 4%;
}
-.info view:nth-child(2) text,
-.info view:nth-child(3) text {
+.info view:nth-child(2) text, .info view:nth-child(3) text {
font-size: 22rpx;
color: #b8b8b8;
}
@@ -111,7 +117,7 @@
bottom: 0;
margin: auto;
right: 20rpx;
- width: 200rpx;
+ width: 180rpx;
height: 60rpx;
line-height: 60rpx;
text-align: center;
@@ -126,31 +132,35 @@
font-size: 28rpx;
color: #fff;
}
-.dingdan{
+
+.dingdan {
margin-top: 200rpx;
}
+
.dingdan text {
display: block;
text-align: center;
font-size: 30rpx;
color: #00c0ff;
}
+
.dingdan image {
display: block;
width: 100rpx;
margin: 0 auto 16rpx;
}
-.loading{
+.loading {
text-align: center;
height: 80rpx;
line-height: 80rpx;
font-size: 26rpx;
color: #999;
}
-.loading image{
+
+.loading image {
width: 40rpx;
height: 40rpx;
vertical-align: middle;
margin-right: 10rpx;
-}
\ No newline at end of file
+}
diff --git a/pages/rushToBuy/index.wxss b/pages/rushToBuy/index.wxss
index af36e7a..b113b34 100644
--- a/pages/rushToBuy/index.wxss
+++ b/pages/rushToBuy/index.wxss
@@ -22,7 +22,7 @@
.flashSaleItemWrap {
width: 100%;
height: 410rpx;
- border-bottom: 10rpx solid #ededed;
+ border-bottom: 10rpx solid #f8f8f8;
}
.flashSaleItem {