diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js
index e95bc4a..2bf3508 100644
--- a/pages/couponorder/index/index.js
+++ b/pages/couponorder/index/index.js
@@ -5,7 +5,7 @@ const imgurl = require("../../../utils/imgurl");
let app = getApp();
Page({
data: {
- couponUrl: imgurl.coupon.url,
+ couponUrl: imgurl.noCoupon.url,
linessUrl: imgurl.liness.url,
loadingUrl: imgurl.loading.url,
wmhome: imgurl.wmhome.url,
diff --git a/pages/couponorder/index/index.json b/pages/couponorder/index/index.json
index 704fc2d..b39b248 100644
--- a/pages/couponorder/index/index.json
+++ b/pages/couponorder/index/index.json
@@ -4,4 +4,5 @@
"i-tabs": "../../../dist/tabs/index"
},
"navigationBarTitleText": "我的券包"
+
}
\ No newline at end of file
diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml
index 4e4f0e8..d6be573 100644
--- a/pages/couponorder/index/index.wxml
+++ b/pages/couponorder/index/index.wxml
@@ -24,25 +24,24 @@
{{item.title}}
-
- {{item.subTitle}}
+
+ 有效期至:
+ {{item.expiredTime}}
- 去使用
- 查看
-
-
-
-
-
- 有效期至:
- {{item.expiredTime}}
-
-
- 过期不退款
+
+ 过期不退款
+
+
-
+
+
+ 去使用
+ 查看
+
{{content}}
diff --git a/pages/couponorder/index/index.wxss b/pages/couponorder/index/index.wxss
index 195ffed..a4b3343 100644
--- a/pages/couponorder/index/index.wxss
+++ b/pages/couponorder/index/index.wxss
@@ -1,3 +1,6 @@
+page{
+ background: #F4F5F9
+}
.market {
width: 100%;
height: 100%;
@@ -45,20 +48,29 @@ button::after{ border: none; }
.section {
position: relative;
+ display: flex;
+
}
.mms {
position: relative;
- width: 690rpx;
- height: 197rpx !important;
+ width: 540rpx;
+ height: 110rpx !important;
background: #fff;
padding: 30rpx 0 0;
- margin: 0 auto 40rpx;
+ margin: 0 0 40rpx 40rpx;
border-radius: 16rpx;
- border-top: 8rpx solid #02b7ff;
- box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10);
}
-
+.bGroup{
+ width: 140rpx;
+ height: 140rpx;
+ line-height: 140rpx;
+ text-align: center;
+ /* padding: 30rpx 0 0; */
+ color: #FFFFFF;
+ font-size: 30rpx;
+
+}
.detail_msg {
display: flex;
padding-bottom: 26rpx;
@@ -88,8 +100,8 @@ button::after{ border: none; }
}
.logo {
- width: 60rpx;
- height: 60rpx;
+ width: 88rpx;
+ height: 88rpx;
border: 1px solid #f8f8f8;
border-radius: 50rpx;
display: block;
@@ -97,15 +109,15 @@ button::after{ border: none; }
}
.logo image {
- width: 60rpx;
- height: 60rpx;
+ width: 88rpx;
+ height: 88rpx;
border-radius: 50%;
}
.info view:nth-child(1) {
display: flex;
justify-content: space-between;
- padding: 0 2%;
+ /* padding: 0 2%; */
}
.info {
@@ -126,7 +138,6 @@ button::after{ border: none; }
}
.info view:nth-child(2) {
- padding-left: 2%;
font-size: 22rpx;
color: #333;
letter-spacing: 0;
@@ -135,7 +146,7 @@ button::after{ border: none; }
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
- width: 400rpx;
+ /* width: 400rpx; */
}
.info view:nth-child(3) {
@@ -143,19 +154,13 @@ button::after{ border: none; }
}
.btns {
- position: absolute;
- right: 30rpx;
- top: 38rpx;
- width: 120rpx;
- height: 48rpx;
- line-height: 48rpx;
- text-align: center;
- border: 2rpx solid #02c0ff;
- border-radius: 60rpx;
- color: #02c0ff;
- font-size: 28rpx;
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ border-radius: 16rpx;
+}
+.btnsL{
+ background: #CECECE;
+ border-radius: 16rpx;
}
-
.active {
color: #fff;
background: #02c0ff;
@@ -193,7 +198,7 @@ button::after{ border: none; }
}
.nocoupon button {
- background: #00c0ff;
+ background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
color: #fff;
font-style: 30rpx;
width: 100%;
diff --git a/pages/main/index.json b/pages/main/index.json
index 3856ad9..5f8d497 100644
--- a/pages/main/index.json
+++ b/pages/main/index.json
@@ -9,5 +9,6 @@
"c-rushtobyCard": "./rushtobyCard/index"
},
"navigationBarTitleText": "首页",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "navigationBarBackgroundColor": "#F4F5F9"
}
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index b24fcfb..d988dc5 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -1,35 +1,40 @@
-
-
-
-
-
-
-
- {{levelName}}
- 还需{{upgradeScore}}成长值可升级
-
-
-
+
+
+
+
+ {{levelName}}
+
+
+
+ 还需{{upgradeScore}}成长值可升级
+
+
+
-
-
-
- 积分
- {{credit}}
-
-
+
+
+
-
+
+
+
+
diff --git a/pages/main/index.wxss b/pages/main/index.wxss
index 542bf76..947613a 100644
--- a/pages/main/index.wxss
+++ b/pages/main/index.wxss
@@ -1,4 +1,7 @@
@import "../../app.wxss";
+page{
+ background: #F4F5F9;
+}
.index-position {
background: rgba(0, 0, 0, 0.5);
height: 88rpx;
@@ -52,13 +55,17 @@ page {
.userinfo{
position:relative;
- margin: 30rpx auto 0;
+ margin: 0 auto 30rpx;
width: 690rpx;
- padding: 20rpx 0;
- height: 84rpx;
- box-shadow:0 0 10px 0 rgba(211,211,211,0.50);
-
+ /* padding: 0 0 20rpx; */
+ height: 96rpx;
border-radius:16rpx;
+ display: flex;
+}
+.infoLeft{
+ height: 100%;
+ border-radius:12rpx;
+ background: #FFF;
}
.section {
padding: 0 20rpx;
@@ -205,6 +212,9 @@ height:100%;
line-height: 44rpx;
font-size: 30rpx;
color: #333;
+ background: #FFF;
+ margin-top: 16rpx;
+ margin-bottom: 26rpx;
}
.chengzhang {
font-size: 29rpx;
@@ -231,7 +241,7 @@ height:100%;
.view {
font-size: 24rpx;
color: #999999;
- line-height: 24rpx;
+ line-height: 12rpx;
}
.view>.score{
margin-left:9rpx;
@@ -309,13 +319,15 @@ height:100%;
.remainchengzhangzhi{
display: block;
color: #b2743d;
- font-size: 12rpx;
+ font-size: 22rpx;
margin-top: 5rpx;
line-height: 14rpx;
+ float: left;
}
progress{
display:inline-block;
- width:180rpx;
+ width:222rpx;
border-radius:60rpx;
overflow:hidden;
+ float: left;
}
\ No newline at end of file
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index e252ece..6296d2d 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -75,8 +75,8 @@
下单时间
{{createDate}}
-->
-
- 订单编号:
+
+ 订单编号:
{{order.orderNumber}}
-
+
-
-
-
-
-
-
-
-
-
- 兑换码:{{code}}
-
+
+
+
+
+
+
+
+
+
+ 兑换码:{{code}}
+
-
+