From 0ba290c3a9689a93fea90a928748cddad8f39e11 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 23 Mar 2021 15:01:41 +0800
Subject: [PATCH] 订单列表中组团中的bug优化

---
 pages/user/order_detail/order_detail.js | 3 +++
 pages/user/order_list/order_list.wxml   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index ff7a268..8b54dca 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -95,6 +95,9 @@ Page({
                    r.order_status_detail = "已作废";
                 if (r.order_status == 6)
                   r.order_status_detail = "退款完成";
+				if (r.pt_status == 1 && r.pt_prom_id>0)
+				  r.order_status_detail = "组团中";  
+				 
 
               r['is_all_return'] = 0;
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index c7aab13..fa867eb 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -41,7 +41,7 @@
 	    <!-- 商品评价状态 -->
 	    <view class="flex-center c-r">
 	      <!-- 订单状态 -->
-	      <view wx:if="{{item.pt_status==1}}">组团中</view>
+	      <view wx:if="{{item.pt_status==1 && item.pt_prom_id>0}}">组团中</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>
--
libgit2 0.21.4