wxd / MShopWeApp

Commit 3e16dac98231faf83de61ee814d600900fc91ecd

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

线下订单查询列表

Inline Side-by-side
Showing 4 changed files with 660 additions and 227 deletions
pages/user/order_list/order_list.js
  View file @3e16dac
  1 +const app = getApp();
1 2 var t = function(t) {
2 3 return t && t.__esModule ? t : {
3 4 default: t
... ... @@ -19,7 +20,7 @@ Page({
19 20 resourceUrl: e.globalData.setting.imghost,
20 21 iurl: e.globalData.setting.imghost,
21 22 categories: [{
22   - name: "全部订单",
  23 + name: "全部",
23 24 id: 0
24 25 }, {
25 26 name: "待付款",
... ... @@ -47,12 +48,26 @@ Page({
47 48 card_field:null,
48 49  
49 50 back_goods_arr:null, //返回商品的列表
  51 + currentIndex: 0,
  52 +
  53 + startDate: '选择开始时间',
  54 + endDate: '选择结束时间',
  55 + list2: [],
  56 + currentPage2: 1,
  57 + currentDate: '',
  58 + total: 0, //读取时段内记录数量
50 59 },
51 60 onLoad: function(t) {
  61 + // 设置日期选择器的结束时间为当前日期
  62 + this.setData({
  63 + currentDate: this.currentDate()
  64 + });
  65 +
  66 +
52 67 var th = this;
53 68 if (t.type != undefined) this.setData({
54 69 activeCategoryId: t.type
55   - })
  70 + });
56 71 s.init(this, "", "orderList");
57 72 //---查看会员的等级价---
58 73 getApp().getConfig2(function(e) {
... ... @@ -230,15 +245,24 @@ Page({
230 245 },
231 246 //滑倒底部
232 247 onReachBottom: function() {
233   - if (s.data.goodsLoadFinishFlag) {
234   - this.setData({
235   - iscodeall: 1
236   - })
237   - }
238   - s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
  248 + if(this.data.currentIndex == 0) {
  249 + if (s.data.goodsLoadFinishFlag) {
  250 + this.setData({
  251 + iscodeall: 1
  252 + })
  253 + }
  254 + s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
  255 + } else {
  256 + this.request_list({
  257 + store_id: os.stoid,
  258 + user_id: oo.user_id,
  259 + page: this.data.currentPage2,
  260 + });
  261 + }
239 262 },
240 263 onPullDownRefresh: function(t) {
241   - this.resetData(), this.requestOrderList(this.data.activeCategoryId);
  264 + // sty取消
  265 + // this.resetData(), this.requestOrderList(this.data.activeCategoryId);
242 266 },
243 267  
244 268 /*-----------取消订单-----------*/
... ... @@ -767,10 +791,6 @@ Page({
767 791 }).then(res=>{
768 792 pickup = res.data.data;
769 793 })
770   -
771   - wx.showLoading({
772   - title:"处理中."
773   - });
774 794  
775 795 //--------获取商品----------
776 796 var goods_list=item.order_goods;
... ... @@ -1084,7 +1104,6 @@ Page({
1084 1104 if(!err_text){
1085 1105 th.more_add_cart();
1086 1106 }else{
1087   - wx.hideLoading();
1088 1107 // 如果没有获取用户信息
1089 1108 wx.showModal({
1090 1109 title:'确定',
... ... @@ -1099,7 +1118,6 @@ Page({
1099 1118  
1100 1119 }
1101 1120 }else{
1102   - wx.hideLoading();
1103 1121 getApp().confirmBox(err_text);
1104 1122 }
1105 1123 },
... ... @@ -1197,9 +1215,8 @@ Page({
1197 1215 }
1198 1216 })
1199 1217 }
1200   - }
1201   -
1202   - wx.hideLoading();
  1218 + }
  1219 +
1203 1220 if(ok_num==0){
1204 1221 //-- 如果没有获取用户信息 --
1205 1222 wx.showModal({
... ... @@ -1226,9 +1243,155 @@ Page({
1226 1243 }
1227 1244  
1228 1245 }
1229   - }
1230   -
  1246 + },
  1247 +
  1248 + request_list: function(data, callback){
  1249 + // console.log('触发上拉刷新');
  1250 +
  1251 + var th = this;
  1252 + if(this.data.is_load2) return false; //-- 正在加载
  1253 + if(this.data.is_no_data2) return false; //-- 没有数据
  1254 + if(this.data.is_no_more2) return false; //-- 没有更多
  1255 +
  1256 + // 开启加载状态
  1257 + this.data.is_load2=1;
  1258 +
  1259 + // var req_data = {
  1260 + // page:th.data.currentPage2
  1261 + // }
  1262 +
  1263 + app.request.promiseGet("/api/weshop/order/pagePosOrder", {
  1264 + data: data
  1265 + }).then(res=>{
  1266 + // 关闭加载状态
  1267 + th.data.is_load2=0;
  1268 + // 请求成功
  1269 + if(res.data.code==0) {
  1270 + if(res.data.data.pageData.length>0) {
  1271 + th.data.currentPage2++;
  1272 + var data = res.data.data.pageData;
  1273 + // 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有
  1274 + if(res.data.data.page*res.data.data.pageSize > res.data.data.total){th.setData({is_no_more2:1});}
  1275 + var list=th.data.list2;
  1276 + list=list.concat(data);
  1277 + th.setData({list2:list});
  1278 + } else {
  1279 + if(th.data.currentPage2==1){
  1280 + th.setData({is_no_data2:1});
  1281 + } else {
  1282 + th.setData({is_no_more2:1});
  1283 + }
  1284 + }
  1285 + if(callback) callback();
  1286 + } else {
  1287 + wx.showToast({
  1288 + title: res.data.msg,
  1289 + icon: 'none',
  1290 + duration: 2000
  1291 + })
  1292 + }
  1293 + })
  1294 + },
  1295 +
  1296 +
  1297 + onClickTab(e) {
  1298 + let currentIndex = e.target.dataset.index;
  1299 + this.setData({
  1300 + currentIndex: currentIndex
  1301 + });
  1302 + console.log(this.data.currentIndex);
  1303 + this.setData({
  1304 + is_no_data2: 0,
  1305 + is_no_more2: 0,
  1306 + currentPage2: 1,
  1307 + });
  1308 + if(currentIndex == 0) {
  1309 + console.log('线上订单');
  1310 + } else if(currentIndex == 1) {
  1311 + console.log('线下订单');
  1312 +
  1313 + this.request_list({
  1314 + store_id: os.stoid,
  1315 + user_id: oo.user_id,
  1316 + page: 1,
  1317 + });
  1318 + };
  1319 + },
  1320 +
  1321 + bindDateChange1: function(e) {
  1322 + console.log('picker发送选择改变，携带值为', e.detail.value)
  1323 + this.setData({
  1324 + startDate: e.detail.value
  1325 + })
  1326 + },
  1327 +
  1328 + bindDateChange2: function(e) {
  1329 + console.log('picker发送选择改变，携带值为', e.detail.value)
  1330 + this.setData({
  1331 + endDate: e.detail.value
  1332 + })
  1333 + },
1231 1334  
  1335 + search() {
  1336 + let th = this;
  1337 + let startDate = this.data.startDate;
  1338 + let endDate = this.data.endDate;
  1339 +
  1340 + if(startDate == '选择开始时间' || endDate == '选择结束时间') {
  1341 + wx.showToast({
  1342 + title: '请选择完整的查询时间~',
  1343 + icon: 'none',
  1344 + })
  1345 + }
  1346 +
  1347 + if(new Date(startDate) > new Date(endDate)) {
  1348 + wx.showToast({
  1349 + title: '敲黑板！开始时间不能晚于结束时间噢~',
  1350 + icon: 'none',
  1351 + })
  1352 + }
  1353 +
  1354 +
  1355 + this.request_list({
  1356 + store_id: os.stoid,
  1357 + user_id: oo.user_id,
  1358 + page: 1,
  1359 + BeginDate:this.data.startDate,
  1360 + EndDate: this.data.endDate,
  1361 + }, function() {
  1362 + th.setData({
  1363 + total: res.data.data.total
  1364 + });
  1365 + });
  1366 +
  1367 +
  1368 + },
  1369 +
  1370 + currentDate() {
  1371 + var now = new Date();
  1372 + var year = now.getFullYear(); //年
  1373 + var month = now.getMonth() + 1; //月
  1374 + var day = now.getDate(); //日
  1375 +
  1376 + var clock = year + "-";
  1377 +
  1378 + if(month < 10) month += "0";
  1379 + clock += month + "-";
  1380 +
  1381 + if(day < 10) day += "0";
  1382 + clock += day;
  1383 +
  1384 + // if(hh < 10)
  1385 + // clock += "0";
  1386 +
  1387 + // clock += hh + ":";
  1388 + // if (mm < 10) clock += '0';
  1389 + // clock += mm + ":";
  1390 +
  1391 + // if (ss < 10) clock += '0';
  1392 + // clock += ss;
  1393 + return clock;
  1394 + },
1232 1395  
1233 1396  
1234 1397 });
1235 1398 \ No newline at end of file
... ...
pages/user/order_list/order_list.json
  View file @3e16dac
1 1 {
2 2 "navigationBarTitleText": "我的订单",
  3 + "enablePullDownRefresh": false,
3 4 "usingComponents": {
4 5 "qr_code": "/components/qr_code/qr_code"
5 6 }
... ...
pages/user/order_list/order_list.wxml
  View file @3e16dac
1 1 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 2 <view class="container">
3   - <view class="type-navbar padding fs30">
4   - <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
5   - <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
6   - {{item.name}}
7   - </view>
8   - </view>
9   - </view>
  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>
  6 + </view>
  7 + <view class="search-container flex" wx:if="{{currentIndex == 0}}">
  8 + <input class="search-input" type="text" placeholder="请输入您所搜索的商品"/>
  9 + <view class="search-btn">搜索</view>
  10 + </view>
  11 + <view class="type-navbar fs28" wx:if="{{currentIndex == 0}}">
  12 + <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
  13 + <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
  14 + {{item.name}}
  15 + </view>
  16 + </view>
  17 + </view>
  18 + <view class="search-container" wx:if="{{currentIndex == 1}}">
  19 + <view class="flex jc_sb">
  20 + <view class="picker-container flex f1">
  21 + <picker class="picker-date" mode="date" value="{{date}}" start="2015-09-01" end="{{currentDate}}" bindchange="bindDateChange1">
  22 + <view class="picker">{{startDate}}</view>
  23 + </picker>
  24 + <view class="fs28 pdh10">至</view>
  25 + <picker class="picker-date" mode="date" value="{{date}}" start="2015-09-01" end="{{currentDate}}" bindchange="bindDateChange2">
  26 + <view class="picker">{{endDate}}</view>
  27 + </picker>
  28 + </view>
  29 + <view class="search-btn search-btn2" bindtap="search">查询</view>
  30 + </view>
  31 + <view class="fs24 c-9 pdt20">注：读取时段内仅{{total}}笔记录</view>
  32 + </view>
10 33 </view>
11   -<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
12   -
13   - <!-- 商品编号和状态 -->
14   - <view class="Commodity_number flex-vertical-between fs30 padding border_bottom">
15   - <!--商品编号 -->
16   - <text selectable='true'>订单编号：{{item.order_sn}}</text>
17   - <!-- 商品评价状态 -->
18   - <view class="flex-center xc-wc">
19   - <!-- 订单状态 -->
20   - <view wx:if="{{item.pt_status==1}}">组团中</view>
21   - <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
22   - <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
23   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
24   - <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
25   - <view wx:if="{{(item.order_status==2)}}">待评价</view>
26   - <view wx:if="{{item.order_status==4}}">已评价</view>
27   - <view wx:if="{{item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view>
28   - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
29   - </view>
30   - <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
31   - <view wx:if="{{item.order_status==6}}">退款成功</view>
32   - <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
33   - </block>
34   - <block wx:else>退款中</block>
35   - <!--
36   - <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
37   - <view class="lin"></view>
38   - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
39   - </view>-->
40   -
41   - </view>
42   - </view>
43   -
44   - <!-- 商品详情集合 -->
45   - <view class="detail_commoditys">
46   - <!-- 单个商品 -->
47   - <!-- wx:if="{{goods.return_btn!=4}}" -->
48   - <view>
49   - <navigator class="detail_commodity flex-vertical padding border_bottom" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:for-index="pinx" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
50   - <!-- 商品图片 -->
51   - <navigator class="rel">
52   - <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
53   - <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
54   - <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
55   - </navigator>
56   - <!-- 商品内容 -->
57   - <view class="Commodity_content">
58   - <view class="Commodity_goods">
59   - <!-- 商品名称 -->
60   - <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
61   - <view class="flex-space-between">
62   - <!-- 商品规格 -->
63   - <view class="Commodity_spec fs28 flex-center">
64   - <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
65   - <!--<text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>-->
66   - <!--<text class="ellipsis-1" wx:else>规格1</text>-->
67   - <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text>
68   - </view>
69   - <view class="flex-level-right fs26 refund">
70   - <!-- 不是整单退的时候 -->
71   - <block wx:if="{{item.is_all_return!=1 && item.discount<=0 && item.coupon_price<=0 && item.order_prom_amount<=0 && item.discount_amount<=0 && goods.prom_type!=5 && !item.is_prom}}">
72   - <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1 && !item.is_bedistri }}">申请退款</view>
73   - <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
74   - <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
75   - <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
76   - </block>
77   - </view>
78   - </view>
79   - </view>
80   - <!-- 商品价格数量 -->
81   - <view class="Commodity_money flex-vertical-between baseline">
82   - <!-- 商品价格 -->
83   - <view class="flex-vertical xc-wc baseline">
84   - <view class="fs24">￥</view>
85   - <view class="fs30">{{filters.toFix(goods.member_goods_price,2)}}</view>
86   - </view>
87   - <view class="fs30">x{{goods.goods_num}}</view>
88   - </view>
89   - </view>
90   - </navigator>
91   - <!-- 去评价 -->
92   - <view class="commodity_evaluate jc_sb padding baseline fs26">
93   - <!-- 商品数量 -->
94   - <view class="commodity_smy flex fs30">
95   - <view class="order-total">
96   - <view>
97   - 共{{item.g_num}}件商品
98   - </view>
99   - <view class="goods-total flex">
100   - <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
101   - <view class="commodity_money flex baseline">
102   - <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
103   - <view class="fs24 xc-wc">￥</view>
104   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
105   - </view>
106   -
107   - </view>
108   - </block>
109   - <block wx:else>
110   - <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
111   - <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
112   - <view class="fs24 xc-wc">￥</view>
113   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
114   - </view>
115   - </view>
116   - <view class="commodity_money flex baseline" wx:else>
117   - <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
118   - <view class="fs24 xc-wc">￥</view>
119   - <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
120   - <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
121   - <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
122   - </view>
123   - </view>
124   - <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
125   - <view>待支付尾款:</view>
126   - <view class="fs24 xc-wc">￥</view>
127   - <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
128   - </view>
129   - </view>
130   -
131   -
132   - </block>
133   - </view>
134   - </view>
135   - </view>
136   - <view class="links flex-right-vertical fs30" style="flex-wrap: wrap;margin-top: 10rpx;">
137   - <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>
138   - <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>
139   - <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
140   - <!---has_rt部分退---->
141   - <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
142   - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
143   - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
144   - </block>
145   - <block wx:else>
146   - <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
147   - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
148   - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
149   - </block>
150   - <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
151   - <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
152   - <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
153   -
154   - <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
155   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
156   - <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
157   - </block>
158   -
  34 +<!-- 线上订单 -->
  35 +<view class="list-container" wx:if="{{currentIndex == 0}}">
  36 + <view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
  37 + <!-- 商品编号和状态 -->
  38 + <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
  39 + <!--商品编号 -->
  40 + <text selectable='true'>订单编号：{{item.order_sn}}</text>
  41 + <!-- 商品评价状态 -->
  42 + <view class="flex-center xc-wc">
  43 + <!-- 订单状态 -->
  44 + <view wx:if="{{item.pt_status==1}}">组团中</view>
  45 + <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
  46 + <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
  47 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
  48 + <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
  49 + <view wx:if="{{(item.order_status==2)}}">待评价</view>
  50 + <view wx:if="{{item.order_status==4}}">已评价</view>
  51 + <view wx:if="{{item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view>
  52 + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
  53 + </view>
  54 + <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
  55 + <view wx:if="{{item.order_status==6}}">退款成功</view>
  56 + <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
  57 + </block>
  58 + <block wx:else>退款中</block>
  59 + <!--
  60 + <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
  61 + <view class="lin"></view>
  62 + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image>
  63 + </view>-->
159 64  
160   - <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
161   - <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b"
162   - url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
163   - <navigator wx:else class="order-btn white red-b"
164   - 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>
165   - </block>
166   -
167   -
168   - <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
169   - <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
170   -
171   - <!-- 积分购 拼团 搭配购没有有再来一单 -->
172   - <block wx:if="{{(item.pay_status==1 || item.order_status==3) && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
173   - <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go" style="background-color: #feca53;"
174   - data-index="{{index}}" >再来一单</view>
175   - </block>
176   -
177   - </view>
178   - </view>
179   - </view>
180   - </view>
  65 + </view>
  66 + </view>
  67 +
  68 + <!-- 商品详情集合 -->
  69 + <view class="detail_commoditys">
  70 + <!-- 单个商品 -->
  71 + <!-- wx:if="{{goods.return_btn!=4}}" -->
  72 + <view>
  73 + <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:for-index="pinx" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
  74 + <!-- 商品图片 -->
  75 + <navigator class="rel">
  76 + <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
  77 + <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
  78 + <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
  79 + </navigator>
  80 + <!-- 商品内容 -->
  81 + <view class="Commodity_content">
  82 + <view class="Commodity_goods">
  83 + <!-- 商品名称 -->
  84 + <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
  85 + <view class="flex-space-between">
  86 + <!-- 商品规格 -->
  87 + <view class="Commodity_spec fs28 flex-center">
  88 + <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
  89 + <!--<text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>-->
  90 + <!--<text class="ellipsis-1" wx:else>规格1</text>-->
  91 + <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text>
  92 + </view>
  93 + <view class="flex-level-right fs26 refund">
  94 + <!-- 不是整单退的时候 -->
  95 + <block wx:if="{{item.is_all_return!=1 && item.discount<=0 && item.coupon_price<=0 && item.order_prom_amount<=0 && item.discount_amount<=0 && goods.prom_type!=5 && !item.is_prom}}">
  96 + <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1 && !item.is_bedistri }}">申请退款</view>
  97 + <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
  98 + <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
  99 + <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
  100 + </block>
  101 + </view>
  102 + </view>
  103 + </view>
  104 + <!-- 商品价格数量 -->
  105 + <view class="Commodity_money flex-vertical-between baseline">
  106 + <!-- 商品价格 -->
  107 + <view class="flex-vertical xc-wc baseline">
  108 + <view class="fs24">￥</view>
  109 + <view class="fs32">{{filters.toFix(goods.member_goods_price,2)}}</view>
  110 + </view>
  111 + <view class="fs26 c-a9">x{{goods.goods_num}}</view>
  112 + </view>
  113 + </view>
  114 + </navigator>
  115 + <!-- 去评价 -->
  116 + <view class="commodity_evaluate jc_sb baseline fs26">
  117 + <!-- 商品数量 -->
  118 + <view class="commodity_smy fs26">
  119 + <view class="order-total">
  120 + <view>
  121 + 共{{item.g_num}}件商品
  122 + </view>
  123 + <view class="goods-total flex">
  124 + <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
  125 + <view class="commodity_money flex baseline">
  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)}}
  129 + </view>
  130 +
  131 + </view>
  132 + </block>
  133 + <block wx:else>
  134 + <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
  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)}}
  138 + </view>
  139 + </view>
  140 + <view class="commodity_money flex baseline" wx:else>
  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)}}
  144 + <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
  145 + <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
  146 + </view>
  147 + </view>
  148 + <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
  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)}}
  152 + </view>
  153 + </view>
  154 +
  155 +
  156 + </block>
  157 + </view>
  158 + </view>
  159 + </view>
  160 + <view class="links flex-right-vertical fs26 padding" style="flex-wrap: wrap;">
  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 + <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 + <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
  164 + <!---has_rt部分退---->
  165 + <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
  166 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
  167 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
  168 + </block>
  169 + <block wx:else>
  170 + <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
  171 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
  172 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
  173 + </block>
  174 + <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
  175 + <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
  176 + <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
  177 +
  178 + <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
  179 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
  180 + <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="commodity_To_evaluate flex-level comment_go" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
  181 + </block>
  182 +
  183 +
  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"
  186 + url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
  187 + <navigator wx:else class="order-btn white red-b"
  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>
  189 + </block>
  190 +
  191 +
  192 + <navigator class="commodity_To_evaluate flex-level comment_go" url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
  193 + <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="jumpToCart4" data-idx="{{index}}" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">立即支付</navigator>
  194 +
  195 + <!-- 积分购 拼团 搭配购没有有再来一单 -->
  196 + <block wx:if="{{(item.pay_status==1 || item.order_status==3) && item.pt_prom_id<=0 && item.integral<=0 && item.order_goods[0].prom_type!=5 }}">
  197 + <view bindtap="moreOrder" class="commodity_To_evaluate flex-level comment_go"
  198 + data-index="{{index}}" >再来一单</view>
  199 + </block>
  200 +
  201 + </view>
  202 + </view>
  203 + </view>
  204 + </view>
  205 + </view>
