wxd / MShopWeApp

Commit 9b644468de3380ea7d4c265f6aaf00430e463e73

Authored by 后端研发-倪永富
1 parent a2bac41d

线上线下订单

Inline Side-by-side
Showing 2 changed files with 74 additions and 46 deletions
pages/user/order_list/order_list.wxml
  View file @9b64446
1 1 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 2 <view class="container">
3 3 <view class="tab-container" bindtap="onClickTab">
4   - <view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0">线上订单</view>
5   - <view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1">线下订单</view>
  4 + <view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0"><text class="iconfont icon-cloud"></text>线上订单</view>
  5 + <view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1"><text class="iconfont icon-shop"></text>线下订单</view>
6 6 </view>
7 7 <view class="search-container flex" wx:if="{{currentIndex == 0}}">
8   - <input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput"/>
  8 + <input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput" placeholder-style="color:#ccc;"/>
9 9 <view class="search-btn" bindtap="searchOnline">搜索</view>
10 10 </view>
11 11 <view class="type-navbar fs28" wx:if="{{currentIndex == 0}}">
... ... @@ -35,11 +35,11 @@
35 35 <view class="list-container" wx:if="{{currentIndex == 0}}">
36 36 <view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
37 37 <!-- 商品编号和状态 -->
38   - <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
  38 + <view class="Commodity_number flex-vertical-between fs24 padding border_bottom">
39 39 <!--商品编号 -->
40 40 <text selectable='true'>订单编号：{{item.order_sn}}</text>
41 41 <!-- 商品评价状态 -->
42   - <view class="flex-center xc-wc">
  42 + <view class="flex-center c-r">
43 43 <!-- 订单状态 -->
44 44 <view wx:if="{{item.pt_status==1}}">组团中</view>
45 45 <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
... ... @@ -81,7 +81,7 @@
81 81 <view class="Commodity_content">
82 82 <view class="Commodity_goods">
83 83 <!-- 商品名称 -->
84   - <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
  84 + <view class="goods_name ellipsis-2 fs26">{{goods.goods_name}}</view>
85 85 <view class="flex-space-between">
86 86 <!-- 商品规格 -->
87 87 <view class="Commodity_spec fs28 flex-center">
... ... @@ -104,9 +104,9 @@
104 104 <!-- 商品价格数量 -->
105 105 <view class="Commodity_money flex-vertical-between baseline">
106 106 <!-- 商品价格 -->
107   - <view class="flex-vertical xc-wc baseline">
  107 + <view class="flex-vertical c-tb baseline">
108 108 <view class="fs24">￥</view>
109   - <view class="fs32">{{filters.toFix(goods.member_goods_price,2)}}</view>
  109 + <view class="fs26">{{filters.toFix(goods.member_goods_price,2)}}</view>
110 110 </view>
111 111 <view class="fs26 c-a9">x{{goods.goods_num}}</view>
112 112 </view>
... ... @@ -115,7 +115,7 @@
115 115 <!-- 去评价 -->
116 116 <view class="commodity_evaluate jc_sb baseline fs26">
117 117 <!-- 商品数量 -->
118   - <view class="commodity_smy fs26">
  118 + <view class="commodity_smy fs24">
119 119 <view class="order-total">
120 120 <view>
121 121 共{{item.g_num}}件商品
... ... @@ -124,8 +124,8 @@
124 124 <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
125 125 <view class="commodity_money flex baseline">
126 126 <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
127   - <view class="fs24 xc-wc">￥</view>
128   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
  127 + <view class="fs24 c-r">￥</view>
  128 + <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
129 129 </view>
130 130  
131 131 </view>
... ... @@ -133,22 +133,22 @@
133 133 <block wx:else>
134 134 <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
135 135 <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
136   - <view class="fs24 xc-wc">￥</view>
137   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
  136 + <view class="fs24 c-r">￥</view>
  137 + <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
138 138 </view>
139 139 </view>
140 140 <view class="commodity_money flex baseline" wx:else>
141 141 <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
142   - <view class="fs24 xc-wc">￥</view>
143   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
  142 + <view class="fs24 c-r">￥</view>
  143 + <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}}
144 144 <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
145 145 <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
146 146 </view>
147 147 </view>
148 148 <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
149 149 <view>待支付尾款:</view>
150   - <view class="fs24 xc-wc">￥</view>
151   - <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
  150 + <view class="fs24 c-r">￥</view>
  151 + <view class="c-r">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
