From 3e16dac98231faf83de61ee814d600900fc91ecd Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Thu, 29 Oct 2020 18:03:50 +0800
Subject: [PATCH] 线下订单查询列表

---
 pages/user/order_list/order_list.js   | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 pages/user/order_list/order_list.json |   1 +
 pages/user/order_list/order_list.wxml | 413 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages/user/order_list/order_list.wxss | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 4 files changed, 660 insertions(+), 227 deletions(-)

diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 64da06f..5d971a1 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1,3 +1,4 @@
+const app = getApp();
 var t = function(t) {
     return t && t.__esModule ? t : {
       default: t
@@ -19,7 +20,7 @@ Page({
     resourceUrl: e.globalData.setting.imghost,
     iurl: e.globalData.setting.imghost,
     categories: [{
-      name: "全部订单",
+      name: "全部",
       id: 0
     }, {
       name: "待付款",
@@ -47,12 +48,26 @@ Page({
 	card_field:null,
 	
 	back_goods_arr:null,   //返回商品的列表
+		currentIndex: 0,
+		
+		startDate: '选择开始时间',
+		endDate: '选择结束时间',
+		list2: [],
+		currentPage2: 1,
+		currentDate: '',
+		total: 0, //读取时段内记录数量
   },
   onLoad: function(t) {
+		// 设置日期选择器的结束时间为当前日期
+		this.setData({
+			currentDate: this.currentDate()
+		});
+		
+		
     var th = this;
     if (t.type != undefined) this.setData({
       activeCategoryId: t.type
-    })
+    });
     s.init(this, "", "orderList");	
 	//---查看会员的等级价---
     getApp().getConfig2(function(e) {
@@ -230,15 +245,24 @@ Page({
   },
   //滑倒底部
   onReachBottom: function() {
-    if (s.data.goodsLoadFinishFlag) {
-      this.setData({
-        iscodeall: 1
-      })
-    }
-    s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
+		if(this.data.currentIndex == 0) {
+			if (s.data.goodsLoadFinishFlag) {
+			  this.setData({
+			    iscodeall: 1
+			  })
+			}
+			s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
+		} else {
+			this.request_list({
+			    store_id: os.stoid,
+			    user_id: oo.user_id,
+					page: this.data.currentPage2,
+			  });
+		}
   },
   onPullDownRefresh: function(t) {
-    this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+		// sty取消
+    // this.resetData(), this.requestOrderList(this.data.activeCategoryId);
   },
 
   /*-----------取消订单-----------*/
@@ -767,10 +791,6 @@ Page({
 	  }).then(res=>{		
 		   pickup = res.data.data;
 	  })
-	  
-	  wx.showLoading({
-		  title:"处理中."
-	  });
 			
 	  //--------获取商品----------
 	  var goods_list=item.order_goods;	  
@@ -1084,7 +1104,6 @@ Page({
 		  if(!err_text){
 			  th.more_add_cart();
 		  }else{
-			  wx.hideLoading();	
 			  // 如果没有获取用户信息
 			  wx.showModal({
 			  	title:'确定',
@@ -1099,7 +1118,6 @@ Page({
 			  
 		  }		  
 	  }else{
-		  wx.hideLoading();	
 		  getApp().confirmBox(err_text);  
 	  }	  
   },
@@ -1197,9 +1215,8 @@ Page({
 				  }			  				  
 			  })				  
 		  }		 			  
-	  }		
-							
-	  wx.hideLoading();					     
+	  }							  
+      
 	  if(ok_num==0){
 		  //-- 如果没有获取用户信息 --
 		  wx.showModal({
@@ -1226,9 +1243,155 @@ Page({
 		  }
 		  
 	  }
-  }
-  
+  },
+	
+	request_list: function(data, callback){
+		// console.log('触发上拉刷新');
+		
+		var th = this;
+		if(this.data.is_load2) return false;    //-- 正在加载
+		if(this.data.is_no_data2) return false; //-- 没有数据
+		if(this.data.is_no_more2) return false; //-- 没有更多
+		
+		// 开启加载状态
+		this.data.is_load2=1;
+		
+		// var req_data = {
+		// 	page:th.data.currentPage2
+		// }
+	
+		app.request.promiseGet("/api/weshop/order/pagePosOrder", {
+			  data: data
+			}).then(res=>{
+			// 关闭加载状态
+			th.data.is_load2=0;
+			// 请求成功
+			if(res.data.code==0) {
+				if(res.data.data.pageData.length>0) {
+					th.data.currentPage2++;
+					var data = res.data.data.pageData;
+					// 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有
+					if(res.data.data.page*res.data.data.pageSize > res.data.data.total){th.setData({is_no_more2:1});}		  									 
+					var list=th.data.list2;
+					list=list.concat(data);
+					th.setData({list2:list});
+				} else {
+					if(th.data.currentPage2==1){
+						th.setData({is_no_data2:1});
+					} else {
+						th.setData({is_no_more2:1});
+					}
+				}	
+				if(callback) callback();
+			} else {
+				wx.showToast({
+				  title: res.data.msg,
+				  icon: 'none',
+				  duration: 2000
+				})
+			}
+		})	
+	},
+	
+	
+	onClickTab(e) {
+		let currentIndex = e.target.dataset.index;
+		this.setData({
+			currentIndex: currentIndex
+		});
+		console.log(this.data.currentIndex);
+		this.setData({
+			is_no_data2: 0,
+			is_no_more2: 0,
+			currentPage2: 1,
+		});
+		if(currentIndex == 0) {
+			console.log('线上订单');
+		} else if(currentIndex == 1) {
+			console.log('线下订单');
+			
+			this.request_list({
+			    store_id: os.stoid,
+			    user_id: oo.user_id,
+					page: 1,
+			  });
+		};
+	},
+	
+	bindDateChange1: function(e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			startDate: e.detail.value
+		})
+	},
+	
+	bindDateChange2: function(e) {
+		console.log('picker发送选择改变，携带值为', e.detail.value)
+		this.setData({
+			endDate: e.detail.value
+		})
+	},
   
+  search() {
+		let th = this;
+		let startDate = this.data.startDate;
+		let endDate = this.data.endDate;
+
+		if(startDate == '选择开始时间' || endDate == '选择结束时间') {
+			wx.showToast({
+				title: '请选择完整的查询时间~',
+				icon: 'none',
+			})
+		}
+		
+		if(new Date(startDate) > new Date(endDate)) {
+			wx.showToast({
+				title: '敲黑板！开始时间不能晚于结束时间噢~',
+				icon: 'none',
+			})
+		}
+		
+		
+		this.request_list({
+			store_id: os.stoid,
+			user_id: oo.user_id,
+			page: 1,
+			BeginDate:this.data.startDate,
+			EndDate: this.data.endDate,
+		}, function() {
+			th.setData({
+				total: res.data.data.total
+			});
+		});
+		
+		
+	},
+	
+	currentDate() { 
+		var now = new Date();
+		var year = now.getFullYear();       //年
+		var month = now.getMonth() + 1;     //月
+		var day = now.getDate();            //日
+		
+		var clock = year + "-";
+		
+		if(month < 10) month += "0";
+		clock += month + "-";
+		
+		if(day < 10) day += "0";		
+		clock += day;
+		
+		// if(hh < 10)
+		// 		clock += "0";
+				
+		// clock += hh + ":";
+		// if (mm < 10) clock += '0'; 
+		// clock += mm + ":"; 
+		 
+		// if (ss < 10) clock += '0'; 
+		// clock += ss; 
+		return clock; 
+	},
   
   
 });
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.json b/pages/user/order_list/order_list.json
index 264bda9..0894e53 100644
--- a/pages/user/order_list/order_list.json
+++ b/pages/user/order_list/order_list.json
@@ -1,5 +1,6 @@
 {
     "navigationBarTitleText": "我的订单",
+		"enablePullDownRefresh": false,
     "usingComponents": {
       "qr_code": "/components/qr_code/qr_code"
     }
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index dbfcbb7..52a240c 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,194 +1,249 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <view class="container">
-  <view class="type-navbar padding fs30">
-    <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
-      <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
-        {{item.name}}
-      </view>
-    </view>
-  </view>
+		<view class="tab-container" bindtap="onClickTab">
+			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0">线上订单</view>
+			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1">线下订单</view>
+		</view>
+		<view class="search-container flex" wx:if="{{currentIndex == 0}}">
+			<input class="search-input" type="text" placeholder="请输入您所搜索的商品"/>
+			<view class="search-btn">搜索</view>
+		</view>
+		<view class="type-navbar fs28" wx:if="{{currentIndex == 0}}">
+		  <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
+		    <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
+		      {{item.name}}
+		    </view>
+		  </view>
+		</view>
+		<view class="search-container" wx:if="{{currentIndex == 1}}">
+			<view class="flex jc_sb">
+				<view class="picker-container flex f1">
+					<picker class="picker-date" mode="date" value="{{date}}" start="2015-09-01" end="{{currentDate}}" bindchange="bindDateChange1">
+						<view class="picker">{{startDate}}</view>
+					</picker>
+					<view class="fs28 pdh10">至</view>
+					<picker class="picker-date" mode="date" value="{{date}}" start="2015-09-01" end="{{currentDate}}" bindchange="bindDateChange2">
+						<view class="picker">{{endDate}}</view>
+					</picker>
+				</view>
+				<view class="search-btn search-btn2" bindtap="search">查询</view>
+			</view>
+			<view class="fs24 c-9 pdt20">注：读取时段内仅{{total}}笔记录</view>
+		</view>
 </view>
-<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
-
-  <!-- 商品编号和状态 -->
-  <view class="Commodity_number flex-vertical-between fs30 padding border_bottom">
-    <!--商品编号 -->
-    <text selectable='true'>订单编号：{{item.order_sn}}</text>
-    <!-- 商品评价状态 -->
-    <view class="flex-center xc-wc">
-      <!-- 订单状态 -->
-      <view wx:if="{{item.pt_status==1}}">组团中</view>
-      <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
-      <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
-        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
-        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
-        <view wx:if="{{(item.order_status==2)}}">待评价</view>
-        <view wx:if="{{item.order_status==4}}">已评价</view>
-        <view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view> 
-		    <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
-	    </view>
-        <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
-        <view wx:if="{{item.order_status==6}}">退款成功</view>
-        <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
-      </block>
-      <block wx:else>退款中</block>
-	  <!--
-      <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
-        <view class="lin"></view>
-        <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
-      </view>-->
-	  
-    </view>
-  </view>
-
-  <!-- 商品详情集合 -->
-  <view class="detail_commoditys">
-    <!-- 单个商品 -->
-    <!-- wx:if="{{goods.return_btn!=4}}" -->
-    <view>
-      <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}}">
-        <!-- 商品图片 -->
-        <navigator class="rel">
-          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
-          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
-          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
-        </navigator>
-        <!-- 商品内容 -->
-        <view class="Commodity_content">
-          <view class="Commodity_goods">
-            <!-- 商品名称 -->
-            <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
-            <view class="flex-space-between">
-              <!-- 商品规格 -->
-              <view class="Commodity_spec fs28 flex-center">
-                <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
-                <!--<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>-->
-                <!--<text class="ellipsis-1" wx:else>规格1</text>-->
-                  <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text>
-              </view>
-              <view class="flex-level-right fs26 refund">
-                <!-- 不是整单退的时候 -->
-                <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}}">
-                  <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>
-                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
-                  <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
-                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
-                </block>
-              </view>
-            </view>
-          </view>
-          <!-- 商品价格数量 -->
-          <view class="Commodity_money flex-vertical-between baseline">
-            <!-- 商品价格 -->
-            <view class="flex-vertical xc-wc baseline">
-              <view class="fs24">￥</view>
-              <view class="fs30">{{filters.toFix(goods.member_goods_price,2)}}</view>
-            </view>
-            <view class="fs30">x{{goods.goods_num}}</view>
-          </view>
-        </view>
-      </navigator>
-      <!-- 去评价 -->
-      <view class="commodity_evaluate jc_sb padding baseline fs26">
-        <!-- 商品数量 -->
-        <view class="commodity_smy flex fs30">
-          <view class="order-total">
-            <view>
-              共{{item.g_num}}件商品
-            </view>
-            <view class="goods-total flex">
-              <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
-                <view class="commodity_money flex baseline">
-                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-                  <view class="fs24 xc-wc">￥</view>
-                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
-                  </view>
-
-                </view>
-              </block>
-              <block wx:else>
-                <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
-                  <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-                  <view class="fs24 xc-wc">￥</view>
-                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
-                  </view>
-                </view>
-                <view class="commodity_money flex baseline" wx:else>
-                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
-                  <view class="fs24 xc-wc">￥</view>
-                     <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
-                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
-                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
-                  </view>
-                </view>
-                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
-                  <view>待支付尾款:</view>
-                  <view class="fs24 xc-wc">￥</view>
-                  <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
-                  </view>
-                </view>
-
-
-              </block>
-            </view>
-          </view>
-        </view>
-        <view class="links flex-right-vertical fs30" style="flex-wrap: wrap;margin-top: 10rpx;">
-          <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>
-          <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>
-          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
-          <!---has_rt部分退---->
-          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
-            <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>
-            <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>
-          </block>
-          <block wx:else>
-            <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>
-            <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>
-            <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>
-          </block>
-          <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>
-          <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>
-          <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
-
-          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
-            <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>
-            <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>
-          </block>
-		  		  
+<!-- 线上订单 -->
+<view class="list-container" wx:if="{{currentIndex == 0}}">
+	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
+	  <!-- 商品编号和状态 -->
+	  <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
+	    <!--商品编号 -->
+	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
+	    <!-- 商品评价状态 -->
+	    <view class="flex-center xc-wc">
+	      <!-- 订单状态 -->
+	      <view wx:if="{{item.pt_status==1}}">组团中</view>
+	      <view wx:if="{{(item.order_status==0&&item.pay_status==0)}}">未支付</view>
+	      <block wx:if="{{!(item.is_all_return_status==0 || item.is_all_return_status==1)}}">
+	        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
+	        <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
+	        <view wx:if="{{(item.order_status==2)}}">待评价</view>
+	        <view wx:if="{{item.order_status==4}}">已评价</view>
+	        <view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view> 
+			    <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+		    </view>
+	        <view wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</view>
+	        <view wx:if="{{item.order_status==6}}">退款成功</view>
+	        <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
+	      </block>
+	      <block wx:else>退款中</block>
+		  <!--
+	      <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
+	        <view class="lin"></view>
+	        <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+	      </view>-->
 		  
-          <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
-            <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white red-b"
-                       url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
-            <navigator wx:else  class="order-btn white red-b"
-                       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>
-          </block>
-
-
-          <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>
-          <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>
-		  
-		  <!-- 积分购  拼团 搭配购没有有再来一单 -->
-		  <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 }}">
-		  			  <view bindtap="moreOrder"  class="commodity_To_evaluate flex-level comment_go" style="background-color: #feca53;"
-		  			   data-index="{{index}}" >再来一单</view>			  
-		  </block>
-		  
-        </view>
-      </view>
-    </view>
-  </view>
+	    </view>
+	  </view>
+	
+	  <!-- 商品详情集合 -->
+	  <view class="detail_commoditys">
+	    <!-- 单个商品 -->
+	    <!-- wx:if="{{goods.return_btn!=4}}" -->
+	    <view>
+	      <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}}">
+	        <!-- 商品图片 -->
+	        <navigator class="rel">
+	          <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image>
+	          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==1}}">秒杀</view>
+	          <view class="abs flex-center fs26" wx:if="{{goods.prom_type==6}}">团购</view>
+	        </navigator>
+	        <!-- 商品内容 -->
+	        <view class="Commodity_content">
+	          <view class="Commodity_goods">
+	            <!-- 商品名称 -->
+	            <view class="goods_name ellipsis-2 fs30">{{goods.goods_name}}</view>
+	            <view class="flex-space-between">
+	              <!-- 商品规格 -->
+	              <view class="Commodity_spec fs28 flex-center">
+	                <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
+	                <!--<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>-->
+	                <!--<text class="ellipsis-1" wx:else>规格1</text>-->
+	                  <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text>
+	              </view>
+	              <view class="flex-level-right fs26 refund">
+	                <!-- 不是整单退的时候 -->
+	                <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}}">
+	                  <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>
+	                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
+	                  <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
+	                  <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
+	                </block>
+	              </view>
+	            </view>
+	          </view>
+	          <!-- 商品价格数量 -->
+	          <view class="Commodity_money flex-vertical-between baseline">
+	            <!-- 商品价格 -->
+	            <view class="flex-vertical xc-wc baseline">
+	              <view class="fs24">￥</view>
+	              <view class="fs32">{{filters.toFix(goods.member_goods_price,2)}}</view>
+	            </view>
+	            <view class="fs26 c-a9">x{{goods.goods_num}}</view>
+	          </view>
+	        </view>
+	      </navigator>
+	      <!-- 去评价 -->
+	      <view class="commodity_evaluate jc_sb baseline fs26">
+	        <!-- 商品数量 -->
+	        <view class="commodity_smy fs26">
+	          <view class="order-total">
+	            <view>
+	              共{{item.g_num}}件商品
+	            </view>
+	            <view class="goods-total flex">
+	              <block wx:if="{{item.pt_status==4 || item.pt_status==5}}">
+	                <view class="commodity_money flex baseline">
+	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
+	                  <view class="fs24 xc-wc">￥</view>
+	                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money,2)}}
+	                  </view>
+	
+	                </view>
+	              </block>
+	              <block wx:else>
+	                <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
+	                  <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
+	                  <view class="fs24 xc-wc">￥</view>
+	                  <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                  </view>
+	                </view>
+	                <view class="commodity_money flex baseline" wx:else>
+	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
+	                  <view class="fs24 xc-wc">￥</view>
+	                     <view class="xc-wc">{{filters.toFix(item.order_amount+item.user_money,2)}}
+	                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
+	                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
+	                  </view>
+	                </view>
+	                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
+	                  <view>待支付尾款:</view>
+	                  <view class="fs24 xc-wc">￥</view>
+	                  <view class="xc-wc">{{filters.toFix(item.pt_tail_money-item.shipping_price,2)}}
+	                  </view>
+	                </view>
+	
+	
+	              </block>
+	            </view>
+	          </view>
+	        </view>
+	        <view class="links flex-right-vertical fs26 padding" style="flex-wrap: wrap;">
+	          <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>
+	          <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>
+	          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
+	          <!---has_rt部分退---->
+	          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
+	            <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>
+	            <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>
+	          </block>
+	          <block wx:else>
+	            <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>
+	            <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>
+	            <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>
+	          </block>
+	          <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>
+	          <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>
+	          <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
+	
+	          <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
+	            <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>
+	            <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>
+	          </block>
+			  		  
+			  
+	          <block wx:if="{{item.order_status==2 && item.is_zsorder!=4}}">
+	            <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white red-b"
+	                       url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
+	            <navigator wx:else  class="order-btn white red-b"
+	                       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>
+	          </block>
+	
+	
+	          <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>
+	          <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>
+			  
+			  <!-- 积分购  拼团 搭配购没有有再来一单 -->
+			  <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 }}">
+			  			  <view bindtap="moreOrder"  class="commodity_To_evaluate flex-level comment_go"
+			  			   data-index="{{index}}" >再来一单</view>			  
+			  </block>
+			  
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	</view>
 </view>