181 206 </view>
  207 +<!-- 线下订单 -->
  208 +<view class="offline-container" wx:else>
  209 + <view class="offline-list">
  210 + <view class="item" wx:for="{{list2}}">
  211 + <view class="title">单号：{{item.No}}</view>
  212 + <view class="subtitle">
  213 + <text>{{item.BillDate}}</text>
  214 + <view>消费总额：<text class="co-red">￥{{item.Sum}}</text></view>
  215 + </view>
  216 + <view wx:for="{{item.list}}" wx:for-item="i">
  217 + <view class="ellipsis-2 name">{{i.BarCode}} - {{i.WareName}}</view>
  218 + <view class="flex">
  219 + <view class="subitem">
  220 + <view class="key">数量</view>
  221 + <view class="val">{{i.Qty}}</view>
  222 + </view>
  223 + <view class="subitem">
  224 + <view class="key">单价</view>
  225 + <view class="val">￥{{i.Price}}({{i.PosPrice}})</view>
  226 + </view>
  227 + <view class="subitem">
  228 + <view class="key">金额</view>
  229 + <view class="val">￥{{i.Sum}}</view>
  230 + </view>
  231 + </view>
  232 + </view>
  233 + </view>
  234 + </view>
  235 + </view>
  236 +
182 237  
183 238 <!-- 没有数据 -->
184   -<view class="After_all flex-center" wx:if="{{iscodeall==1 && orderList.length>1}}">
  239 +<view class="After_all flex-center" wx:if="{{(iscodeall==1 && orderList.length>1 && currentIndex ==0) || (is_no_more2 && currentIndex == 1)}}">
