From 2a92106251a96712ebb2c879909eeb28c56f2d1e Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 12 Jan 2022 09:31:16 +0800
Subject: [PATCH] 订单列表增加卡项（暂时隐藏）

---
 pages/user/order_list/order_list.js   | 433 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
 pages/user/order_list/order_list.wxml | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 pages/user/order_list/order_list.wxss |   3 +++
 3 files changed, 551 insertions(+), 24 deletions(-)

diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 33661b6..c5058a1 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1,4 +1,5 @@
 const app = getApp();
+let self = null;
 var t = function(t) {
     return t && t.__esModule ? t : {
       default: t
@@ -36,6 +37,16 @@ Page({
       name: "待评价",
       id: 4
     }],
+		tab_serviceCard: [{
+      name: "全部",
+      id: 0,
+    },{
+      name: "待付款",
+      id: 1,
+    },{
+      name: "待评价",
+      id: 2,
+    }],
     activeCategoryId: 0,
     orderList: null,
     currentPage: 1,
@@ -50,6 +61,7 @@ Page({
 	
 	back_goods_arr:null,   //返回商品的列表
 		currentIndex: 0,
+		tabIndex: 0,
 		
 		startDate: '',
 		endDate: '',
@@ -60,11 +72,12 @@ Page({
 		is_no_data2: 0,
 		is_no_more2: 0,
 		
-		
+		cardList: [],
 		// 搜索内容
 		searchContent: '',
   },
   onLoad: function(t) {
+		self = this;
 		// 设置日期选择器的结束时间为当前日期
 		var now=new Date();
 		var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate(); 
@@ -329,6 +342,7 @@ Page({
                 wx.stopPullDownRefresh();
         }, null, {store_id: os.stoid, user_id: oo.user_id});
     },
+		
   //滑倒底部
   onReachBottom: function() {
 		if(this.data.currentIndex == 0) {
@@ -339,13 +353,23 @@ Page({
 			}
 			s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
 		} else {
-			this.request_list({
-			    store_id: os.stoid,
-			    user_id: oo.user_id,
+			if(this.data.currentIndex == 1) {
+				this.request_list({
+					store_id: os.stoid,
+					user_id: oo.user_id,
 					page: this.data.currentPage2,
-			  });
+				});
+			} else { // 卡项订单
+				this.request_list({
+					store_id: os.stoid,
+					user_id: oo.user_id,
+					page: this.data.currentPage2,
+				});
+			}
+			
 		}
   },
+	
   onPullDownRefresh: function(t) {
 		// sty取消
     // this.resetData(), this.requestOrderList(this.data.activeCategoryId);
@@ -1799,8 +1823,16 @@ Page({
 		// var req_data = {
 		// 	page:th.data.currentPage2
 		// }
-	
-		app.request.promiseGet("/api/weshop/order/pagePosOrder", {
+		let currentIndex = this.data.currentIndex;
+		let url = '';
+		if(currentIndex == 1) {
+			url = '/api/weshop/order/pagePosOrder';
+		};
+		if(currentIndex == 2) {
+			url = '/api/weshop/recharge/user/page';
+		};
+		
+		app.request.promiseGet(url, {
 			  data: data
 			}).then(res=>{
 			// 关闭加载状态
@@ -1812,9 +1844,20 @@ Page({
 					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});
+					let list= [];
+
+					if(currentIndex == 1) {
+						list = th.data.list2;
+						list = list.concat(data);
+						th.setData({list2:list});
+					};
+					if(currentIndex == 2) { // 卡项订单
+						list = th.data.cardList;
+						list = list.concat(data);
+						th.setData({cardList:list});
+						console.log('currentCard', list);
+					};
+					
 				} else {
 					if(th.data.currentPage2==1){
 						th.setData({is_no_data2:1});
@@ -1839,7 +1882,7 @@ Page({
 		this.setData({
 			currentIndex: currentIndex
 		});
-		console.log(this.data.currentIndex);
+		
 		this.setData({
 			is_no_data2: 0,
 			is_no_more2: 0,
@@ -1852,7 +1895,8 @@ Page({
 				startDate: '选择开始时间',
 				endDate: '选择结束时间',
 			});--*/
-		} else if(currentIndex == 1) {
+		};
+		if(currentIndex == 1) {
 			console.log('线下订单');			
 			this.request_list({
 			    store_id: os.stoid,
@@ -1862,6 +1906,43 @@ Page({
 					EndDate: this.data.endDate
 			  });
 		};
+		if(currentIndex == 2) {
+			console.log('卡项订单');
+			// this.setData({
+			// 	orderList: null,
+			// });
+			// 默认请求全部卡项订单
+			this.request_list({
+			    store_id: os.stoid,
+			    user_id: oo.user_id,
+			 });
+			// let url = '/api/weshop/recharge/user/page';
+			// let data = {
+			// 	store_id: os.stoid,
+			// 	user_id: oo.user_id,
+			// };
+			// app.promiseGet(url, {
+			// 	data: data,
+			// }).then(res => {
+			// 	if(res.data.code == 0) {
+			// 		console.log('卡项订单请求成功', res);
+			// 		this.setData({
+			// 			orderList: res.data.data.pageData,
+			// 		});
+			// 	} else {
+			// 		throw(res);
+			// 	};
+			// }).catch(err => {
+			// 	console.log('卡项订单请求失败', err);
+			// 	this.setData({
+			// 		orderList: null,
+			// 	});
+			// 	wx.showToast({
+			// 		title: err.data.data,
+			// 		icon: 'error',
+			// 	});
+			// });
+		};
 	},
 	
 	bindDateChange1: function(e) {
@@ -1883,10 +1964,46 @@ Page({
 	},
 	
 	searchOnline() {
-		console.log('online',this.data.searchContent);
+		let currentIndex = this.data.currentIndex;
+		console.log('online',this.data.searchContent, currentIndex);
 		if(this.data.searchContent) {
 			console.log(this.data.searchContent);
-			this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+			if(currentIndex == 0) {
+				this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+			};
+			if(currentIndex == 2) { // 卡项订单
+				let url = '/api/weshop/recharge/user/page';
+				let data = {
+					store_id: os.stoid,
+					user_id: oo.user_id,
+					keyWord: this.data.searchContent,
+				};
+				this.setData({
+					tabIndex: 0,
+				});
+				// 请求数据
+				app.promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if(res.data.code == 0) {
+						// console.log('卡项订单请求成功', res);
+						this.setData({
+							cardList: res.data.data,
+						});
+					} else {
+						throw(res);
+					};
+				}).catch(err => {
+					// console.log('卡项订单请求失败', err);
+					this.setData({
+						cardList: null,
+					});
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+			};
 		} else {
 			wx.showToast({
 				title: '您还没有输入搜索内容~',
@@ -1980,10 +2097,290 @@ Page({
 		})
 	},
 
-    go_url(e){
-       var url=e.currentTarget.dataset.url;
-       getApp().goto(url);
-    }
+	go_url(e){
+		 var url=e.currentTarget.dataset.url;
+		 getApp().goto(url);
+	},
+	
+	// 点击卡项订单二级tabbar
+	clickTab(e) {
+		console.log('服务卡项index', e.target.dataset.index);
+		let currentIndex = e.target.dataset.index;
+		
+		let url = '/api/weshop/recharge/user/page';
+		let data = {
+			store_id: os.stoid,
+			user_id: oo.user_id,
+		};
+		this.setData({
+			tabIndex: currentIndex,
+			is_no_data2: 0,
+			is_no_more2: 0,
+			cardList: [],
+		});
+		
+		
+		switch(currentIndex) {
+			case 0: { // 全部
+				delete data.order_status;
+				break;
+			};
+			case 1: { // 待支付
+				data.order_status = 0;
+				break;
+			};
+			case 2: { // 待评价
+				data.order_status = 1;
+				break;
+			};
+		};
+		// 请求数据
+		this.request_list(data);
+		
+		// app.promiseGet(url, {
+		// 	data: data,
+		// }).then(res => {
+		// 	if(res.data.code == 0) {
+		// 		console.log('卡项订单请求成功', res);
+		// 		this.setData({
+		// 			orderList: res.data.data.pageData,
+		// 		});
+		// 	} else {
+		// 		throw(res);
+		// 	};
+		// }).catch(err => {
+		// 	console.log('卡项订单请求失败', err);
+		// 	this.setData({
+		// 		orderList: null,
+		// 	});
+		// 	wx.showToast({
+		// 		title: err.data.data,
+		// 		icon: 'error',
+		// 	});
+		// });
+	},
+	
+	// 卡项订单 - 查看详情
+	viewDetails() {
+		let url = '/packageA/pages/details_serviceCard/details_serviceCard';
+		app.goto(url);
+	},
+	
+	// 卡项订单 - 立即支付
+	pay(e) {
+		let index = e.currentTarget.dataset.index;
+		let item = this.data.cardList[index];
+		let order_sn = item.order_sn;
+		let store_id = app.globalData.setting.stoid;
+		console.log('go1!!!!!!!!!!!!!!!!!!!!!!!!!',index,item,order_sn,store_id);
+	
+		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
+			data: {
+				parentSn: order_sn,
+				store_id: store_id,
+			},
+	
+			success: function(res) {
+				var n = res.data.data;
+				self.weixinPay(n, function() {
+					app.showWarning('支付成功');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/pages/user/my_service/i_service',
+					// 	})
+					// }, 1000)
+				}, function() {
+					app.showWarning('支付失败');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/packageA/pages/cardList/cardList',
+					// 	})
+					// }, 1000)
+				});
+			}
+		})
+	},
+	
+	//------调起支付框--------
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
+	},
+	
+	// 卡项订单 - 取消订单
+	// api/weshop/recharge/update?store_id=&order_id=&order_status=3
+	cancle(e) {
+		wx.showModal({
+		  title: '提示',
+		  content: '确定取消订单吗？',
+		  success (res) {
+		    if (res.confirm) {
+					console.log('取消订单~');
+					let order_id = e.currentTarget.dataset.orderid;
+					let order_sn = e.currentTarget.dataset.ordersn;
+					app.request.put('/api/weshop/recharge/update', {
+					  data: {
+							store_id: os.stoid,
+							order_id: order_id,
+							order_sn: order_sn,
+							order_status: 3,
+						},
+					  success: function(res) {
+							wx.showToast({
+								title: '取消成功',
+								success: function() {
+									
+									// 这里还可以优化不刷新，后面有时间再优化
+									self.setData({
+										is_no_data2: 0,
+										is_no_more2: 0,
+									});
+									
+									// 这里还可以优化不刷新，后面有时间再优化
+									self.clickTab(e);
+								},
+							});
+							
+							// let index = e.currentTarget.dataset.index;
+							// let cardList = self.data.cardList;
+							// cardList.splice(index, 1);
+							// self.setData({
+							// 	cardList,
+							// });
+							
+							//self.request_list(self.data.currentRequestData);
+					  },
+					})
+		    } else if (res.cancel) {
+		      console.log('用户点击取消');
+		    }
+		  }
+		});
+	},
+	
+	
+	// 卡项订单 - 再来一单
+	addCart: function(t) {
+	  var th = this;
+	  var ind = t.currentTarget.dataset.openSpecModal_ind;
+	  var action= t.currentTarget.dataset.action;
+	  if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
+	  
+	th.setData({
+	    open_ind_store: ind
+	  });
+	
+	if(!th.data.sto_sele_name){
+	      getApp().my_warnning('请选择门店', 1, th, 450);
+	      return false;
+	  }
+	
+	
+	if(action=="buy"){
+		//--------------此时操作的数据------------
+		var newd = {
+		  id: th.data.data.id,
+		  goods_num: th.data.goodsInputNum,
+		  pick_id: th.data.sto_sele_id,		
+		  keyid: th.data.sto_sele_keyid,		
+		};	  
+		newd['pick_name'] = th.data.sto_sele_name;		
+		newd['guide_id'] = getApp().globalData.guide_id;
+		newd['guide_type']=0;
+		th.buyNow(newd);
+	}else{
+	
+	      var newd = {
+	          service_id: th.data.data.id,
+	          service_sn:th.data.data.service_sn,
+	          service_name:th.data.data.goods_name,
+	          goods_num: th.data.goodsInputNum,
+	          pick_id: th.data.sto_sele_id,
+	          user_id:oo.user_id,
+	          store_id:os.stoid,
+	          money:th.data.data.shop_price
+	      };
+	      if(getApp().globalData.guide_id){
+	          newd['guide_id'] = getApp().globalData.guide_id;
+	          newd['guide_type']=0;
+	      }
+	
+	      //----先看会员在购物车中是否加入了该商品-----
+	      getApp().request.get("/api/weshop/cartService/page", {
+	          data: {
+	              store_id: os.stoid,
+	              user_id: oo.user_id,
+	              service_id: th.data.data.id,
+	              pick_id: th.data.sto_sele_id,
+	          },
+	          success: function(re) {
+	
+	              //-------如果购物车中有相关的数据---------
+	              if (re.data.data.total > 0) {
+	                  var item = re.data.data.pageData[0];
+	                  var updata = {
+	                      id: item.id,
+	                      goods_num: th.data.goodsInputNum + item.goods_num,
+	                      money: th.data.data.shop_price,
+	                      store_id: os.stoid,
+	                  };
+	
+	                  if (getApp().globalData.guide_id) {
+	                      updata['guide_id'] = getApp().globalData.guide_id;
+	                      updata['guide_type'] = 1;
+	                  }
+	                  getApp().request.put("/api/weshop/cartService/update", {
+	                      data: updata,
+	                      success: function(t) {
+	                          getApp().my_warnning('加入购物车成功', 1, th, 450);
+	                          var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+	                          th.setData({
+	                              cartGoodsNum: c_num
+	                          });
+	                          th.closeSpecModal();
+	                      }
+	                  });
+	              } else {
+	
+	                  getApp().request.post("/api/weshop/cartService/save", {
+	                      data: newd,
+	                      success: function(t) {
+	                          getApp().my_warnning('加入购物车成功', 1, th, 450);
+	                          var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+	                          th.setData({
+	                              cartGoodsNum: c_num
+	                          });
+	                          th.closeSpecModal();
+	                      }
+	                  });
+	              }
+	          }
+	      });
+	
+	  }
+	},
+	
+	
+	
   
   
 });
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 9bc26c9..f5230d8 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,13 +1,20 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+
 <view class="container">
+		<!-- 一级tabbar -->
 		<view class="tab-container" bindtap="onClickTab">
 			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0"><text class="iconfont icon-cloud"></text>线上订单</view>
+			<view class="tab {{currentIndex == 2 ? 'active':''}}" data-index="2" style="display: none;"><text class="iconfont icon-bankcard"></text>卡项订单</view>
 			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1"><text class="iconfont icon-shop"></text>线下订单</view>
 		</view>
-		<view class="search-container flex" wx:if="{{currentIndex == 0}}">
+		
+		<!-- 搜索框 -->
+		<view class="search-container flex" wx:if="{{currentIndex != 1 }}">
 			<input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput" placeholder-style="color:#ccc;"/>
 			<view class="search-btn" bindtap="searchOnline">搜索</view>
 		</view>
+		
+		<!-- 二级tabbar - 线上订单 -->
 		<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':''}}">
@@ -15,6 +22,8 @@
 		    </view>
 		  </view>
 		</view>
+		
+		<!-- 二级tabbar - 线下订单 -->
 		<view class="search-container" wx:if="{{currentIndex == 1}}">
 			<view class="flex jc_sb">
 				<view class="picker-container flex f1">
@@ -30,7 +39,17 @@
 			</view>
 			<view class="fs24 c-9 pdt20">注：读取时段内近10笔记录</view>
 		</view>
+		
+		<!-- 二级tabbar - 卡项订单 -->
+		<view class="type-navbar fs28" wx:if="{{currentIndex == 2}}">
+		  <view class="type-box flex-center f1" wx:for="{{tab_serviceCard}}" wx:key="{{index}}">
+		    <view data-index="{{index}}" bindtap="clickTab" class="type-navbar-item {{tabIndex ==index?'type-item-on':''}}">
+		      {{item.name}}
+		    </view>
+		  </view>
+		</view>
 </view>
+
 <!-- 线上订单 -->
 <view class="list-container" wx:if="{{currentIndex == 0}}">
 	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
@@ -260,8 +279,115 @@
 	  </view>
 	</view>
 </view>
+
+<!-- 服务卡项 -->
+<!-- 订单状态:0=未付款 1=已付款、待评价  2已评价、完成 3已取消   5作废 -->
+<view class="list-container" wx:elif="{{currentIndex == 2}}">
+	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{cardList}}" wx:key="{{item}}">
+	  <!-- 商品编号和状态 -->
+	  <view class="Commodity_number flex-vertical-between fs24 padding border_bottom">
+	    <!--商品编号 -->
+	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
+	    <!-- 订单状态 -->
+	    <view class="flex-center c-r">
+				<view wx:if="{{item.order_status == 0}}">待支付</view>
+				<view wx:if="{{item.order_status == 1}}">待评价</view>
+				<view wx:if="{{item.order_status == 2}}">已评价</view>
+				<view wx:if="{{item.order_status == 3}}" class="c-a9">已取消</view>
+				<view wx:if="{{item.order_status == 5}}">已作废</view>
+	    </view>
+	  </view>
+	
+	  <!-- 商品详情集合 -->
+	  <view class="detail_commoditys">
+	    <!-- 单个商品 -->
+	    <view>
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">
+	        <!-- 商品图片 -->
+	        <navigator class="rel">
+	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
+	          <!-- <view class="abs flex-center fs26">服务卡</view> -->
+	        </navigator>
+	        <!-- 商品内容 -->
+	        <view class="Commodity_content">
+	          <view class="Commodity_goods">
+	            <!-- 商品名称 -->
+	            <view class="goods_name ellipsis-2 fs26">{{goods.service_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>
+	          </view>
+	          <!-- 商品价格数量 -->
+	          <view class="Commodity_money flex-vertical-between baseline">
+	            <!-- 商品价格 -->
+	            <view class="flex-vertical c-tb baseline">
+	              <view class="fs24">￥</view>
+								<!-- 幸运购prom_type等于9 -->
+								<!-- 如果是幸运购就显示幸运购参团价格 -->
+								<view class="fs26">{{filters.toFix(goods.price,2)}}</view>
+	              <!-- <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}} <text wx:if="{{goods.prom_type==10}}">({{goods.ladder_discount}}折)</text> </view> -->
+	            </view>
+	            <view class="fs26 c-a9">x{{goods.qty}}</view>
+	          </view>
+	        </view>
+	      </navigator>
+	      <!-- 去评价 -->
+	      <view class="commodity_evaluate jc_sb baseline fs26">
+	        <!-- 商品数量 -->
+	        <view class="commodity_smy fs24">
+	          <view class="order-total">
+	            <view>
+	              共{{filters.count(item.list)}}件商品
+	            </view>
+	            <view class="goods-total flex">
+	              <block>
+	                <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 c-r">￥</view>
+	                  <view class="c-r">{{filters.toFix(item.account,2)}}
+	                  </view>
+	
+	                </view>
+	              </block>
+								
+	            </view>
+	          </view>
+	        </view>
+					
+	        <view class="links flex-right-vertical fs24 padding">
+	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+	          <view bindtap="cancle" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{tabIndex}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" wx:if="{{(item.order_status==0)}}" data-index="{{tabIndex}}">取消订单</view>
+
+	      
+				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator>	
+
+
+				<block wx:if="{{item.order_status==1}}">
+					<navigator wx:if="{{item.list.length > 1}}"  class="order-btn white bg-orange"
+										 url="/packageB/pages/user/comment/comment?card=1&status=0&order_id={{item.list[index].order_id}}">评价</navigator>
+					<navigator wx:else  class="order-btn white bg-orange"
+										 url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.list[0].card_id}}&order_id={{item.list[0].order_id}}&price={{item.list[0].price}}">评价</navigator>
+				</block>
+
+	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="pay" data-index="{{index}}" wx:if="{{item.order_status==0}}">立即支付</navigator>
+			  
+
+
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	</view>
+</view>
+
 <!-- 线下订单 -->
-<view class="offline-container" wx:else>
+<view class="offline-container" wx:elif="{{currentIndex == 1}}">
 		<view class="offline-list">
 			<view class="item" wx:for="{{list2}}">
 				<view class="title">
@@ -295,14 +421,14 @@
 
 
 <!-- 没有数据 -->
-<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="After_all flex-center" wx:if="{{(iscodeall==1 && orderList.length>1 && currentIndex ==0) || (is_no_more2 && currentIndex == 1) || (is_no_more2 && currentIndex == 2)}}">
+  <!-- <view class="Line"></view> -->
   <view class="end fs26 xc-black">——— 到底了 ———</view>
-  <view class="Line"></view>
+  <!-- <view class="Line"></view> -->
 </view>
 
 <!-- 无订单 -->
-<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1)}}">
+<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1) || (cardList.length == 0 && currentIndex == 2)}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>
@@ -313,5 +439,6 @@
     </navigator>
   </view>
 </view>
+
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index 0fabe65..8ba96b0 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -617,5 +617,8 @@ page {
 	border-bottom-left-radius: 8rpx;
 }
 
+.bg-orange {
+	background-color: #ff9000;
+}
 
 
--
libgit2 0.21.4