From 5d797b3de1e087040dbd889081c126bf06197dc2 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 13 Sep 2018 10:24:53 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E7=9A=84?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F][=E5=A2=9E=E5=8A=A0]:=E6=B4=BB=E5=8A=A8?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/actdetail/actdetail.wxml | 5 +++--
pages/actdetail/actdetail.wxss | 15 +++++++++++++++
pages/bannerdetail/index.wxss | 2 ++
pages/index/rushToBuy/index.js | 6 ++++--
pages/index/rushToBuy/index.wxml | 2 +-
5 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/pages/actdetail/actdetail.wxml b/pages/actdetail/actdetail.wxml
index 55e13a6..4a0b3bb 100644
--- a/pages/actdetail/actdetail.wxml
+++ b/pages/actdetail/actdetail.wxml
@@ -1,3 +1,4 @@
- {{detail}}
-
+ 活动详情
+ {{detail}}
+
\ No newline at end of file
diff --git a/pages/actdetail/actdetail.wxss b/pages/actdetail/actdetail.wxss
index e69de29..6d8ed15 100644
--- a/pages/actdetail/actdetail.wxss
+++ b/pages/actdetail/actdetail.wxss
@@ -0,0 +1,15 @@
+view text{
+ display: block;
+}
+view text:nth-of-type(1){
+ font-size: 30rpx;
+ color: #000;
+ padding: 30rpx 0;
+ text-align: center;
+}
+view text:nth-of-type(2){
+ padding: 0 30rpx;
+ font-size: 28rpx;
+ line-height: 50rpx;
+ color: #999;
+}
\ No newline at end of file
diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss
index d24da8a..569f5e3 100644
--- a/pages/bannerdetail/index.wxss
+++ b/pages/bannerdetail/index.wxss
@@ -62,6 +62,7 @@ border-bottom-left-radius: 50rpx;
.coupons_info view:nth-child(1) text {
font-size: 30rpx;
+ line-height: 32rpx;
margin-top: 10%;
}
@@ -408,6 +409,7 @@ navigator {
display: block;
text-align: center;
width: 120rpx !important;
+ margin-top: 6rpx;
}
.usermotto {
diff --git a/pages/index/rushToBuy/index.js b/pages/index/rushToBuy/index.js
index 60d215a..a499a28 100644
--- a/pages/index/rushToBuy/index.js
+++ b/pages/index/rushToBuy/index.js
@@ -12,7 +12,8 @@ Component({
* 组件的初始数据
*/
data: {
- list: []
+ list: [],
+ total:''
},
/**
@@ -50,7 +51,8 @@ Component({
}).then(res => {
console.log(res);
this.setData({
- list: res.data.list
+ list: res.data.list,
+ total:res.data.total
});
});
};
diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml
index 82bdc06..ccf3913 100644
--- a/pages/index/rushToBuy/index.wxml
+++ b/pages/index/rushToBuy/index.wxml
@@ -1,5 +1,5 @@
- 限时抢购查看更多
+ 限时抢购查看更多