185 240 <view class="Line"></view>
186   - <view class="end fs26 xc-black">到底了</view>
  241 + <view class="end fs26 xc-black">——— 到底了 ———</view>
187 242 <view class="Line"></view>
188 243 </view>
189 244  
190 245 <!-- 无订单 -->
191   -<view class="empty_order" wx:if="{{(!orderList||orderList.length==0) && is_get}}">
  246 +<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1)}}">
192 247 <view class="flex-level">
193 248 <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
194 249 </view>
... ...
pages/user/order_list/order_list.wxss
  View file @3e16dac
  1 +/* 背景色相关 */
  2 +bg-white {
  3 + background-color: white;
  4 +}
  5 +
  6 +/* 外边距相关 */
  7 +mgt12 {
  8 + margin-top: 12rpx;
  9 +}
  10 +
  11 +/* 边框相关 */
  12 +.bdt {
  13 + border-top: 2rpx solid #F6F6F6;
  14 +}
  15 +
  16 +/* 颜色相关 */
  17 +.c-a9{
  18 + color: #A9A9A9;
  19 +}
  20 +.c-9 {
  21 + color: #999;
  22 +}
  23 +
  24 +/* 内边距 */
  25 +.pdt20 {
  26 + padding-top: 20rpx;
  27 +}
  28 +
  29 +.bold {
  30 + font-weight: bold;
  31 +}
  32 +
  33 +.f1 {
  34 + flex: 1;
  35 +}
  36 +
  37 +.pdh10 {
  38 + padding-left: 10rpx;
  39 + padding-right: 10rpx;
  40 +}
  41 +
  42 +
