From b82ff51d22499f84af2a7e1e4bba816ee834a052 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 1 Jun 2023 10:50:05 +0800
Subject: [PATCH] 1、拼团的订单列表的优化 2、拼团商品的优化

---
 packageA/pages/goodsInfo/filter.wxs     | 14 +++++++++++++-
 packageA/pages/goodsInfo/goodsInfo.js   |  4 ++--
 packageA/pages/goodsInfo/goodsInfo.wxml | 19 ++++++++++++++++---
 pages/user/order_list/order_list.js     | 17 ++++++++++-------
 pages/user/order_list/order_list.wxml   | 54 ++++++++++++++++++++++++++++++++++++++----------------
 5 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/packageA/pages/goodsInfo/filter.wxs b/packageA/pages/goodsInfo/filter.wxs
index 5c5f0a2..c2fae18 100644
--- a/packageA/pages/goodsInfo/filter.wxs
+++ b/packageA/pages/goodsInfo/filter.wxs
@@ -8,7 +8,19 @@ function format_tt(ts) {
            var fm=(d.getMonth()+1)+"月"+ d.getDate()+"日";
            return fm;
 }
+
+//拿来判断是不是在指定门店内
+function is_no_dis(text,val){
+    if(text==undefined) return false;
+    if(text=='') return false;
+    if(!text) return false;
+
+    if(text.indexOf(val)==-1) return true;
+    return false;
+}
+
 module.exports = {
   is_has: is_has,
-  format_tt:format_tt
+  format_tt:format_tt,
+  is_no_dis:is_no_dis
 }
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 3c956b7..d90e6d7 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -1714,7 +1714,7 @@ Page({
             }
             e.his_cate_num=his_cate_num;
 
-			//--普通门店排版--
+            //--普通门店排版,服务卡项有指定门店才能使用，所以要筛选一下--
 			setTimeout(function(){			
 			  var sto_list=th.data.data.storageId;
 			  if(sto_list){
@@ -1922,7 +1922,7 @@ Page({
             });
             //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
             if (!th.data.def_pick_store) {
-              th.setData({def_pick_store:e.data.data.pageData[0]})
+               th.setData({def_pick_store:e.data.data.pageData[0]})
             }
 
           }
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index abf7f1b..e0858a4 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -820,7 +820,12 @@
 								<view class="address-frame xc-ash">
 									<view class="flex-vertical-between butttem5">
 										<view class="flex xc-ash">
-											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+
+											</view>
 										</view>
 										<view>
 											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
@@ -846,7 +851,11 @@
 								<view class="address-frame xc-ash">
 									<view class="flex-vertical-between ">
 										<view class="flex xc-ash">
-											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+											<view class="fs30 xc-black3 address_name">{{item.pickup_name}}
+												<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+													<text class="no_store">(配送不匹配)</text>
+												</block>
+											</view>
 										</view>
 										<view>
 											<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
@@ -874,7 +883,11 @@
 							<view class="address-frame xc-ash">
 								<view class="flex-vertical-between ">
 									<view class="flex xc-ash">
-										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
+										<view class="fs28 xc-black3 address_name">{{item.pickup_name}}
+											<block wx:if="{{tool.is_no_dis(sele_g.storageId,item.keyid)}}">
+												<text class="no_store">(配送不匹配)</text>
+											</block>
+										</view>
 									</view>
 									<view>
 										<view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 7553b06..30c27b3 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -2134,7 +2134,15 @@ Page({
           };
           if (currentIndex == 2) { // 卡项订单
             list = th.data.cardList;
-            list = list.concat(data);
+            var new_data= data.map((item,index)=>{
+                 item.pt_status=item.list[0].pt_status;
+                 item.pt_tail_money=item.list[0].pt_tail_money;
+                 item.prom_id=item.list[0].prom_id;
+                 item.prom_type=item.list[0].prom_type;
+                 return item;
+            })
+
+            list = list.concat(new_data);
             th.setData({ cardList: list });
             console.log('currentCard', list);
           };
@@ -2716,12 +2724,7 @@ Page({
                 },
               });
 
-              // let index = e.currentTarget.dataset.index;
-              // let cardList = self.data.cardList;
-              // cardList.splice(index, 1);
-              // self.setData({
-              // 	cardList,
-              // });
+
 
               //self.request_list(self.data.currentRequestData);
             },
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index f338b31..d417ce1 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -307,19 +307,36 @@
 	    <!--商品编号 -->
 	    <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}}" class="flex-center">待评价 <view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"  ></image>
-        </view>
-				<view wx:if="{{item.order_status == 2}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
-        </view>
-				<view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
-        </view>
-				<view wx:if="{{item.order_status == 5}}">已作废</view>
-	    </view>
+		  <view class="flex-center c-r">
+			  <view wx:if="{{item.pay_status == 0}}">
+				  <block wx:if="{{item.prom_type==6}}">
+					  <block wx:if="{{item.pt_status==0}}" >未支付</block>
+					  <block wx:if="{{item.pt_status==1}}" >组团中</block>
+					  <block wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">待支付尾款</block>
+				  </block>
+				  <block wx:else>
+					  待支付
+				  </block>
+			  </view>
+			  <view wx:if="{{item.order_status == 1 && item.pay_status==1}}" class="flex-center">待评价
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"
+						 data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}">
+
+				  </image>
+			  </view>
+			  <view wx:if="{{item.order_status == 2}}" class="flex-center">已评价
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}"
+						 data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"></image>
+			  </view>
+			  <view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消
+				  <view class="lin"></view>
+				  <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}"
+						 data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"></image>
+			  </view>
+			  <view wx:if="{{item.order_status == 5}}">已作废</view>
+		  </view>
 	  </view>
 	
 	  <!-- 商品详情集合 -->
@@ -330,7 +347,8 @@
 	        <!-- 商品图片 -->
 	        <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> -->
+				<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">
@@ -392,14 +410,18 @@
 				<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}}">
+				<block wx:if="{{item.order_status==1 && item.pay_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>
+				<navigator class="commodity_To_evaluate flex-level comment_go"
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.pay_status==0}}">立即支付</navigator>
+
+				<navigator class="commodity_To_evaluate flex-level comment_go"
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0}}">立即支付</navigator>
 			  
 
 
--
libgit2 0.21.4