+<!-- 线下订单 -->
+<view class="offline-container" wx:else>
+		<view class="offline-list">
+			<view class="item" wx:for="{{list2}}">
+				<view class="title">单号：{{item.No}}</view>
+				<view class="subtitle">
+					<text>{{item.BillDate}}</text>
+					<view>消费总额：<text class="co-red">￥{{item.Sum}}</text></view>
+				</view>
+				<view wx:for="{{item.list}}" wx:for-item="i">
+					<view class="ellipsis-2 name">{{i.BarCode}} - {{i.WareName}}</view>
+					<view class="flex">
+						<view class="subitem">
+							<view class="key">数量</view>
+							<view class="val">{{i.Qty}}</view>
+						</view>
+						<view class="subitem">
+							<view class="key">单价</view>
+							<view class="val">￥{{i.Price}}({{i.PosPrice}})</view>
+						</view>
+						<view class="subitem">
+							<view class="key">金额</view>
+							<view class="val">￥{{i.Sum}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
 
 <!-- 没有数据 -->
-<view class="After_all flex-center" wx:if="{{iscodeall==1 && orderList.length>1}}">
+<view class="After_all flex-center" wx:if="{{(iscodeall==1 && orderList.length>1 && currentIndex ==0) || (is_no_more2 && currentIndex == 1)}}">
   <view class="Line"></view>
-  <view class="end fs26 xc-black">到底了</view>
+  <view class="end fs26 xc-black">——— 到底了 ———</view>
   <view class="Line"></view>
 </view>
 
 <!-- 无订单 -->
-<view class="empty_order" wx:if="{{(!orderList||orderList.length==0) && is_get}}">
+<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1)}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index c2ba572..eb7292c 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -1,5 +1,49 @@
+/* 背景色相关 */
+bg-white {
+	background-color: white;
+}
+
+/* 外边距相关 */
+mgt12 {
+	margin-top: 12rpx;
+}
+
+/* 边框相关 */
+.bdt {
+	border-top: 2rpx solid #F6F6F6;
+}
+
+/* 颜色相关 */
+.c-a9{
+	color: #A9A9A9;
+}
+.c-9 {
+	color: #999;
+}
+
+/* 内边距 */
+.pdt20 {
+	padding-top: 20rpx;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+.f1 {
+	flex: 1;
+}
+
+.pdh10 {
+	padding-left: 10rpx;
+	padding-right: 10rpx;
+}
+
+
 page {
   font-family: microsoft yahei;
+	background-color: #F5F5F5;
+	height: 100%;
 }
 
 .type-navbar {
@@ -8,23 +52,63 @@ page {
   height: 88rpx;
   background-color: #fff;
   justify-content: space-between;
-  border-top: 1rpx solid rgb(211, 211, 211);  
+  border-top: 2rpx solid #f6f6f6;  
 }
 
 .type-box {
   box-sizing: border-box;
-  line-height: 84rpx;
+	width: 20%;
+  line-height: 88rpx;
   text-align: center;
   display: inline-block;
   overflow: hidden;
 }
 
 .type-navbar-item {
-  border-bottom: 4rpx solid #fff;
+  /* border-bottom: 4rpx solid #fff; */
 }
 
 .type-item-on {
-  border-bottom: 4rpx solid #e64340;
+	background-color: #FF3B3D;
+	color: white;
+	font-weight: bold;
+  /* border-bottom: 4rpx solid #ED3036; */
+	position: relative;
+}
+.type-item-on:after {
+	/* content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 50%;
+	height: 4rpx;
+	background-color: #ED3036;
+	margin: 0 auto; */
+}
+
+.container {
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 999;
+	/* position: -webkit-sticky;
+	position:sticky;
+	top: 0; */
+}
+
+.list-container {
+	padding-left: 18rpx;
+	padding-right: 18rpx;
+	overflow: hidden;
+	/* height: calc(100% - 282rpx); */
+	padding-top: 282rpx;
+}
+
+.stay_evaluate {
+	background-color: white;
+	margin-top: 18rpx;
+	border-radius: 8rpx;
 }
 
 /* 原 */
@@ -112,7 +196,9 @@ page {
 
 .order-total {
   display: flex;
-  justify-content: flex-start;
+  justify-content: flex-end;
+	padding-top: 24rpx;
+	padding-bottom: 24rpx;
 }
 
 .goods-total {
@@ -146,9 +232,11 @@ page {
 
 /* 新 */
 
+
 .Commodity_number {
   height: 80rpx;
-  border-top: 13rpx solid rgb(245, 245, 245);
+	color: #696969;
+  /* border-top: 13rpx solid rgb(245, 245, 245); */
 }
 
 .Commodity_number .lin {
@@ -159,11 +247,11 @@ page {
 
 .Commodity_number image {
   width: 30rpx;
-  height: 32rpx;
+  height: 30rpx;
 }
 
 .padding {
-  padding: 0rpx 27rpx;
+  padding: 0 18rpx;
 }
 
 /* 文字基线对齐 */
@@ -173,7 +261,7 @@ page {
 }
 
 .border_bottom {
-  border-bottom: 4rpx solid rgb(245, 245, 245);
+  border-bottom: 2rpx solid rgb(245, 245, 245);
 }
 
 /* 单个商品框架 */
@@ -183,8 +271,11 @@ page {
 }
 
 .detail_commodity image {
-  width: 185rpx;
-  height: 185rpx;
+	display: block;
+  /* width: 186rpx;
+  height: 186rpx; */
+	width: 100%;
+	height: 100%;
 }
 
 .detail_commodity .goods_name {
@@ -210,27 +301,31 @@ page {
 /* 商品评价按钮框架 */
 
 .commodity_evaluate {
-  padding-top: 15rpx;
-  padding-bottom: 15rpx;
-  border-bottom: 4rpx solid rgb(245, 245, 245);
+  /* padding-top: 15rpx;
+  padding-bottom: 15rpx; */
+  /* border-bottom: 4rpx solid rgb(245, 245, 245); */
 }
 
 .commodity_evaluate .commodity_smy .commodity_money {
   margin-left: 29rpx;
   letter-spacing: 1rpx;
+	font-weight: bold;
 }
 
 .commodity_evaluate .links {
   /* height: 92rpx; */
-  height: auto;
+  /* height: auto; */
+	padding-top: 20rpx;
+	padding-bottom: 20rpx;
+	border-top: 2rpx solid #F6F6F6;
 }
 
 .commodity_evaluate .commodity_To_evaluate {
   width: 155rpx;
   height: 48rpx;
-  border-radius: 10rpx;
+  border-radius: 6rpx;
   line-height: 48rpx;
-  margin-bottom: 10rpx;
+  /* margin-bottom: 10rpx; */
 }
 
 .commodity_evaluate .commodity_To_evaluate view {
@@ -239,8 +334,9 @@ page {
 }
 
 .commodity_evaluate .comment_go {
-  background-color: rgb(211, 28, 52);
-  color: rgb(255, 255, 255);
+  /* background-color: rgb(211, 28, 52); */
+	background-color: #FF3B3D;
+  color: white;
   margin-left: 18rpx;
   width: 155rpx;
   height: 48rpx;
@@ -294,7 +390,7 @@ page {
 }
 
 .commodity_evaluate .View_evaluation {
-  border: 1px solid #ddd;
+  border: 1px solid #E5E5E5;
   color: rgb(0, 0, 0);
   background-color: rgb(255, 255, 255);
   margin-left: 18rpx;
@@ -321,13 +417,14 @@ page {
 
 .After_all .end {
   margin: 0rpx 15rpx;
+	color: #ccc;
 }
 
 /* 无订单 */
 
 .empty_order image {
-  width: 329rpx;
-  height: 229rpx;
+  width: 292rpx;
+  height: 268rpx;
   margin-top: 202rpx;
 }
 
@@ -343,16 +440,18 @@ page {
 
 .empty_order navigator view {
   width: 247rpx;
-  height: 56rpx;
+  height: 60rpx;
+	line-height: 60rpx;
   background-color: rgb(255, 72, 72);
-  border-radius: 40rpx;
+  border-radius: 8rpx;
 }
 
 .rel {
-  width: 185rpx;
-  height: 185rpx;
+	box-sizing: border-box;
+  width: 184rpx;
+  height: 184rpx;
   overflow: hidden;
-  border: 2rpx solid rgb(236, 236, 236);
+  /* border: 2rpx solid rgb(236, 236, 236); */
 }
 
 .abs {
@@ -371,4 +470,119 @@ page {
 }
 .refund{
   margin-top: 20rpx;
-}
\ No newline at end of file
+}
+
+.tab-container {
+	display: flex;
+	justify-content: space-between;
+	text-align: center;
+	font-size: 28rpx;
+	border-bottom: 2rpx solid #f2f2f2;
+}
+.tab {
+	flex: 1;
+	line-height: 80rpx;
+	background-color: white;
+	position: relative;
+}
+.tab.active {
+	color: #FF3B3D;
+}
+.tab.active::after {
+	content: '';
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: 50%;
+	height: 2px;
+	margin: 0 auto;
+	background-color: #FF3B3D;
+}
+.search-container {
+	/* display: flex; */
+	padding: 10px;
+	background-color: white;
+}
+.search-input {
+	background-color: #f2f2f2;
+	flex: 1;
+	border-radius: 4px 0 0 4px;
+	height: 70rpx;
+	line-height: 70rpx;
+	font-size: 14px;
+	padding: 0 10px;
+}
+.search-btn {
+	color: white;
+	font-size: 14px;
+	background-color: #FF3B3D;
+	padding: 8px 20px;
+	border-radius: 0 4px 4px 0;
+}
+.picker-container {
+	padding-right: 10rpx;
+	align-items: center;
+	
+}
+.picker-date {
+	background-color: #f5f5f5;
+	flex: 1;
+	border-radius: 10rpx;
+}
+.picker {
+	color: #999;
+	text-align: center;
+	line-height: 70rpx;
+	font-size: 28rpx;
+}
+
+.list2 {
+	padding-left: 18rpx;
+	padding-right: 18rpx;
+}
+.title {
+	padding: 20rpx;
+	font-size: 28rpx;
+}
+.subtitle {
+	display: flex;
+	font-size: 26rpx;
+	justify-content: space-between;
+	background-color: #f0f0f0;
+	line-height: 60rpx;
+	padding: 0 20rpx;
+}
+.item {
+	background-color: white;
+	border-radius: 16rpx;
+	margin-top: 20rpx;
+}
+.subitem {
+	width: calc(100% / 3);
+	text-align: center;
+	font-size: 28rpx;
+}
+.name {
+	padding: 0 20rpx;
+	margin: 20rpx 0;
+	font-size: 30rpx;
+	word-break: break-all;
+	text-align: justify;
+}
+.key {
+	padding: 8rpx 0;
+	color: #999;
+}
+.val {
+	padding: 20rpx 0;
+	color: red;
+}
+
+.offline-container {
+	padding: 244rpx 20rpx 20rpx;
+}
+
+.search-btn2 {
+	border-radius-top-left: 8rpx;
+}
--
libgit2 0.21.4