1 43 page {
2 44 font-family: microsoft yahei;
  45 + background-color: #F5F5F5;
  46 + height: 100%;
3 47 }
4 48  
5 49 .type-navbar {
... ... @@ -8,23 +52,63 @@ page {
8 52 height: 88rpx;
9 53 background-color: #fff;
10 54 justify-content: space-between;
11   - border-top: 1rpx solid rgb(211, 211, 211);
  55 + border-top: 2rpx solid #f6f6f6;
12 56 }
13 57  
14 58 .type-box {
15 59 box-sizing: border-box;
16   - line-height: 84rpx;
  60 + width: 20%;
  61 + line-height: 88rpx;
17 62 text-align: center;
18 63 display: inline-block;
19 64 overflow: hidden;
20 65 }
21 66  
22 67 .type-navbar-item {
23   - border-bottom: 4rpx solid #fff;
  68 + /* border-bottom: 4rpx solid #fff; */
24 69 }
25 70  
26 71 .type-item-on {
27   - border-bottom: 4rpx solid #e64340;
  72 + background-color: #FF3B3D;
  73 + color: white;
  74 + font-weight: bold;
  75 + /* border-bottom: 4rpx solid #ED3036; */
  76 + position: relative;
  77 +}
  78 +.type-item-on:after {
  79 + /* content: '';
  80 + position: absolute;
  81 + left: 0;
  82 + right: 0;
  83 + bottom: 0;
  84 + width: 50%;
  85 + height: 4rpx;
  86 + background-color: #ED3036;
  87 + margin: 0 auto; */
  88 +}
  89 +
  90 +.container {
  91 + position: fixed;
  92 + width: 100%;
  93 + top: 0;
  94 + z-index: 999;
  95 + /* position: -webkit-sticky;
  96 + position:sticky;
  97 + top: 0; */
  98 +}
  99 +
  100 +.list-container {
  101 + padding-left: 18rpx;
  102 + padding-right: 18rpx;
  103 + overflow: hidden;
  104 + /* height: calc(100% - 282rpx); */
  105 + padding-top: 282rpx;
  106 +}
  107 +
  108 +.stay_evaluate {
  109 + background-color: white;
  110 + margin-top: 18rpx;
  111 + border-radius: 8rpx;
28 112 }
29 113  
30 114 /* 原 */
... ... @@ -112,7 +196,9 @@ page {
112 196  
113 197 .order-total {
114 198 display: flex;
115   - justify-content: flex-start;
  199 + justify-content: flex-end;
  200 + padding-top: 24rpx;
  201 + padding-bottom: 24rpx;
116 202 }
117 203  
118 204 .goods-total {
... ... @@ -146,9 +232,11 @@ page {
146 232  
147 233 /* 新 */
148 234  
  235 +
149 236 .Commodity_number {
150 237 height: 80rpx;
151   - border-top: 13rpx solid rgb(245, 245, 245);
  238 + color: #696969;
  239 + /* border-top: 13rpx solid rgb(245, 245, 245); */
152 240 }
153 241  
154 242 .Commodity_number .lin {
... ... @@ -159,11 +247,11 @@ page {
159 247  
160 248 .Commodity_number image {
161 249 width: 30rpx;
162   - height: 32rpx;
  250 + height: 30rpx;
163 251 }
164 252  
165 253 .padding {
166   - padding: 0rpx 27rpx;
  254 + padding: 0 18rpx;
167 255 }
168 256  
169 257 /* 文字基线对齐 */
... ... @@ -173,7 +261,7 @@ page {
173 261 }
174 262  
175 263 .border_bottom {
176   - border-bottom: 4rpx solid rgb(245, 245, 245);
  264 + border-bottom: 2rpx solid rgb(245, 245, 245);
177 265 }
178 266  
179 267 /* 单个商品框架 */
... ... @@ -183,8 +271,11 @@ page {
183 271 }
184 272  
185 273 .detail_commodity image {
186   - width: 185rpx;
187   - height: 185rpx;
  274 + display: block;
  275 + /* width: 186rpx;
  276 + height: 186rpx; */
  277 + width: 100%;
  278 + height: 100%;
188 279 }
189 280  
190 281 .detail_commodity .goods_name {
... ... @@ -210,27 +301,31 @@ page {
210 301 /* 商品评价按钮框架 */
211 302  
212 303 .commodity_evaluate {
213   - padding-top: 15rpx;
214   - padding-bottom: 15rpx;
215   - border-bottom: 4rpx solid rgb(245, 245, 245);
  304 + /* padding-top: 15rpx;
  305 + padding-bottom: 15rpx; */
  306 + /* border-bottom: 4rpx solid rgb(245, 245, 245); */
216 307 }
217 308  
218 309 .commodity_evaluate .commodity_smy .commodity_money {
219 310 margin-left: 29rpx;
220 311 letter-spacing: 1rpx;
  312 + font-weight: bold;
221 313 }
222 314  
223 315 .commodity_evaluate .links {
224 316 /* height: 92rpx; */
225   - height: auto;
  317 + /* height: auto; */
  318 + padding-top: 20rpx;
  319 + padding-bottom: 20rpx;
  320 + border-top: 2rpx solid #F6F6F6;
226 321 }
227 322  
228 323 .commodity_evaluate .commodity_To_evaluate {
229 324 width: 155rpx;
230 325 height: 48rpx;
231   - border-radius: 10rpx;
  326 + border-radius: 6rpx;
232 327 line-height: 48rpx;
233   - margin-bottom: 10rpx;
  328 + /* margin-bottom: 10rpx; */
234 329 }
235 330  
236 331 .commodity_evaluate .commodity_To_evaluate view {
... ... @@ -239,8 +334,9 @@ page {
239 334 }
240 335  
241 336 .commodity_evaluate .comment_go {
242   - background-color: rgb(211, 28, 52);
243   - color: rgb(255, 255, 255);
  337 + /* background-color: rgb(211, 28, 52); */
  338 + background-color: #FF3B3D;
  339 + color: white;
244 340 margin-left: 18rpx;
245 341 width: 155rpx;
246 342 height: 48rpx;
... ... @@ -294,7 +390,7 @@ page {
294 390 }
295 391  
296 392 .commodity_evaluate .View_evaluation {
297   - border: 1px solid #ddd;
  393 + border: 1px solid #E5E5E5;
298 394 color: rgb(0, 0, 0);
299 395 background-color: rgb(255, 255, 255);
300 396 margin-left: 18rpx;
... ... @@ -321,13 +417,14 @@ page {
321 417  
322 418 .After_all .end {
323 419 margin: 0rpx 15rpx;
  420 + color: #ccc;
324 421 }
325 422  
326 423 /* 无订单 */
327 424  
328 425 .empty_order image {
329   - width: 329rpx;
330   - height: 229rpx;
  426 + width: 292rpx;
  427 + height: 268rpx;
331 428 margin-top: 202rpx;
332 429 }
333 430  
... ... @@ -343,16 +440,18 @@ page {
343 440  
344 441 .empty_order navigator view {
345 442 width: 247rpx;
346   - height: 56rpx;
  443 + height: 60rpx;
  444 + line-height: 60rpx;
347 445 background-color: rgb(255, 72, 72);
348   - border-radius: 40rpx;
  446 + border-radius: 8rpx;
349 447 }
350 448  
351 449 .rel {
352   - width: 185rpx;
353   - height: 185rpx;
  450 + box-sizing: border-box;
  451 + width: 184rpx;
  452 + height: 184rpx;
354 453 overflow: hidden;
355   - border: 2rpx solid rgb(236, 236, 236);
  454 + /* border: 2rpx solid rgb(236, 236, 236); */
356 455 }
357 456  
358 457 .abs {
... ... @@ -371,4 +470,119 @@ page {
371 470 }
372 471 .refund{
373 472 margin-top: 20rpx;
374   -}
375 473 \ No newline at end of file
  474 +}
  475 +
  476 +.tab-container {
  477 + display: flex;
  478 + justify-content: space-between;
  479 + text-align: center;
  480 + font-size: 28rpx;
  481 + border-bottom: 2rpx solid #f2f2f2;
  482 +}
  483 +.tab {
  484 + flex: 1;
  485 + line-height: 80rpx;
  486 + background-color: white;
  487 + position: relative;
  488 +}
  489 +.tab.active {
  490 + color: #FF3B3D;
  491 +}
  492 +.tab.active::after {
  493 + content: '';
  494 + position: absolute;
  495 + left: 0;
  496 + right: 0;
  497 + bottom: 0;
  498 + width: 50%;
  499 + height: 2px;
  500 + margin: 0 auto;
  501 + background-color: #FF3B3D;
  502 +}
  503 +.search-container {
  504 + /* display: flex; */
  505 + padding: 10px;
  506 + background-color: white;
  507 +}
  508 +.search-input {
  509 + background-color: #f2f2f2;
  510 + flex: 1;
  511 + border-radius: 4px 0 0 4px;
  512 + height: 70rpx;
  513 + line-height: 70rpx;
  514 + font-size: 14px;
  515 + padding: 0 10px;
  516 +}
  517 +.search-btn {
  518 + color: white;
  519 + font-size: 14px;
  520 + background-color: #FF3B3D;
  521 + padding: 8px 20px;
  522 + border-radius: 0 4px 4px 0;
  523 +}
  524 +.picker-container {
  525 + padding-right: 10rpx;
  526 + align-items: center;
  527 +
  528 +}
  529 +.picker-date {
  530 + background-color: #f5f5f5;
  531 + flex: 1;
  532 + border-radius: 10rpx;
  533 +}
  534 +.picker {
  535 + color: #999;
  536 + text-align: center;
  537 + line-height: 70rpx;
  538 + font-size: 28rpx;
  539 +}
  540 +
  541 +.list2 {
  542 + padding-left: 18rpx;
  543 + padding-right: 18rpx;
  544 +}
  545 +.title {
  546 + padding: 20rpx;
  547 + font-size: 28rpx;
  548 +}
  549 +.subtitle {
  550 + display: flex;
  551 + font-size: 26rpx;
  552 + justify-content: space-between;
  553 + background-color: #f0f0f0;
  554 + line-height: 60rpx;
  555 + padding: 0 20rpx;
  556 +}
  557 +.item {
  558 + background-color: white;
  559 + border-radius: 16rpx;
  560 + margin-top: 20rpx;
  561 +}
  562 +.subitem {
  563 + width: calc(100% / 3);
  564 + text-align: center;
  565 + font-size: 28rpx;
  566 +}
  567 +.name {
  568 + padding: 0 20rpx;
  569 + margin: 20rpx 0;
  570 + font-size: 30rpx;
  571 + word-break: break-all;
  572 + text-align: justify;
  573 +}
  574 +.key {
  575 + padding: 8rpx 0;
  576 + color: #999;
  577 +}
  578 +.val {
  579 + padding: 20rpx 0;
  580 + color: red;
  581 +}
  582 +
  583 +.offline-container {
  584 + padding: 244rpx 20rpx 20rpx;
  585 +}
  586 +
  587 +.search-btn2 {
  588 + border-radius-top-left: 8rpx;
  589 +}
... ...