diff --git a/ext.json b/ext.json
index 63ccd43..6b64b8c 100644
--- a/ext.json
+++ b/ext.json
@@ -34,29 +34,29 @@
"text": "首页",
"iconPath": "assets/images/home.png",
"pagePath": "pages/main/index",
- "selectedIconPath": "assets/images/home-b.png"
+ "selectedIconPath": "assets/images/home-a.png"
},
{
"text": "门店",
"iconPath": "assets/images/mendian.png",
"pagePath": "pages/index/searchbar/index",
- "selectedIconPath": "assets/images/mendian-b.png"
+ "selectedIconPath": "assets/images/mendian-a.png"
},
{
"text": "停车",
"iconPath": "assets/images/park.png",
"pagePath": "pages/passCar/passCar",
- "selectedIconPath": "assets/images/park-b.png"
+ "selectedIconPath": "assets/images/park-a.png"
},
{
"text": "我的",
"iconPath": "assets/images/user.png",
"pagePath": "pages/user/index",
- "selectedIconPath": "assets/images/user-b.png"
+ "selectedIconPath": "assets/images/user-a.png"
}
],
"color": "#abb1be",
- "selectedColor": "#FD832D"
+ "selectedColor": "#b2743d"
},
"window": {
"backgroundTextStyle": "dark",
diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js
index e15bfce..1b03fd3 100644
--- a/pages/spellDetail/index.js
+++ b/pages/spellDetail/index.js
@@ -57,7 +57,7 @@ Page({
},
gotoshare() {
wx.navigateTo({
- url: `/pages/spellGroup/mySpellGroup/index?orderId=${this.data.paramData.orderId}&couponId=${this.data.paramData.couponId}&orderGroupId=${this.data.paramData.orderGroupId}&couponChannelId=${this.data.paramData.couponChannelId}`,
+ url: `/pages/spellGroup/mySpellGroup/index?orderId=${this.data.paramData.orderId}&orderGroupId=${this.data.paramData.orderGroupId}&couponChannelId=${this.data.paramData.couponChannelId}`,
})
},
gotoSearch() {
diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml
index 4eaf2c4..25edd26 100644
--- a/pages/spellDetail/index.wxml
+++ b/pages/spellDetail/index.wxml
@@ -25,6 +25,7 @@
{{data.statustext}}
{{data.statustext}}
+ {{data.statustext}}
@@ -46,24 +47,37 @@
-
- 结束
- {{sec}}
- :
- {{min}}
- :
- {{hour}}
- 天
- {{day}}
- 剩余
-
-
-
- 还差
- 1
- 拼团成功,赶快邀人
+
+ 结束
+ {{sec}}
+ :
+ {{min}}
+ :
+ {{hour}}
+ 天
+ {{day}}
+ 剩余
+
+
+
+ 还差
+ {{data.remainPeople}}人
+ 拼团成功,赶快邀人
+
+
+
+
+ 拼团成功!
+
+
+
+
+ 拼团失败!
+
+
+
@@ -74,11 +88,8 @@
-
- {{data.statustext}}
-
-
+
@@ -92,12 +103,15 @@
+
+ {{data.statustext}}
+
-
-
+
+
-
+
@@ -116,11 +130,6 @@
{{data.orderGroupId}}
-
-
-
-
-
diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss
index d2e5ec9..f8464e7 100644
--- a/pages/spellDetail/index.wxss
+++ b/pages/spellDetail/index.wxss
@@ -20,15 +20,14 @@ page {
}
.status-top{
width: 100%;
- height: 75rpx;
+ height: 60rpx;
box-sizing: border-box;
- border-bottom: 1rpx solid #F9F9F9;
- /* overflow: hidden; */
+ overflow: hidden;
}
.p-status{
float: left;
width: 260rpx;
- font-size:32rpx;
+ font-size:26rpx;
font-family:PingFang-SC-Bold;
font-weight:bold;
color:#FD782D;
@@ -41,11 +40,11 @@ page {
font-weight:500;
color:#FFF;
width: 38rpx;
- height: 30rpx;
+ height: 40rpx;
margin-top: 22rpx;
background:#FD782D;
border-radius:10rpx;
- line-height: 30rpx;
+ line-height: 40rpx;
text-align: center;
margin: 22rpx 6rpx;
}
@@ -70,10 +69,9 @@ page {
overflow: hidden;
padding: 20rpx 0;
text-align: center;
- border-bottom: 1rpx solid #F9F9F9;
}
.status-lists{
- margin-top: 60rpx;
+ margin-top: 30rpx;
}
.tuanzhang{
float: left;
@@ -312,7 +310,7 @@ page {
}
.user-motto {
border: 0;
- width:650rpx;
+ width:520rpx;
height:85rpx;
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
border-radius:43rpx;
@@ -321,7 +319,7 @@ page {
font-weight:500;
color:rgba(254,254,254,1);
line-height: 85rpx;
- margin-top: 100rpx;
+ margin: 40rpx auto;
}
.user-motto::after {
@@ -331,7 +329,6 @@ page {
width:520rpx;
height:95rpx;
margin: 30rpx auto 38rpx;
- background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%);
border-radius:47rpx;
color: #fff;
}
@@ -342,7 +339,7 @@ page {
border:1rpx solid rgba(190,190,190,1);
border-radius:47rpx;
color:#333333;
- margin-bottom: 50rpx;
+ margin-bottom: 30rpx auto 38rpx;
}
.alert-bg{
width: 100%;
@@ -410,10 +407,33 @@ page {
top: 0;
}
.frImg text{
+ height: 78rpx;
+ width: 78rpx;
transform: rotate(45deg);
color: #FFFFFF;
font-size: 16rpx;
position: absolute;
- left: 14rpx;
- top: 12rpx;
+ text-align: center;
+ line-height: 53rpx;
+ top: 0;
+ left: 0;
+}
+.p-des{
+ text-align: center;
+}
+.p-des-text{
+ font-size: 26rpx;
+ color:rgba(51,51,51,1);
+ display: inline;
+}
+.p-des-num{
+ font-size: 26rpx;
+ color:#FE8B4A;
+ display: inline;
+ font-weight:600;
+}
+.status-des{
+ height: 50rpx;
+ line-height: 50rpx;
+ width: 100%;
}
\ No newline at end of file
diff --git a/utils/spell.js b/utils/spell.js
index c15bc8f..a297c03 100644
--- a/utils/spell.js
+++ b/utils/spell.js
@@ -8,7 +8,7 @@ const spellStatus=[
value: 11
},
{
- name: '拼团已过期',
+ name: '已过期',
value: 12
},
{
@@ -20,7 +20,7 @@ const spellStatus=[
value: 14
},
{
- name: '拼团待支付',
+ name: '待支付',
value: 15
},
{