diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 3c45296..a686d2a 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,11 +1,11 @@
- 线上订单
- 线下订单
+ 线上订单
+ 线下订单
-
+
搜索
@@ -35,11 +35,11 @@
-
+
订单编号：{{item.order_sn}}
-
+
组团中
未支付
@@ -81,7 +81,7 @@
- {{goods.goods_name}}
+ {{goods.goods_name}}
@@ -104,9 +104,9 @@
-
+
￥
- {{filters.toFix(goods.member_goods_price,2)}}
+ {{filters.toFix(goods.member_goods_price,2)}}
x{{goods.goods_num}}
@@ -115,7 +115,7 @@
-
+
共{{item.g_num}}件商品
@@ -124,8 +124,8 @@
合计(改):
- ￥
- {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
+ ￥
+ {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
@@ -133,22 +133,22 @@
定金(改):
- ￥
- {{filters.toFix(item.order_amount+item.user_money,2)}}
+ ￥
+ {{filters.toFix(item.order_amount+item.user_money,2)}}
合计(改):
- ￥
- {{filters.toFix(item.order_amount+item.user_money,2)}}
+ ￥
+ {{filters.toFix(item.order_amount+item.user_money,2)}}
+{{item.coupon_price}}元优惠券
+{{item.integral}}积分
待支付尾款:
- ￥
- {{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
+ ￥
+ {{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
@@ -157,7 +157,7 @@
-
+
取消订单
拼团失败
@@ -182,7 +182,7 @@
- 评价
评价
@@ -208,10 +208,10 @@
- 单号：{{item.No}}
+ 单号：{{item.No}}
{{item.BillDate}}
- 消费总额：￥{{item.Sum}}
+ 消费总额：￥{{item.Sum}}
{{i.BarCode}} - {{i.WareName}}
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index c8b6e9f..f5752cd 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -21,6 +21,14 @@ mgt12 {
color: #999;
}
+.c-tb {
+ color: #ff5000;
+}
+
+.c-r {
+ color: #FF3B3D;
+}
+
/* 内边距 */
.pdt20 {
padding-top: 20rpx;
@@ -52,7 +60,7 @@ page {
height: 88rpx;
background-color: #fff;
justify-content: space-between;
- border-top: 2rpx solid #f6f6f6;
+ /* border-top: 2rpx solid #f6f6f6; */
}
.type-box {
@@ -69,37 +77,37 @@ page {
}
.type-item-on {
- background-color: #FF3B3D;
- color: white;
+ /* background-color: #FF3B3D; */
+ color: #FF3B3D;
font-weight: bold;
/* border-bottom: 4rpx solid #ED3036; */
position: relative;
}
.type-item-on:after {
- /* content: '';
+ content: '';
position: absolute;
left: 0;
right: 0;
bottom: 0;
- width: 50%;
+ width: 40%;
height: 4rpx;
- background-color: #ED3036;
- margin: 0 auto; */
+ background-color: #FF3B3D;
+ margin: 0 auto;
}
.container {
position: fixed;
width: 100%;
top: 0;
- z-index: 999;
+ z-index: 4;
/* position: -webkit-sticky;
position:sticky;
top: 0; */
}
.list-container {
- padding-left: 18rpx;
- padding-right: 18rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
overflow: hidden;
/* height: calc(100% - 282rpx); */
padding-top: 282rpx;
@@ -107,7 +115,7 @@ page {
.stay_evaluate {
background-color: white;
- margin-top: 18rpx;
+ margin-top: 20rpx;
border-radius: 8rpx;
}
@@ -210,10 +218,12 @@ page {
height: 50rpx;
line-height: 50rpx;
text-align: center;
- border: 1px solid #eee;
+ /* border: 1px solid #eee; */
margin-left: 10rpx;
- float: right;
- border-radius: 15rpx;
+ /* float: right; */
+ border-radius: 6rpx;
+ overflow: hidden;
+ background-color: #FF3B3D;
}
.order-btn-pay {
@@ -282,6 +292,7 @@ page {
width: 485rpx;
/* height: 75rpx; */
line-height: 37rpx;
+ text-align: justify;
}
.Commodity_content {
@@ -309,7 +320,8 @@ page {
.commodity_evaluate .commodity_smy .commodity_money {
margin-left: 29rpx;
letter-spacing: 1rpx;
- font-weight: bold;
+ /* font-weight: bold; */
+
}
.commodity_evaluate .links {
@@ -318,6 +330,8 @@ page {
padding-top: 20rpx;
padding-bottom: 20rpx;
border-top: 2rpx solid #F6F6F6;
+ display: flex;
+ align-items: center;
}
.commodity_evaluate .commodity_To_evaluate {
@@ -448,8 +462,8 @@ page {
.rel {
box-sizing: border-box;
- width: 184rpx;
- height: 184rpx;
+ width: 180rpx;
+ height: 180rpx;
overflow: hidden;
/* border: 2rpx solid rgb(236, 236, 236); */
}
@@ -465,8 +479,8 @@ page {
line-height: 40rpx;
}
.code{
- width: 55rpx;
- height: 55rpx;
+ width: 44rpx;
+ height: 44rpx;
}
.refund{
margin-top: 20rpx;
@@ -479,6 +493,9 @@ page {
font-size: 28rpx;
border-bottom: 2rpx solid #f2f2f2;
}
+.tab-container .iconfont {
+ margin-right: 10rpx;
+}
.tab {
flex: 1;
line-height: 80rpx;
@@ -487,6 +504,7 @@ page {
}
.tab.active {
color: #FF3B3D;
+ font-weight: bold;
}
.tab.active::after {
content: '';
@@ -531,10 +549,10 @@ page {
border-radius: 10rpx;
}
.picker {
- color: #999;
+ color: #ccc;
text-align: center;
line-height: 70rpx;
- font-size: 28rpx;
+ font-size: 26rpx;
}
.list2 {
@@ -543,11 +561,18 @@ page {
}
.title {
padding: 20rpx;
- font-size: 28rpx;
+ font-size: 26rpx;
+ display: flex;
+ align-items: center;
+}
+.icon-order {
+ font-size: 26rpx;
+ color: #FF3B3D;
+ margin-right: 10rpx;
}
.subtitle {
display: flex;
- font-size: 26rpx;
+ font-size: 24rpx;
justify-content: space-between;
background-color: #f0f0f0;
line-height: 60rpx;
@@ -561,12 +586,12 @@ page {
.subitem {
width: calc(100% / 3);
text-align: center;
- font-size: 28rpx;
+ font-size: 26rpx;
}
.name {
padding: 0 20rpx;
margin: 20rpx 0;
- font-size: 30rpx;
+ font-size: 26rpx;
word-break: break-all;
text-align: justify;
}
@@ -587,3 +612,6 @@ page {
border-top-left-radius: 8rpx;
border-bottom-left-radius: 8rpx;
}
+
+
+