152 152 </view>
153 153 </view>
154 154  
... ... @@ -157,7 +157,7 @@
157 157 </view>
158 158 </view>
159 159 </view>
160   - <view class="links flex-right-vertical fs26 padding" style="flex-wrap: wrap;">
  160 + <view class="links flex-right-vertical fs24 padding">
161 161 <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1)}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
162 162 <view bindtap="cancelOrder" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}" wx:if="{{(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
163 163 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
... ... @@ -182,7 +182,7 @@
182 182  
183 183  
184 184 <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
185   - <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b"
  185 + <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white"
186 186 url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
187 187 <navigator wx:else class="order-btn white red-b"
188 188 url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator>
... ... @@ -208,10 +208,10 @@
208 208 <view class="offline-container" wx:else>
209 209 <view class="offline-list">
210 210 <view class="item" wx:for="{{list2}}">
211   - <view class="title">单号：{{item.No}}</view>
  211 + <view class="title"><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
212 212 <view class="subtitle">
213 213 <text>{{item.BillDate}}</text>
214   - <view>消费总额：<text class="co-red">￥{{item.Sum}}</text></view>
  214 + <view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view>
215 215 </view>
216 216 <view wx:for="{{item.list}}" wx:for-item="i">
217 217 <view class="ellipsis-2 name">{{i.BarCode}} - {{i.WareName}}</view>
... ...
pages/user/order_list/order_list.wxss
  View file @9b64446
... ... @@ -21,6 +21,14 @@ mgt12 {
21 21 color: #999;
22 22 }
23 23  
  24 +.c-tb {
  25 + color: #ff5000;
  26 +}
  27 +
  28 +.c-r {
  29 + color: #FF3B3D;
  30 +}
  31 +
24 32 /* 内边距 */
25 33 .pdt20 {
26 34 padding-top: 20rpx;
... ... @@ -52,7 +60,7 @@ page {
52 60 height: 88rpx;
53 61 background-color: #fff;
54 62 justify-content: space-between;
55   - border-top: 2rpx solid #f6f6f6;
  63 + /* border-top: 2rpx solid #f6f6f6; */
56 64 }
57 65  
58 66 .type-box {
... ... @@ -69,37 +77,37 @@ page {
69 77 }
70 78  
71 79 .type-item-on {
72   - background-color: #FF3B3D;
73   - color: white;
  80 + /* background-color: #FF3B3D; */
  81 + color: #FF3B3D;
74 82 font-weight: bold;
75 83 /* border-bottom: 4rpx solid #ED3036; */
76 84 position: relative;
77 85 }
78 86 .type-item-on:after {
79   - /* content: '';
  87 + content: '';
80 88 position: absolute;
81 89 left: 0;
82 90 right: 0;
83 91 bottom: 0;
84   - width: 50%;
  92 + width: 40%;
85 93 height: 4rpx;
86   - background-color: #ED3036;
87   - margin: 0 auto; */
  94 + background-color: #FF3B3D;
  95 + margin: 0 auto;
88 96 }
89 97  
90 98 .container {
91 99 position: fixed;
92 100 width: 100%;
93 101 top: 0;
94   - z-index: 999;
  102 + z-index: 4;
95 103 /* position: -webkit-sticky;
96 104 position:sticky;
97 105 top: 0; */
98 106 }
99 107  
100 108 .list-container {
101   - padding-left: 18rpx;
102   - padding-right: 18rpx;
  109 + padding-left: 20rpx;
  110 + padding-right: 20rpx;
103 111 overflow: hidden;
104 112 /* height: calc(100% - 282rpx); */
105 113 padding-top: 282rpx;
... ... @@ -107,7 +115,7 @@ page {
107 115  
108 116 .stay_evaluate {
109 117 background-color: white;
110   - margin-top: 18rpx;
  118 + margin-top: 20rpx;
111 119 border-radius: 8rpx;
112 120 }
113 121  
... ... @@ -210,10 +218,12 @@ page {
210 218 height: 50rpx;
211 219 line-height: 50rpx;
212 220 text-align: center;
213   - border: 1px solid #eee;
  221 + /* border: 1px solid #eee; */
214 222 margin-left: 10rpx;
215   - float: right;
216   - border-radius: 15rpx;
  223 + /* float: right; */
  224 + border-radius: 6rpx;
  225 + overflow: hidden;
  226 + background-color: #FF3B3D;
217 227 }
218 228  
219 229 .order-btn-pay {
... ... @@ -282,6 +292,7 @@ page {
282 292 width: 485rpx;
283 293 /* height: 75rpx; */
284 294 line-height: 37rpx;
  295 + text-align: justify;
285 296 }
286 297  
287 298 .Commodity_content {
... ... @@ -309,7 +320,8 @@ page {
309 320 .commodity_evaluate .commodity_smy .commodity_money {
310 321 margin-left: 29rpx;
311 322 letter-spacing: 1rpx;
312   - font-weight: bold;
  323 + /* font-weight: bold; */
  324 +
313 325 }
314 326  
315 327 .commodity_evaluate .links {
... ... @@ -318,6 +330,8 @@ page {
318 330 padding-top: 20rpx;
319 331 padding-bottom: 20rpx;
320 332 border-top: 2rpx solid #F6F6F6;
  333 + display: flex;
  334 + align-items: center;
321 335 }
322 336  
323 337 .commodity_evaluate .commodity_To_evaluate {
... ... @@ -448,8 +462,8 @@ page {
448 462  
449 463 .rel {
450 464 box-sizing: border-box;
451   - width: 184rpx;
452   - height: 184rpx;
  465 + width: 180rpx;
  466 + height: 180rpx;
453 467 overflow: hidden;
454 468 /* border: 2rpx solid rgb(236, 236, 236); */
455 469 }
... ... @@ -465,8 +479,8 @@ page {
465 479 line-height: 40rpx;
466 480 }
467 481 .code{
468   - width: 55rpx;
469   - height: 55rpx;
  482 + width: 44rpx;
  483 + height: 44rpx;
470 484 }
471 485 .refund{
472 486 margin-top: 20rpx;
... ... @@ -479,6 +493,9 @@ page {
479 493 font-size: 28rpx;
480 494 border-bottom: 2rpx solid #f2f2f2;
481 495 }
  496 +.tab-container .iconfont {
  497 + margin-right: 10rpx;
  498 +}
482 499 .tab {
483 500 flex: 1;
484 501 line-height: 80rpx;
... ... @@ -487,6 +504,7 @@ page {
487 504 }
488 505 .tab.active {
489 506 color: #FF3B3D;
  507 + font-weight: bold;
490 508 }
491 509 .tab.active::after {
492 510 content: '';
... ... @@ -531,10 +549,10 @@ page {
531 549 border-radius: 10rpx;
532 550 }
533 551 .picker {
534   - color: #999;
  552 + color: #ccc;
535 553 text-align: center;
536 554 line-height: 70rpx;
537   - font-size: 28rpx;
  555 + font-size: 26rpx;
538 556 }
539 557  
540 558 .list2 {
... ... @@ -543,11 +561,18 @@ page {
543 561 }
544 562 .title {
545 563 padding: 20rpx;
546   - font-size: 28rpx;
  564 + font-size: 26rpx;
  565 + display: flex;
  566 + align-items: center;
  567 +}
  568 +.icon-order {
  569 + font-size: 26rpx;
  570 + color: #FF3B3D;
  571 + margin-right: 10rpx;
547 572 }
548 573 .subtitle {
549 574 display: flex;
550   - font-size: 26rpx;
  575 + font-size: 24rpx;
551 576 justify-content: space-between;
552 577 background-color: #f0f0f0;
553 578 line-height: 60rpx;
... ... @@ -561,12 +586,12 @@ page {
561 586 .subitem {
562 587 width: calc(100% / 3);
563 588 text-align: center;
564   - font-size: 28rpx;
  589 + font-size: 26rpx;
565 590 }
566 591 .name {
567 592 padding: 0 20rpx;
568 593 margin: 20rpx 0;
569   - font-size: 30rpx;
  594 + font-size: 26rpx;
570 595 word-break: break-all;
571 596 text-align: justify;
572 597 }
... ... @@ -587,3 +612,6 @@ page {
587 612 border-top-left-radius: 8rpx;
588 613 border-bottom-left-radius: 8rpx;
589 614 }
  615 +
  616 +
  617 +
... ...