From cac124452c38f06e7fecd05b7959c94e45e05d61 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 6 Aug 2019 14:04:42 +0800
Subject: [PATCH 01/21] =?UTF-8?q?[=E4=B8=93=E9=A2=98][=E4=BF=AE=E6=94=B9]:?=
=?UTF-8?q?[=E4=BF=AE=E6=94=B9=E4=B8=93=E9=A2=98=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E7=9A=84=E5=B1=82=E7=BA=A7=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/topicDetail/index.wxss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/topicDetail/index.wxss b/pages/topicDetail/index.wxss
index a7549f9..5c61b9a 100644
--- a/pages/topicDetail/index.wxss
+++ b/pages/topicDetail/index.wxss
@@ -23,7 +23,7 @@
.act {
position: relative;
- z-index: 1000000000;
+ z-index: 1000;
background: #fff;
border-radius: 12rpx;
width: 100%;
From 10ae9789e5f051a4379486611f0c3e2171da5f9e Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 6 Aug 2019 14:15:35 +0800
Subject: [PATCH 02/21] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?=
=?UTF-8?q?[=E5=81=9C=E8=BD=A6=E9=A1=B5=E9=9D=A2=E6=97=A0=E5=81=9C?=
=?UTF-8?q?=E8=BD=A6=E7=9A=84=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/passCar/passCar.wxml | 4 ++--
pages/passCar/passCar.wxss | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml
index d495b00..2a549d1 100644
--- a/pages/passCar/passCar.wxml
+++ b/pages/passCar/passCar.wxml
@@ -102,8 +102,8 @@
-
-
+
+
智慧停车即将上线
敬请期待
diff --git a/pages/passCar/passCar.wxss b/pages/passCar/passCar.wxss
index 7ea6890..24b500b 100644
--- a/pages/passCar/passCar.wxss
+++ b/pages/passCar/passCar.wxss
@@ -6,6 +6,11 @@ page {
.container{
padding-bottom: 60rpx;
}
+.con text{
+ display: block;
+ text-align: center;
+ font-size: 30rpx;
+}
.header{
width: 690rpx;
height: 80rpx;
From 8392b49c922060006dad1120b1a3548d040a1443 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Tue, 6 Aug 2019 16:55:20 +0800
Subject: [PATCH 03/21] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E9=99=90=E6=97=B6?=
=?UTF-8?q?=E6=8A=A2=E8=B4=AD=E5=80=92=E8=AE=A1=E6=97=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/coupon/detail/index.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index d6a159a..f2de195 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -86,7 +86,8 @@ Page({
minLimit:0,
maxLimit:0,
dispressEndDate:false,
- barTitle:""
+ barTitle:"",
+ activityStatus:""
},
/**
* 显示分享弹框
@@ -510,6 +511,7 @@ Page({
that.setData({
begin_time: res.data.beginTime,
end_time: res.data.endTime,
+ activityStatus: res.data.activityStatus
})
if (res.data.activityStatus == 0 && flag != 'endclock') {
that.countdown(res.data.beginTime);
@@ -957,9 +959,12 @@ Page({
showbutton: false,
showbutton1: false
})
- if (this.data.end_time) {
+ if (this.data.end_time && this.data.activityStatus!=0) {
this.countdown(this.data.end_time)
}
+ else if (this.data.begin_time && this.data.activityStatus == 0) {
+ this.countdown(this.data.begin_time)
+ }
},
onUnload: function() {
let that = this;
From 6b2ec801b082e289cafbce39444693850a265b53 Mon Sep 17 00:00:00 2001
From: hurui
Date: Tue, 6 Aug 2019 17:29:02 +0800
Subject: [PATCH 04/21] =?UTF-8?q?[c=E7=AB=AF[=E4=BF=AE=E6=94=B9][=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bargain/bargain.wxss | 3 -
.../bargain/bargainDatail/bargainDatail.wxss | 2 +-
pages/cardorder/index/index.wxss | 6 +-
pages/coupon/detail/index.wxml | 2 +-
pages/coupon/detail/index.wxss | 5 +-
pages/couponorder/detail/index.js | 34 ++++++-
pages/couponorder/detail/index.wxml | 32 +++----
pages/couponorder/detail/index.wxss | 95 ++++++++++---------
pages/couponorder/index/index.wxss | 6 +-
.../payIntegcouponStatus/index.wxss | 4 +-
pages/main/index.wxml | 2 +-
pages/main/index.wxss | 16 ++--
pages/spellGroup/mySpellGroup/index.wxss | 5 +-
pages/spellGroup/spellGroup.wxml | 2 +-
pages/spellGroup/spellGroup.wxss | 10 +-
15 files changed, 130 insertions(+), 94 deletions(-)
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index c8c97a9..a9a9460 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -14,10 +14,7 @@ page{
width: 142rpx;
height: 142rpx!important;
border-radius: 10rpx;
- /* overflow: hidden; */
margin-top:10rpx;
- /* word-wrap: break-word;
- word-break: break-all; */
display: block;
}
.listitem .icon{
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss
index 1427b0a..ce3e585 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxss
+++ b/pages/bargain/bargainDatail/bargainDatail.wxss
@@ -331,7 +331,7 @@ page{
line-height: 75rpx;
text-align: center;
border: none;
- font-size: 32rpx;
+ font-size: 28rpx;
margin: 0 auto;
}
button::after{ border: none; }
diff --git a/pages/cardorder/index/index.wxss b/pages/cardorder/index/index.wxss
index 9dfac2a..74f0a65 100644
--- a/pages/cardorder/index/index.wxss
+++ b/pages/cardorder/index/index.wxss
@@ -6,10 +6,9 @@
.tabs {
width: 100% !important;
- height: 88rpx;
+ height: 96rpx;
text-align: center;
position: fixed;
- /* top: 136rpx; */
left: 0;
right: 0;
z-index: 100000;
@@ -247,7 +246,6 @@
}
.txt2{
- /* opacity: .99; */
margin-top: 36rpx;
}
.imgicon {
@@ -287,8 +285,6 @@
font-family: PingFang-SC-Regular;
font-weight: 400;
color: #FD832D;
- /* opacity: .99; */
- line-height: 44rpx;
margin-top: 30rpx;
background: #fff;
position: fixed;
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index be1d23f..aee6dac 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -48,7 +48,7 @@
¥
{{data.salePriceStr}}
- {{data.creditPrice}}积分
+ {{data.creditPrice}}积分
{{data.priceStr}}元
{{data.priceStr}}小时
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 5228d32..5b6f66e 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -721,7 +721,7 @@ button::after {
color: #999;
font-size: 32rpx;
background: #fff;
-
+ padding-top: 20rpx;
}
.presslimit {
@@ -869,4 +869,7 @@ background: #ccc8c8;
}
.swiper-box .wx-swiper-dot-active::before{
background:#f6792b;
+}
+.jifen{
+ font-size: 30rpx;
}
\ No newline at end of file
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 8d318e1..31e0263 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -8,6 +8,9 @@ const QR = require("../../../utils/memberqrcode.js");
//券详情页面
Page({
data: {
+ showMore: true,
+ more: "点击查看更多",
+ hidden: "hidden",
navigationBarHeight,
code: "",
topLine: imgurl.topLine.url,
@@ -34,6 +37,25 @@ Page({
staticGamedata: {},
showIf: false,
},
+ // 点击查看更多
+ 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
+ })
+ }
+ },
onUnload:function(){
let that = this;
clearInterval(that.data.setInter);
@@ -148,7 +170,7 @@ Page({
})
}
}, 2000);
-
+
/**
* 页面需要初始渲染的效果
*/
@@ -173,6 +195,16 @@ Page({
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss")
})
}
+ 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'
+ })
+ }
let url = JSON.stringify({
END:"C",
TYPE:"couponorder",
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 621fae4..11fd3dc 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -49,26 +49,26 @@
优惠券码:{{code}}
-
-
-
- 适用门店
-
-
-
-
-
-
-
- {{item.merchantName}}
- {{item.addr}}{{item.buildingName}}{{item.floorName}}
-
-
-
+
+ 适用门店
+
+
+
+
+
+
+ {{item.merchantName}}
+
+
+ {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}
+ ,
+
+
+ {{more}}
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 66d7aa6..1fd4374 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -197,69 +197,69 @@ page {
letter-spacing: 0;
text-align: left;
}
+.applyshop {
+ font-size: 30rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ color: #333;
+ text-indent: 1em;
+ padding-top: 20rpx;
+}
.posi {
- width: 100%;
- display: flex;
- flex-direction: column;
- background: #fff;
position: relative;
+ width: 100%;
+ background: #FFF;
+ /* margin: 18rpx 0 0; */
}
.posi_logo {
+ position: relative;
width: 92%;
- padding: 30rpx 4% 0;
display: flex;
- position: relative;
-}
-
-.shiji {
- font-size: 24rpx !important;
- color: #919191 !important;
- letter-spacing: 0;
+ padding: 20rpx 0;
+ background: #fff;
+ z-index: 10;
+ margin: 0 auto;
}
.posi_logo view:nth-child(1) {
- width: 126rpx;
- height: 126rpx;
- overflow: hidden;
- flex: 2;
- border: 2rpx solid #e7e7e7;
+ /* width: 100rpx; *//* margin-right: 16rpx; */
border-radius: 16rpx;
+ /* height: 100rpx; */
}
.posi_logo view:nth-child(1) image {
- width: 100%;
- height: 100%;
-}
-
-.posi_logo view:nth-child(2) {
- position: relative;
- display: flex;
- flex-direction: column;
- flex: 8;
- padding-left: 30rpx;
+ display: block;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
+ margin-right: 16rpx;
+ border: 1px solid #e5e5e5;
}
-
-.posi_logo view:nth-child(2) text:nth-child(1) {
- font-size: 30rpx;
- width: 320rpx;
+.name{
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+ width: 500rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
-.timevalidity i{
- font-style: normal;
- font-size: 28rpx;
+.posi_logo view:nth-child(2) view:nth-child(1) {
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+}
+
+.shopVoList {
+ display: flex !important;
+ padding-left: 0 !important;
+ flex-direction: row !important;
}
-.posi_logo view:nth-child(2) text:nth-child(2) {
- font-size: 24rpx;
- color: #b8b8b8;
- padding-top: 10rpx;
- width: 386rpx;
- white-space: wrap;
- text-overflow: ellipsis;
- overflow: hidden;
- height: 78rpx;
+
+.shopVoList text {
+ font-size: 20rpx !important;
+ color: #b8b8b8 !important;
}
.tit {
@@ -373,4 +373,13 @@ page {
color: red!important;
border: 1px solid red;
padding: 3rpx;
+}
+.bottom {
+ text-align: center;
+ height: 70rpx;
+ line-height: 70rpx;
+ color: #999;
+ font-size: 32rpx;
+ background: #fff;
+ margin-top: 20rpx;
}
\ No newline at end of file
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index 1577e78..40c3df2 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -4,7 +4,6 @@ page{
.market {
width: 100%;
height: 100%;
- /* background: #f5f5f5; */
}
button::after{ border: none; }
@@ -32,10 +31,9 @@ button::after{ border: none; }
.tabs {
width: 100% !important;
- height: 88rpx;
+ height: 96rpx;
text-align: center;
position: fixed;
- /* top: 0; */
left: 0;
right: 0;
z-index: 100000;
@@ -67,7 +65,6 @@ button::after{ border: none; }
height: 140rpx;
line-height: 140rpx;
text-align: center;
- /* padding: 30rpx 0 0; */
color: #FFFFFF;
font-size: 30rpx;
@@ -117,7 +114,6 @@ button::after{ border: none; }
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
- /* padding: 0 2%; */
}
.info {
diff --git a/pages/integralmall/payIntegcouponStatus/index.wxss b/pages/integralmall/payIntegcouponStatus/index.wxss
index 0067d09..1c1779b 100644
--- a/pages/integralmall/payIntegcouponStatus/index.wxss
+++ b/pages/integralmall/payIntegcouponStatus/index.wxss
@@ -35,8 +35,10 @@ page{
.c-right{
width: 510rpx;
float: left;
- line-height: 120rpx;
+ line-height: 50rpx;
color: #3C3C3C;
+ font-size: 32rpx;
+ margin-top: 10rpx;
}
.detail-text{
font-size:30rpx;
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 2a5eca2..265548e 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -70,7 +70,7 @@
今日好物推荐,
'{{xslist[0].title}}'原价 {{xslist[0].priceStr}} 现价...
- 抢购
+ 抢购
diff --git a/pages/spellGroup/spellGroup.wxss b/pages/spellGroup/spellGroup.wxss
index 11042f1..c6940c8 100644
--- a/pages/spellGroup/spellGroup.wxss
+++ b/pages/spellGroup/spellGroup.wxss
@@ -13,7 +13,6 @@ page {
}
.content-box{
height: auto;
- /* padding-bottom: 200rpx; */
padding: 0 16rpx 200rpx;
}
.loading {
@@ -166,9 +165,6 @@ image{
font-weight:500;
color:#FD782D;
line-height:44rpx;
- width: 50%;
- white-space: nowrap;
- text-overflow: ellipsis;
}
.spell-centerH .price02{
font-size: 24rpx;
@@ -176,7 +172,7 @@ image{
font-weight:500;
text-decoration:line-through;
color:rgba(140,140,140,1);
- line-height: 30rpx;
+ line-height: 44rpx;
margin-top: 15rpx;
}
.spell-centerH .price-num{
@@ -192,7 +188,7 @@ image{
.spell-centerHr .price-num{
display: inline-block;
font-size: 32rpx;
- width: 95rpx;
+ width: 100rpx;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
@@ -204,7 +200,7 @@ image{
}
.spell-centerH .price-numHr{
font-size:32rpx;
- line-height: 32rpx;
+ line-height: 44rpx;
}
.content .price-unit{
font-size:24rpx;
From 3549a91b7317898737173d31256c9c51d7112acf Mon Sep 17 00:00:00 2001
From: hurui
Date: Tue, 6 Aug 2019 18:21:29 +0800
Subject: [PATCH 05/21] =?UTF-8?q?[=E7=A0=8D=E4=BB=B7=E5=88=97=E8=A1=A8][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=A0=B7=E5=BC=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bargain/bargain.wxml | 19 +++++++++++--------
pages/bargain/bargain.wxss | 8 ++++++--
pages/spellGroup/spellGroup.wxml | 2 +-
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/pages/bargain/bargain.wxml b/pages/bargain/bargain.wxml
index 8bb9513..16cea2f 100644
--- a/pages/bargain/bargain.wxml
+++ b/pages/bargain/bargain.wxml
@@ -15,7 +15,10 @@
{{item.title}}
- 可砍至¥{{item.salePriceStr}}
+
+ 可砍至¥
+ {{item.salePriceStr}}
+
原价{{item.priceStr}}
发起砍价
@@ -31,16 +34,16 @@
进行中
已完成
已失效
-
- {{item.title}}
-
- 已砍至¥ {{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}原价{{item.price/100}}
-
- 已砍价到底价:{{item.salePrice/100}}元
+ {{item.title}}
+
+ 已砍至¥
+ {{item.price/100-(item.price/100-item.salePrice/100-item.pressCurrentValue/100)}}
+
+ 原价{{item.price/100}}
+ 已砍价到底价:{{item.salePrice/100}}元
-
邀请好友
diff --git a/pages/bargain/bargain.wxss b/pages/bargain/bargain.wxss
index a9a9460..986f403 100644
--- a/pages/bargain/bargain.wxss
+++ b/pages/bargain/bargain.wxss
@@ -63,8 +63,12 @@ page{
width: 100%;
font-size:26rpx;
color:rgba(253,131,45,1);
- line-height:44rpx;
+ line-height:40rpx;
height: 48rpx;
+ display: flex;
+}
+ .txt04 view:nth-child(1) {
+ margin-top: 15rpx;
}
.frImg{
height: 78rpx;
@@ -90,7 +94,7 @@ page{
font-size:40rpx;
font-weight:500;
color:rgba(253,131,45,1);
- width:150rpx;
+ width:200rpx;
margin-top: 10rpx;
overflow:hidden;
white-space: nowrap;
diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml
index b7b5e75..5f30535 100644
--- a/pages/spellGroup/spellGroup.wxml
+++ b/pages/spellGroup/spellGroup.wxml
@@ -61,7 +61,7 @@
拼团价¥
- {{item.salePrice/100}}3232323232
+ {{item.salePrice/100}}
From fd4282eedb61c4adc373dd44e0b53ebecb229ac0 Mon Sep 17 00:00:00 2001
From: hurui
Date: Tue, 6 Aug 2019 19:07:50 +0800
Subject: [PATCH 06/21] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9][=E6=97=A0=E5=8D=A1=E6=97=B6=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/discountCardList/discountCardList.wxss | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pages/discountCardList/discountCardList.wxss b/pages/discountCardList/discountCardList.wxss
index 751e23a..f80fe96 100644
--- a/pages/discountCardList/discountCardList.wxss
+++ b/pages/discountCardList/discountCardList.wxss
@@ -181,9 +181,10 @@ button::after{ border: none; }
}
.nocoupon image {
- width: 300rpx;
+ width: 261rpx;
+ height: 272rpx;
display: block;
- margin: 3% auto 0;
+ margin: 0 auto;
}
.txt001 {
From 4331631f1d9a852b22d0c12d403d1115ff5ef4b0 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 7 Aug 2019 11:32:58 +0800
Subject: [PATCH 07/21] =?UTF-8?q?[=E9=97=A8=E5=BA=97=E5=88=97=E8=A1=A8][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E5=B0=86=E9=97=A8=E5=BA=97=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=B0=81=E8=A3=85=E6=88=90=E7=BB=84=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/banner/index.json | 5 +--
components/banner/index.wxss | 4 +-
components/navbar/navbar.js | 1 -
components/store/index.js | 78 ++++++++++++++++++++++++++++++++++
components/store/index.json | 3 ++
components/store/index.wxml | 19 +++++++++
components/store/index.wxss | 72 +++++++++++++++++++++++++++++++
pages/coupon/detail/index.js | 53 +++--------------------
pages/coupon/detail/index.json | 3 +-
pages/coupon/detail/index.wxml | 21 +--------
pages/coupon/detail/index.wxss | 76 ---------------------------------
11 files changed, 184 insertions(+), 151 deletions(-)
create mode 100644 components/store/index.js
create mode 100644 components/store/index.json
create mode 100644 components/store/index.wxml
create mode 100644 components/store/index.wxss
diff --git a/components/banner/index.json b/components/banner/index.json
index 3bd5dd3..32640e0 100644
--- a/components/banner/index.json
+++ b/components/banner/index.json
@@ -1,6 +1,3 @@
{
- "component": true,
- "usingComponents": {
-
- }
+ "component": true
}
\ No newline at end of file
diff --git a/components/banner/index.wxss b/components/banner/index.wxss
index fadbf3f..8ad3b5d 100644
--- a/components/banner/index.wxss
+++ b/components/banner/index.wxss
@@ -57,12 +57,12 @@
.itemImg{
position: absolute;
width: 640rpx;
- height: 248rpx;
+ height: 227rpx;
border-radius: 15rpx;
overflow: hidden;
z-index: 5;
opacity: 0.7;
- top: 15%;
+ top: 20%;
margin: 0 20rpx;
}
.active{
diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js
index 60cf7fe..48f045a 100644
--- a/components/navbar/navbar.js
+++ b/components/navbar/navbar.js
@@ -48,6 +48,5 @@ Component({
back: false
})
}
- console.debug()
}
})
diff --git a/components/store/index.js b/components/store/index.js
new file mode 100644
index 0000000..f164d79
--- /dev/null
+++ b/components/store/index.js
@@ -0,0 +1,78 @@
+const imgurl = require("../../utils/imgurl");
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ merchantVoList: {
+ value: [],
+ type: Array
+ }
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+ teljpgUrl: imgurl.teljpg.url,
+ showMore:true,
+ more: "点击查看更多",
+ hidden:"hidden",
+ height: ""
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ /**
+ * 跳转到门店列表的详情页面
+ */
+ gotoDetail(e) {
+ wx.navigateTo({
+ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
+ })
+ },
+ // 点击查看更多
+ more: function () {
+ let that = this;
+ if (that.data.more == '点击查看更多') {
+ this.setData({
+ hidden: "",
+ height: 'auto!important',
+ more: "点击收起",
+ showMore: true
+ })
+ } else {
+ that.setData({
+ hidden: "hidden",
+ height: 4 * 140 + 'rpx',
+ more: "点击查看更多",
+ showMore: true
+ })
+ }
+ },
+ phone: function (e) {
+ let that = this;
+ wx.makePhoneCall({
+ phoneNumber: e.target.dataset.merchantlinkphone
+ });
+ }
+ },
+ ready: function () {
+ let merchantVoList = this.properties.merchantVoList;
+ if (merchantVoList.length>0){
+ if (merchantVoList.length <= 4) {
+ this.setData({
+ height: merchantVoList.length * 140 + 'rpx',
+ showMore: false,
+ hidden:"hidden"
+ })
+ } else if (merchantVoList && merchantVoList.length > 4) {
+ this.setData({
+ height: 4 * 140 + 'rpx'
+ })
+ }
+ }
+ }
+});
diff --git a/components/store/index.json b/components/store/index.json
new file mode 100644
index 0000000..32640e0
--- /dev/null
+++ b/components/store/index.json
@@ -0,0 +1,3 @@
+{
+ "component": true
+}
\ No newline at end of file
diff --git a/components/store/index.wxml b/components/store/index.wxml
new file mode 100644
index 0000000..53728ab
--- /dev/null
+++ b/components/store/index.wxml
@@ -0,0 +1,19 @@
+适用门店
+
+
+
+
+
+
+ {{item.merchantName}}
+
+
+ {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}
+ ,
+
+
+
+
+
+
+{{more}}
\ No newline at end of file
diff --git a/components/store/index.wxss b/components/store/index.wxss
new file mode 100644
index 0000000..06b7703
--- /dev/null
+++ b/components/store/index.wxss
@@ -0,0 +1,72 @@
+
+
+.applyshop {
+ font-size: 30rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ color: #333;
+ text-indent: 1em;
+ background: #fff;
+}
+
+.posi {
+ position: relative;
+ width: 100%;
+ background: #FFF;
+}
+.posi_logo {
+ position: relative;
+ width: 92%;
+ display: flex;
+ padding: 20rpx 0;
+ background: #fff;
+ z-index: 10;
+ margin: 0 auto;
+}
+
+.posi_logo view:nth-child(1) {
+ /* width: 100rpx; *//* margin-right: 16rpx; */
+ border-radius: 16rpx;
+ /* height: 100rpx; */
+}
+
+.posi_logo view:nth-child(1) image {
+ display: block;
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 16rpx;
+ margin-right: 16rpx;
+ border: 1px solid #e5e5e5;
+}
+.name{
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+ width: 500rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+.posi_logo view:nth-child(2) view:nth-child(1) {
+ font-size: 32rpx;
+ color: #333;
+ letter-spacing: 0;
+}
+
+.shopVoList {
+ display: flex !important;
+ padding-left: 0 !important;
+ flex-direction: row !important;
+}
+
+.shopVoList text {
+ font-size: 20rpx !important;
+ color: #b8b8b8 !important;
+}
+.bottom{
+ background: #fff;
+ color: #666;
+ text-align: center;
+ padding: 20rpx 0;
+ font-size: 32rpx;
+}
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index f2de195..cbeb04c 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -22,12 +22,8 @@ Page({
fail: imgurl.fail.url,
wmhome: imgurl.wmhome.url,
swiperCurrent: 0,
- hidden: "hidden",
- height: "",
detailPicture:[],
coverPicture:[],
- more: "点击查看更多",
- showMore: true,
data: {
title: null
},
@@ -105,14 +101,7 @@ Page({
isshowposter: false,
})
},
- /**
- * 跳转到门店列表的详情页面
- */
- gotoDetail(e) {
- wx.navigateTo({
- url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
- })
- },
+
/**
* 显示分享海报
*/
@@ -127,31 +116,8 @@ Page({
swiperCurrent: e.detail.current
});
},
- phone: function(e) {
- let that = this;
- wx.makePhoneCall({
- 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;
@@ -546,19 +512,10 @@ Page({
}
wx.hideLoading();
that.setData({
- data: res.data
+ data: res.data,
+ merchantVoList: res.data.merchantVoList
});
- 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'
- })
- }
if (res.data.validType == 1) {
that.setData({
validStartDate: util.formatTime(res.data.validStartDate, "yyyy-MM-dd"),
diff --git a/pages/coupon/detail/index.json b/pages/coupon/detail/index.json
index 9972df0..ef321ac 100644
--- a/pages/coupon/detail/index.json
+++ b/pages/coupon/detail/index.json
@@ -1,7 +1,8 @@
{
"usingComponents": {
"c-shareposter": "../../../../components/shareposter/index",
- "navbar": "../../../../components/navbar/navbar"
+ "navbar": "../../../../components/navbar/navbar",
+ "store": "../../../../components/store/index"
},
"navigationBarTitleText": "",
"backgroundColor":"#f4f4f4",
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index aee6dac..679b8ff 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -89,25 +89,8 @@
-
-
-
-
-
-
-
- {{item.merchantName}}
-
-
- {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}
- ,
-
-
-
-
-
-
- {{more}}
+
+
购买须知
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 5b6f66e..424304e 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -220,74 +220,6 @@ button::after {
float: right;
}
-.posi {
- position: relative;
- width: 100%;
- background: #FFF;
- margin: 18rpx 0 0;
-}
-
-/* .posi>view:nth-child(2) text:nth-child(1) {
- font-size: 30rpx;
- color: #a9a9a9;
-} */
-
-/*
-.posi>view:nth-child(2) text:nth-child(2) {
- font-size: 30rpx;
- color: #a9a9a9;
-} */
-
-.posi_logo {
- position: relative;
- width: 92%;
- display: flex;
- padding: 20rpx 0;
- background: #fff;
- z-index: 10;
- margin: 0 auto;
-}
-
-.posi_logo view:nth-child(1) {
- /* width: 100rpx; *//* margin-right: 16rpx; */
- border-radius: 16rpx;
- /* height: 100rpx; */
-}
-
-.posi_logo view:nth-child(1) image {
- display: block;
- width: 100rpx;
- height: 100rpx;
- border-radius: 16rpx;
- margin-right: 16rpx;
- border: 1px solid #e5e5e5;
-}
-.name{
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
- width: 500rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-.posi_logo view:nth-child(2) view:nth-child(1) {
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
-}
-
-.shopVoList {
- display: flex !important;
- padding-left: 0 !important;
- flex-direction: row !important;
-}
-
-.shopVoList text {
- font-size: 20rpx !important;
- color: #b8b8b8 !important;
-}
-
.notes view:nth-child(1) {
height: 87rpx;
line-height: 87rpx;
@@ -544,14 +476,6 @@ button::after {
padding: 0 6rpx;
}
-.applyshop {
- font-size: 30rpx;
- height: 70rpx;
- line-height: 70rpx;
- color: #333;
- text-indent: 1em;
-}
-
.btns {
/* padding: 0 33rpx; */
position: fixed;
From 3d646213ba5c248a6a5efe127e525e64f3dee505 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 7 Aug 2019 11:43:36 +0800
Subject: [PATCH 08/21] =?UTF-8?q?[=E6=B8=B8=E6=88=8F][=E4=BF=AE=E6=94=B9]:?=
=?UTF-8?q?[=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E7=9A=84=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E6=96=B9=E5=BC=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/cardorder/detail/index.js | 2 +-
pages/couponorder/detail/index.js | 2 +-
pages/order/detail/index.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pages/cardorder/detail/index.js b/pages/cardorder/detail/index.js
index ff8c1a8..e9558ff 100644
--- a/pages/cardorder/detail/index.js
+++ b/pages/cardorder/detail/index.js
@@ -38,7 +38,7 @@ Page({
},
gotogame: function () {
let that = this;
- wx.navigateTo({
+ wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 31e0263..8d4f20e 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -66,7 +66,7 @@ Page({
},
gotogame: function () {
let that = this;
- wx.navigateTo({
+ wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 68dbdb3..8e0bec7 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -114,7 +114,7 @@ Page({
},
gotogame: function () {
let that = this;
- wx.navigateTo({
+ wx.redirectTo({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
From 74b00dcbaeef1dd7019ac7f7a52f4ad0d4d7a23b Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 7 Aug 2019 11:52:28 +0800
Subject: [PATCH 09/21] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9]:[=E5=B0=86=E9=97=A8=E5=BA=97=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=B0=81=E8=A3=85=E6=88=90=E7=BB=84=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/detail/index.json | 3 ++-
pages/order/detail/index.wxml | 14 ++------------
pages/order/detail/index.wxss | 20 ++++++--------------
3 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/pages/order/detail/index.json b/pages/order/detail/index.json
index 6115e0c..616741a 100644
--- a/pages/order/detail/index.json
+++ b/pages/order/detail/index.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "navbar": "../../../components/navbar/navbar"
+ "navbar": "../../../components/navbar/navbar",
+ "store": "../../../components/store/index"
}
}
\ No newline at end of file
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 4b01dd6..0c86021 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -74,18 +74,8 @@
-
-
- 适用门店
-
-
-
-
- {{item.merchantName}} {{item.buildingName}}{{item.floorName}}
-
-
-
-
+
+
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index 039b84d..227d1e8 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -165,7 +165,7 @@ page {
width: 100%;
margin-top: 20rpx;
}
-
+/*
.classifShop{
background: #FFFFFF;
width: 100%;
@@ -185,7 +185,7 @@ page {
.classifShop >view:nth-child(1){
height: 88rpx!important;
line-height:94rpx;
-}
+} */
.classif > view:nth-child(2),.classif > view:nth-child(3){
position: relative;
@@ -196,9 +196,6 @@ page {
padding-left: 5%;
padding-right: 5%;
/* border-bottom: 1rpx solid #eee; */
-}
-.bianhao{
-
}
.classif > view text:nth-child(2) {
font-size: 28rpx;
@@ -213,10 +210,6 @@ page {
.classif > view:nth-child(1) {
display: block;
}
-.classif > view:nth-child(3) view text:nth-child(2) {
- /* padding-left: 15rpx; */
-}
-
.classif > view:nth-child(6) text:nth-child(2) {
color: #666;
}
@@ -486,10 +479,9 @@ radio {
width: 100%;
height: 140rpx;
}
-
+/*
.merchantVoList {
width: 100%;
- /* position: relative; */
}
.merchantVoList .tel {
@@ -498,7 +490,7 @@ radio {
float: right;
z-index: 10;
margin-top: 30rpx;
-}
+} */
.btns {
background: #00c0ff;
@@ -510,13 +502,13 @@ radio {
line-height: 94rpx;
border-radius: 61rpx;
}
-.merchantImgUrl{
+/* .merchantImgUrl{
width: 90rpx;
float: left;
border-radius: 10rpx;
z-index: 10;
margin: 0 auto;
-}
+} */
.support-tansfer{
width: 690rpx;
border-radius: 50rpx;
From eb131ce28576d0c555b43c3d02e13cb3c7a83ad3 Mon Sep 17 00:00:00 2001
From: hurui
Date: Wed, 7 Aug 2019 15:10:22 +0800
Subject: [PATCH 10/21] =?UTF-8?q?[=E6=88=91=E7=9A=84=E5=88=B8=E5=8C=85][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=80=82=E7=94=A8=E9=97=A8=E5=BA=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/store/index.wxss | 14 +++--
pages/coupon/detail/index.wxml | 2 +-
pages/couponorder/detail/index.js | 43 +--------------
pages/couponorder/detail/index.json | 3 +-
pages/couponorder/detail/index.wxml | 7 ++-
pages/couponorder/detail/index.wxss | 86 -----------------------------
6 files changed, 18 insertions(+), 137 deletions(-)
diff --git a/components/store/index.wxss b/components/store/index.wxss
index 06b7703..bc5655c 100644
--- a/components/store/index.wxss
+++ b/components/store/index.wxss
@@ -1,5 +1,3 @@
-
-
.applyshop {
font-size: 30rpx;
height: 70rpx;
@@ -25,9 +23,7 @@
}
.posi_logo view:nth-child(1) {
- /* width: 100rpx; *//* margin-right: 16rpx; */
border-radius: 16rpx;
- /* height: 100rpx; */
}
.posi_logo view:nth-child(1) image {
@@ -70,3 +66,13 @@
padding: 20rpx 0;
font-size: 32rpx;
}
+.tel {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+ width: 50rpx;
+ height: 50rpx;
+ z-index: 10;
+}
\ No newline at end of file
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 679b8ff..34759bd 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -90,7 +90,7 @@
-
+
购买须知
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index 8d4f20e..ffcd3c6 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -8,9 +8,6 @@ const QR = require("../../../utils/memberqrcode.js");
//券详情页面
Page({
data: {
- showMore: true,
- more: "点击查看更多",
- hidden: "hidden",
navigationBarHeight,
code: "",
topLine: imgurl.topLine.url,
@@ -37,25 +34,6 @@ Page({
staticGamedata: {},
showIf: false,
},
- // 点击查看更多
- 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
- })
- }
- },
onUnload:function(){
let that = this;
clearInterval(that.data.setInter);
@@ -70,14 +48,6 @@ Page({
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId,
})
},
- /**
- * 跳转到门店列表的详情页面
- */
- gotoDetail(e) {
- wx.navigateTo({
- url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
- })
- },
// 获取游戏
getStaticGame(token) {
let _this = this;
@@ -130,10 +100,9 @@ Page({
couponOrderId: options.quancode
}
}).then(res => {
- console.log(res);
that.setData({
couponorderstatus: res.data.couponOrderStatus,
- data: res.data
+ data: res.data,
});
if (res.data.couponOrderStatus == 1) {
/**
@@ -195,16 +164,6 @@ Page({
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss")
})
}
- 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'
- })
- }
let url = JSON.stringify({
END:"C",
TYPE:"couponorder",
diff --git a/pages/couponorder/detail/index.json b/pages/couponorder/detail/index.json
index 96e97c5..bd9dfaf 100644
--- a/pages/couponorder/detail/index.json
+++ b/pages/couponorder/detail/index.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "navbar": "../../../components/navbar/navbar"
+ "navbar": "../../../components/navbar/navbar",
+ "store": "../../../components/store/index"
}
}
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 11fd3dc..0961f64 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -49,8 +49,9 @@
优惠券码:{{code}}
-
- 适用门店
+
+
+
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 1fd4374..0cb4af8 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -10,10 +10,8 @@
border-radius: 16rpx;
}
page {
- /* background: #02c0ff; */
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
- /* padding-bottom: 20rpx; */
}
.panel, .zhuangtai image {
@@ -197,70 +195,6 @@ page {
letter-spacing: 0;
text-align: left;
}
-.applyshop {
- font-size: 30rpx;
- height: 70rpx;
- line-height: 70rpx;
- color: #333;
- text-indent: 1em;
- padding-top: 20rpx;
-}
-.posi {
- position: relative;
- width: 100%;
- background: #FFF;
- /* margin: 18rpx 0 0; */
-}
-
-.posi_logo {
- position: relative;
- width: 92%;
- display: flex;
- padding: 20rpx 0;
- background: #fff;
- z-index: 10;
- margin: 0 auto;
-}
-
-.posi_logo view:nth-child(1) {
- /* width: 100rpx; *//* margin-right: 16rpx; */
- border-radius: 16rpx;
- /* height: 100rpx; */
-}
-
-.posi_logo view:nth-child(1) image {
- display: block;
- width: 100rpx;
- height: 100rpx;
- border-radius: 16rpx;
- margin-right: 16rpx;
- border: 1px solid #e5e5e5;
-}
-.name{
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
- width: 500rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
-}
-.posi_logo view:nth-child(2) view:nth-child(1) {
- font-size: 32rpx;
- color: #333;
- letter-spacing: 0;
-}
-
-.shopVoList {
- display: flex !important;
- padding-left: 0 !important;
- flex-direction: row !important;
-}
-
-.shopVoList text {
- font-size: 20rpx !important;
- color: #b8b8b8 !important;
-}
.tit {
padding: 53rpx 0 0;
@@ -270,17 +204,6 @@ page {
letter-spacing: 0;
}
-.tel {
- position: absolute;
- right: 30rpx;
- top: 0;
- bottom: 0;
- margin: auto;
- width: 50rpx;
- height: 50rpx;
- z-index: 10;
-}
-
.notes view:nth-child(1) {
width: 92%;
height: 87rpx;
@@ -374,12 +297,3 @@ page {
border: 1px solid red;
padding: 3rpx;
}
-.bottom {
- text-align: center;
- height: 70rpx;
- line-height: 70rpx;
- color: #999;
- font-size: 32rpx;
- background: #fff;
- margin-top: 20rpx;
-}
\ No newline at end of file
From 3393c1a84ca8d906ac3c0a6219618ed2bd1e68c2 Mon Sep 17 00:00:00 2001
From: hurui
Date: Wed, 7 Aug 2019 16:16:31 +0800
Subject: [PATCH 11/21] =?UTF-8?q?[=E6=88=91=E7=9A=84=E5=88=B8=E5=8C=85][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9][=E9=80=82=E7=94=A8=E9=97=A8=E5=BA=97]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/couponorder/detail/index.wxml | 2 +-
pages/couponorder/detail/index.wxss | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 0961f64..a415a0f 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 0cb4af8..610c552 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -13,7 +13,9 @@ page {
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);
height: auto !important;
}
-
+.zhuangtai{
+ margin-bottom: 20rpx;
+}
.panel, .zhuangtai image {
position: relative;
width: 600rpx;
From b4e8d5d203c80c96d38c4e2b19fa824e8335f289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=99=96?=
Date: Wed, 7 Aug 2019 16:22:27 +0800
Subject: [PATCH 12/21] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E5=A4=B1=E8=B4=A5?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/joinFrDpell/index.wxss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss
index 0548019..0720d13 100644
--- a/pages/joinFrDpell/index.wxss
+++ b/pages/joinFrDpell/index.wxss
@@ -408,7 +408,7 @@ button::after{ border: none; }
position: fixed;
width: 545rpx;
z-index: 300;
- top: 200rpx;
+ top: 300rpx;
left: 102rpx;
border-radius: 15rpx;
}
From d72b09dcc4b81f06d0a39e6931a68cd6973a50e5 Mon Sep 17 00:00:00 2001
From: hurui
Date: Wed, 7 Aug 2019 16:57:25 +0800
Subject: [PATCH 13/21] =?UTF-8?q?[=E9=97=A8=E5=BA=97][=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E2=80=98=E5=88=86=E4=BA=AB=E2=80=99=E4=B8=8D=E5=B1=85=E4=B8=AD?=
=?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/searchbar/detail/index.wxss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index d23934a..e0fa6ed 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -282,12 +282,12 @@ page{
.fenxiang image {
width: 48rpx;
height: 48rpx;
- margin: 0 auro;
+ margin: 0 auto;
}
.gift{
color: #3C3C3C;
font-size: 20rpx;
- margin: 0 auro;
+ margin: 0 auto ;
}
.user-motto {
width: 270rpx;
From b81ef647d04a608ec5c493c3dc0239fccd050da4 Mon Sep 17 00:00:00 2001
From: hurui
Date: Wed, 7 Aug 2019 17:29:49 +0800
Subject: [PATCH 14/21] =?UTF-8?q?[=E9=97=A8=E5=BA=97][=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E5=95=86=E6=88=B7=E4=BD=8D=E7=BD=AE=E9=97=B4=E9=9A=94]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/searchbar/detail/index.wxss | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index e0fa6ed..49c79e0 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -185,6 +185,7 @@ page{
font-size: 26rpx;
color: #A6A6A6;
line-height: 22rpx;
+ margin-right: 10rpx;
}
.posi{
color: #FD832D!important;
@@ -282,12 +283,12 @@ page{
.fenxiang image {
width: 48rpx;
height: 48rpx;
- margin: 0 auto;
+ margin: 0 auro;
}
.gift{
color: #3C3C3C;
font-size: 20rpx;
- margin: 0 auto ;
+ margin: 0 auro;
}
.user-motto {
width: 270rpx;
From 40082957612d9bb0a7bd4ad45da051cbc846b4e6 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 8 Aug 2019 11:15:32 +0800
Subject: [PATCH 15/21] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E8=87=AA=E7=94=B1=E5=9B=BE?=
=?UTF-8?q?=E6=96=87=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bannerdetail/index.wxml | 2 +-
pages/freeBannerDetail/index.js | 67 +++++++++------------------------
2 files changed, 18 insertions(+), 51 deletions(-)
diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml
index 5fe0335..0f4350b 100644
--- a/pages/bannerdetail/index.wxml
+++ b/pages/bannerdetail/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/freeBannerDetail/index.js b/pages/freeBannerDetail/index.js
index 95c03c3..255ab5c 100644
--- a/pages/freeBannerDetail/index.js
+++ b/pages/freeBannerDetail/index.js
@@ -30,26 +30,22 @@ Page({
id:options.id,
token: app.globalData.token
})
- wx.request({
- url: configUrls + config.api.printHtmlById,
- data: {
- token: app.globalData.token,
- id: options.id,
- date: new Date()
- },
- header: {
- 'content-type': 'application/html'
- },
- success: function (res) {
- var temp = WxParse.wxParse('article', 'html',res.data, that, 5);
- }
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
+ if (options&&options.id){
+ wx.request({
+ url: configUrls + config.api.printHtmlById,
+ data: {
+ token: app.globalData.token,
+ id: options.id,
+ date: new Date()
+ },
+ header: {
+ 'content-type': 'application/html'
+ },
+ success: function (res) {
+ var temp = WxParse.wxParse('article', 'html', res.data, that, 5);
+ }
+ })
+ }
},
/**
* 生命周期函数--监听页面显示
@@ -58,34 +54,5 @@ Page({
this.setData({
date:new Date()
})
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
+ }
})
\ No newline at end of file
From 8ba321bf73694b7e27afcd044f7d64efcdb21a93 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 8 Aug 2019 15:01:57 +0800
Subject: [PATCH 16/21] =?UTF-8?q?[=E9=A6=96=E9=A1=B5][=E5=88=A0=E9=99=A4]:?=
=?UTF-8?q?[=E5=88=A0=E9=99=A4=E6=B2=A1=E6=9C=89=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 2 +-
pages/acSignIn/index.js | 4 +---
pages/main/index.js | 14 +-------------
pages/main/index.wxml | 42 -----------------------------------------
4 files changed, 3 insertions(+), 59 deletions(-)
diff --git a/app.wxss b/app.wxss
index adb84a6..2ab9d45 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,4 +1,4 @@
-@import "weui.wxss";
+/* @import "weui.wxss"; */
@font-face {
font-family: "iconfont"; /* project id 777313 */
diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js
index 3b290f3..4f2e65d 100644
--- a/pages/acSignIn/index.js
+++ b/pages/acSignIn/index.js
@@ -23,7 +23,6 @@ Page({
})
}
},
- // pages/index/searchbar/index
signIn(id){
let that = this;
Http.post({
@@ -55,11 +54,10 @@ Page({
title: '此活动报名已结束',
})
}
-
},
goback: function () {
wx.switchTab({
url: '/pages/main/index',
})
- },
+ }
})
\ No newline at end of file
diff --git a/pages/main/index.js b/pages/main/index.js
index 11f9a9d..47671ee 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -69,15 +69,7 @@ Page({
display: 'none',
display1: 'none',
optionsData: null,
- credit: 0,
- score: '0',
- page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载
- topicTitle:'',
- },
- close: function() {
- this.setData({
- showIf: false
- })
+ page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载
},
alphaClick: function(even) {
var animation = wx.createAnimation({})
@@ -272,13 +264,10 @@ Page({
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore,
- credit: res.data.credit ? res.data.credit : 0,
- score: res.data.score
})
if (res.data.nickName) {
that.setData({
- ismember: true,
memberId: res.data.id
})
var initUrl = JSON.stringify({
@@ -528,7 +517,6 @@ Page({
that.setData({
name: res.data.name,
cover: res.data.cover,
- topicTitle: res.data.title,
id: res.data.id,
showTopic: true
})
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 265548e..62d8b26 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -16,19 +16,10 @@
-
还需{{upgradeScore}}成长值可升级
-
-
@@ -72,44 +63,11 @@
抢购
-
-
-
-
-
-
-
-
-
-
-
From adb06ba3a1df6a8bb9b49c7a0f6dec1e67ebf116 Mon Sep 17 00:00:00 2001
From: hurui
Date: Thu, 8 Aug 2019 15:11:57 +0800
Subject: [PATCH 17/21] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/searchbar/detail/index.wxml | 2 -
pages/index/searchbar/detail/index.wxss | 96 +----------
pages/index/searchbar/index.wxss | 204 ------------------------
3 files changed, 2 insertions(+), 300 deletions(-)
diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml
index 332a972..74032a1 100644
--- a/pages/index/searchbar/detail/index.wxml
+++ b/pages/index/searchbar/detail/index.wxml
@@ -1,4 +1,3 @@
-
@@ -53,7 +52,6 @@
{{data.linkLinePhone}}
{{data.merchantLinkPhone}}
-
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 49c79e0..04d90b0 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -38,15 +38,6 @@ page{
opacity: 1;
}
-.bannerbg {
- width: 100%;
-}
-
-.bannerbg image {
- display: block;
- width: 100%;
-}
-
.merchant-detail {
width: 100%;
background: #fff;
@@ -56,14 +47,11 @@ page{
.merchant-brand, .merchant-shop, .merchant-phone {
width: 100%;
- /* display: flex; */
- /* padding: 10rpx 0; */
background: #fff;
}
.merchant-brand view:nth-child(1) {
width: 88%;
- /* height: 700rpx; */
display: flex;
flex-direction: column;
white-space: nowrap;
@@ -77,35 +65,13 @@ page{
color:rgba(60,60,60,1);
margin-top: 20rpx;
}
-/* .merchant-brand view:nth-child(1) image {
- display: block;
- width: 130rpx;
- height: 130rpx;
- border-radius: 16rpx;
- border: 1px solid #e5e5e5;
-}
-
-.merchant-brand view:nth-child(2) {
- display: flex;
- flex-direction: column;
- width: 61%;
- padding-left: 30rpx;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
-} */
-
-
.merchant-shop text, .merchant-phone text {
font-size: 30rpx;
- /* color: #A6A6A6; */
}
.merchant-shop .fl{
color: #A6A6A6;
}
.merchant-phone view {
- /* display: flex;
- flex: 2; */
color: #A6A6A6;
}
.merchant-activity view{
@@ -118,7 +84,6 @@ page{
display:flex;
flex-direction:column;
}
-
.merchant-shop view:nth-child(2) {
font-size: 30rpx;
color: #A6A6A6;
@@ -141,45 +106,12 @@ page{
}
.merchant-phones {
- /* border-top:8px solid #efefef; */
padding: 20rpx 0;
display: block;
font-size: 30rpx;
background: #F4F5F9;
}
-.merchant-activity{
- padding: 20rpx 0;
- display: block;
- font-size: 30rpx;
-}
-
-.tel {
- /* right: 0;
- top: 0;
- bottom: 0;
- margin: auto; */
- display: inline-block;
- width: 50rpx;
- height: 50rpx;
- vertical-align: middle;
-}
-
-.shoplists {
- display: flex;
-}
-
-.shoplists text {
- flex: 2;
-}
-
-.godetail {
- color: #999;
- font-size: 30rpx;
- position: absolute;
- right: 10rpx;
-}
-
.merchants text {
display: inline-block;
font-size: 26rpx;
@@ -277,9 +209,7 @@ page{
display: flex;
flex-direction: column;
}
-.merchant-activity{
- padding: 0 4% 10rpx;
-}
+
.fenxiang image {
width: 48rpx;
height: 48rpx;
@@ -303,8 +233,6 @@ page{
border: none;
}
-/* 商户活动列表 */
-
.coupons c-coupons {
width: 335rpx;
height: 354rpx;
@@ -391,32 +319,12 @@ page{
}
/*分享海报样式*/
-
.canvas-content {
display: flex;
top: 0;
left: 0;
/* left: 500%; 分享图不显示在页面上面,就将画布设置在页面之外*/
-}
-
-.save-button {
- position: fixed;
- width: 80rpx;
- height: 80rpx;
- bottom: 40rpx;
- right: 40rpx;
- border-radius: 50rpx;
- z-index: 200;
- background: rgba(0, 0, 0, 0.75);
-}
-
-.save-button .share-image {
- position: absolute;
- top: 22rpx;
- left: 22rpx;
- width: 36rpx;
- height: 36rpx;
-}
+}
.dingdan image {
display: block;
diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss
index 92565ab..eb3ec13 100644
--- a/pages/index/searchbar/index.wxss
+++ b/pages/index/searchbar/index.wxss
@@ -131,222 +131,18 @@
page {
padding: 0 0 30rpx;
}
-.tabTit {
- height: 90rpx;
- line-height: 82rpx;
- position: fixed;
- top: 0;
- width: 750rpx;
- z-index: 1;
-}
-
-.tabTit > view:nth-of-type(1) {
- border-left: 0;
-}
-
-.tabTit > view:nth-of-type(4) {
- border-right: 0;
-}
-
-
-.tabTit .active image {
- transform: rotate(180deg);
- background: none;
-}
-
-.tabTit image {
- width: 18rpx;
- height: 9rpx;
- vertical-align: middle;
- margin-left: 5px;
-}
-
-.tabLayer {
- width: 750rpx;
- overflow: hidden;
- position: fixed;
- top: 90rpx;
- z-index: 1;
- background: #fff;
- padding-bottom: 26rpx;
- box-shadow:2px 9px 10px rgba(0, 0, 0, 0.05);
- bottom: 0;
- border-top:1px solid #eee;
-}
-
-.tabLayer a {
- float: left;
- width: 210rpx;
- height: 80rpx;
- line-height: 80rpx;
- margin: 30rpx 0 0 26rpx;
- text-align: center;
- color: #888;
- font-size: 30rpx;
- background: rgba(255, 255, 255, 1);
- border: 1px solid rgba(234, 234, 234, 1);
- border-radius: 10rpx;
-}
-
-.tabLayer .active {
- text-align: center;
- height: 80rpx;
- background: rgba(255, 255, 255, 1);
- border: 1px solid rgba(101, 158, 246, 1);
- border-radius: 10rpx;
- color: #659ef6;
-}
-.tabTit .active {
- background: #fff;
- font-size: 32prx;
- font-weight: 500;
- color: rgba(101, 158, 246, 1);
-}
-/*弹性盒模型*/
-
-.box {
- background: #fff;
- border-bottom:1px solid #eee;
-}
-
-.flex1 {
- overflow: hidden;
- width: 25%;
- display: block;
- text-align: center;
-}
-.flex1 text,.text {
- font-size: 30rpx;
-}
.text{
display: block;
width: 25%;
text-align: center;
}
-/* 日期选择 */
-
-.picker_group {
- height: 85rpx;
- line-height: 85rpx;
- justify-content: center;
- display: flex;
- align-items: center;
- font-size: 30rpx;
- color: #888;
-}
-
-.picker_group picker {
- height: 55rpx;
- line-height: 55rpx;
- margin: 0 2%;
- padding: 2% 5%;
- border-bottom: 1px solid #eee;
-}
.view view:nth-of-type(1) {
font-size: 28rpx;
color: #888;
}
-.list {
- width: 644rpx;
- border-radius: 16rpx;
- padding: 32rpx;
- margin: 40rpx auto;
- box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.1);
-}
-
-.list >view {
- height: 60rpx;
- line-height: 60rpx;
- font-size: 30rpx;
-}
-
-.txt1 {
- font-size: 32rpx;
- font-weight: 500;
- color: rgba(85, 85, 85, 1);
-}
-
-.txt2 {
- font-size: 28rpx;
- font-weight: 500;
- color: rgba(255, 106, 106, 1);
-}
-
-.money {
- font-weight: 500;
- color: rgba(85, 85, 85, 1);
- font-size: 26rpx;
- padding-right: 20rpx;
-}
-
-.time {
- font-size: 28rpx;
- font-weight: 500;
- color: rgba(125, 125, 125, 1);
-}
-
-.status1 {
- color: #659ef6;
-}
-
-.status2 {
- color: #eea959;
-}
-
-.status3 {
- color: #ff6a6a;
-}
-
-.status4 {
- color: #8aaa6b;
-}
-
-.btn {
- float: right;
- height: 52rpx;
- line-height: 52rpx;
- background: rgba(101, 158, 246, 1);
- border-radius: 10rpx;
- font-size: 28rpx;
- font-weight: 500;
- padding: 0 25rpx;
- color: rgba(255, 255, 255, 1);
-}
-
-
-.btns {
- width:137rpx;
- margin-top: 21rpx;
- background: #52a0fd;
- border-radius: 8rpx;
- color: #fff;
- font-size: 26rpx;
- height: 64rpx;
- line-height: 64rpx;
-}
-.active2{
- border: 1px solid #52a0fd!important;
- color: #52a0fd!important;
-}
-.recond{
- text-align: center;
- font-size: 30rpx;
- margin-top: 60rpx;
-}
-.active3{
- color: #659ef6;
-}
-.loading{
- text-align: center;
- font-size: 28rpx;
- color: #999;
-}
-.mr{
- margin-top: 200rpx!important;
-}
.shopVoList{
padding-left: 0!important;
display: inline-block!important;
From 68d473131d98e7466c1eb9c9a45e71253c003f61 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 8 Aug 2019 15:30:02 +0800
Subject: [PATCH 18/21] =?UTF-8?q?[=E5=85=91=E6=8D=A2=E7=A0=81][=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E5=85=91=E6=8D=A2=E7=A0=81?=
=?UTF-8?q?=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/orderquanma/index.wxss | 1 +
1 file changed, 1 insertion(+)
diff --git a/pages/orderquanma/index.wxss b/pages/orderquanma/index.wxss
index 94ec7f4..5b95632 100644
--- a/pages/orderquanma/index.wxss
+++ b/pages/orderquanma/index.wxss
@@ -11,6 +11,7 @@
width: 92%;
margin: 0 auto 6%;
border-radius: 16rpx;
+ padding-bottom: 20rpx;
}
.title {
From f1bdb5c4cb355739c9fe56c4bc58646b88651fe3 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 8 Aug 2019 15:56:06 +0800
Subject: [PATCH 19/21] =?UTF-8?q?[=E5=88=B8=E5=8C=85=EF=BC=8C=E4=BC=98?=
=?UTF-8?q?=E6=83=A0=E5=88=B8=E8=AF=A6=E6=83=85][=E4=BF=AE=E6=94=B9]:[?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B8=E5=8C=85=E5=92=8C=E5=88=B8=E7=9A=84?=
=?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/coupon/detail/index.js | 2 +-
pages/coupon/detail/index.wxss | 4 ++--
pages/couponorder/detail/index.wxss | 5 ++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index cbeb04c..99dc24f 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -477,7 +477,7 @@ Page({
that.setData({
begin_time: res.data.beginTime,
end_time: res.data.endTime,
- activityStatus: res.data.activityStatus
+ activityStatus: res.data.activityStatus ? res.data.activityStatus:''
})
if (res.data.activityStatus == 0 && flag != 'endclock') {
that.countdown(res.data.beginTime);
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index 424304e..1c40764 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -467,8 +467,8 @@ button::after {
.elecard {
display: inline-block;
margin-left: 6rpx;
- color: #af6e34;
- border: 1px solid #af6e34;
+ color: rgba(254,70,20,1);
+ border: 1px solid rgba(254,70,20,1);
border-radius: 8rpx;
font-style: normal;
font-size: 30rpx;
diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss
index 610c552..ea5eb13 100644
--- a/pages/couponorder/detail/index.wxss
+++ b/pages/couponorder/detail/index.wxss
@@ -215,8 +215,8 @@ page {
}
.notes view:nth-child(1) text {
- font-size: 24rpx;
- color: #919191;
+ font-size: 30rpx;
+ color: #333;
letter-spacing: 0;
}
@@ -226,7 +226,6 @@ page {
background: #fff;
display: flex;
flex-direction: column;
- padding-top: 2%;
}
.notes view:nth-child(2) > text {
From cda33719f384f37858858f93becbbd913b71598e Mon Sep 17 00:00:00 2001
From: hurui
Date: Thu, 8 Aug 2019 15:59:35 +0800
Subject: [PATCH 20/21] =?UTF-8?q?[=E6=88=91=E7=9A=84][=E4=BF=AE=E6=94=B9][?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/searchbar/detail/index.wxss | 6 +++---
pages/user/index.wxss | 28 ++++++++-----------------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 04d90b0..fba2452 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -213,12 +213,12 @@ page{
.fenxiang image {
width: 48rpx;
height: 48rpx;
- margin: 0 auro;
-}
+ margin: 0 auto;
+}
.gift{
color: #3C3C3C;
font-size: 20rpx;
- margin: 0 auro;
+ margin: 0 auto;
}
.user-motto {
width: 270rpx;
diff --git a/pages/user/index.wxss b/pages/user/index.wxss
index c29cf9d..5e9a166 100644
--- a/pages/user/index.wxss
+++ b/pages/user/index.wxss
@@ -46,22 +46,26 @@ page{
.user-name{
font-family: PingFangSC-Medium;
height: 42rpx;
- margin-left: 310rpx;
+ margin-top:66rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
- margin-top: 66rpx;
font-size: 30rpx;
color: #3C3C3C;
font-weight:600;
+ display: flex; /*设置显示样式**/
+ align-items: center; /**子view垂直居中*/
+ vertical-align: center; /**垂直居中*/
+ justify-content: center; /**内容居中*/
+ flex-direction: row;
}
.user-phone {
font-family: PingFangSC-Regular;
- height: 30rpx;
letter-spacing: 0.64rpx;
line-height: 44rpx;
font-size: 36rpx;
color: #000;
- margin:20rpx 0 50rpx 180rpx;
+ padding:20rpx;
+ text-align: center;
}
.user-avatar {
position: absolute;
@@ -82,7 +86,6 @@ page{
.view {
font-size: 24rpx;
- /* color: #FD832D; */
}
.view image {
@@ -105,7 +108,6 @@ page{
width: 120rpx;
height: 120rpx;
}
-
.user-btns{
background: #fff;
display: flex;
@@ -114,10 +116,9 @@ page{
}
.user-btns navigator{
width: 33.3%;
+ height: 160rpx;
}
-
-
.user-btns:nth-of-type(3){
margin-bottom: 0;
}
@@ -139,7 +140,6 @@ page{
box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
.btns_bg{
- /* position: relative; */
width: 94%;
background: #fff;
border-radius: 16rpx;
@@ -196,13 +196,7 @@ page{
border: none!important;
}
.gzh {
- /* display: none; */
- /* position: absolute; */
- /* bottom: 70rpx; */
width: 100%;
- /* left: 0;
- right: 0; */
- /* margin: auto; */
height: 170rpx;
z-index: 10;
background: #fff;
@@ -216,10 +210,6 @@ page{
}
.of {
- /* position:absolute;
- bottom:50rpx;
- left:0;
- right:0; */
width: 90%;
margin: 30rpx auto;
height: auto;
From 4ce516775f427faa684bc83b1b5bb7c7669a33c1 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 8 Aug 2019 16:00:26 +0800
Subject: [PATCH 21/21] =?UTF-8?q?[=E9=97=A8=E5=BA=97=E5=92=8C=E5=88=B8?=
=?UTF-8?q?=E8=AF=A6=E6=83=85][=E4=BF=AE=E6=94=B9]:[=E9=97=A8=E5=BA=97?=
=?UTF-8?q?=E5=92=8C=E5=88=B8=E8=AF=A6=E6=83=85=E9=A1=B6=E9=83=A8=E7=9A=84?=
=?UTF-8?q?banner=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8D=E8=AE=A9=E5=85=B6?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/banner/index.wxml | 7 -------
pages/coupon/detail/index.wxml | 2 +-
pages/index/searchbar/detail/index.wxml | 2 +-
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/components/banner/index.wxml b/components/banner/index.wxml
index 2cf9e31..6b48405 100644
--- a/components/banner/index.wxml
+++ b/components/banner/index.wxml
@@ -1,11 +1,4 @@
-
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 34759bd..9d81039 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -4,7 +4,7 @@
-
+
diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml
index 74032a1..7876e14 100644
--- a/pages/index/searchbar/detail/index.wxml
+++ b/pages/index/searchbar/detail/index.wxml
@@ -1,6 +1,6 @@
-
+