diff --git a/ext.json b/ext.json
index 4f5099c..4e38fc5 100644
--- a/ext.json
+++ b/ext.json
@@ -4,7 +4,7 @@
"ext": {
"weappId": "wxea71200db93d756b",
"name": "富茂客官开发",
- "appVersion": "C.3.4.1",
+ "appVersion": "C.3.4.2",
"attr": {
"ifHaveCarModular": "1",
"etcpversion": "release",
diff --git a/pages/ConsumeDetail/ConsumeDetail.wxml b/pages/ConsumeDetail/ConsumeDetail.wxml
index b7ce43a..5c8ee48 100644
--- a/pages/ConsumeDetail/ConsumeDetail.wxml
+++ b/pages/ConsumeDetail/ConsumeDetail.wxml
@@ -40,6 +40,4 @@
-
-
\ No newline at end of file
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index 7b28a4c..61a3c9c 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -13,6 +13,10 @@ Page({
headbgUrl: imgurl.headbg.url,
quesBgUrl: imgurl.ques_bg.url,
close02: imgurl.close02.url,
+ hidden: "hidden",
+ height: "",
+ more: "点击查看更多",
+ showMore: true,
data: {
title: null
},
@@ -60,6 +64,26 @@ Page({
phoneNumber: e.target.dataset.merchantlinkphone
});
},
+ // 点击查看更多
+ more: function () {
+ let that = this;
+ if (that.data.more == '点击查看更多') {
+ this.setData({
+ hidden: "",
+ height: that.data.data.merchantVoList.length * 140 + 'rpx',
+ more: "点击收起",
+ showMore: true
+ })
+ }
+ else {
+ this.setData({
+ hidden: "hidden",
+ height: 4 * 140 + 'rpx',
+ more: "点击查看更多",
+ showMore: true
+ })
+ }
+ },
//获取当前登录用户信息
getUserInfo: function () {
let that = this;
@@ -375,6 +399,17 @@ Page({
that.setData({
data: res.data
});
+ if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) {
+ that.setData({
+ height: that.data.data.merchantVoList.length * 140 + 'rpx',
+ showMore: false
+ })
+ } else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) {
+ that.setData({
+ height: 4 * 140 + 'rpx'
+ })
+ }
+ console.log(that.data.height)
if (res.data.validType == 1) {
that.setData({
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
@@ -720,6 +755,7 @@ Page({
this.setData({
showbutton: false
})
+ console.log(this.data.showMore)
},
onShareAppMessage: function (options) {
var that = this;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 9a938af..db720b6 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -60,8 +60,8 @@
-
- 适用门店
+ 适用门店
+
@@ -73,6 +73,7 @@
+ {{more}}
购买须知
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index b7d0c33..e59e2b1 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -167,10 +167,8 @@ button::after{ border: none; }
.posi>view:nth-child(2) {
width: 100%;
- height: 87rpx;
display: flex;
justify-content: space-between;
- line-height: 87rpx;
}
.posi>view:nth-child(2) text:nth-child(1) {
@@ -188,14 +186,12 @@ button::after{ border: none; }
display: flex;
padding: 20rpx 0;
background: #fff;
- height: 100rpx;
- margin-bottom: 20rpx;
}
.posi_logo view:nth-child(1) {
width: 100rpx;
- height: 100rpx;
border-radius: 16rpx;
+ height: 100rpx;
}
.posi_logo view:nth-child(1) image {
@@ -217,6 +213,11 @@ button::after{ border: none; }
font-size: 32rpx;
color: #333;
letter-spacing: 0;
+ height:55rpx;
+ line-height:64rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
.posi_logo view:nth-child(2) text:nth-child(2) {
@@ -224,7 +225,10 @@ button::after{ border: none; }
color: #b8b8b8;
padding-top: 3rpx;
width: 450rpx;
- height: 36rpx;
+ height:41rpx;
+ line-height:40rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
overflow: hidden;
}
@@ -489,6 +493,7 @@ button::after{ border: none; }
height: 70rpx;
line-height: 70rpx;
color: #333;
+ text-indent:1em;
}
.btns{
padding: 0 33rpx;
@@ -621,4 +626,11 @@ button::after{ border: none; }
.a-img image{
width: 100%;
height: 100%;
+}
+.bottom{
+ text-align: center;
+ height: 70rpx;
+ line-height: 70rpx;
+ color: #999;
+ font-size: 32rpx;
}
\ No newline at end of file
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 66ef9ac..d56a234 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -1,9 +1,8 @@
-
-
+
- 请输入要搜索的门店
+ 搜索门店
@@ -46,4 +45,4 @@
-
+