From 674beb60b6b7147dae0ce0e22fc7be01a08f8fb1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 3 Jun 2023 11:33:34 +0800
Subject: [PATCH] 服务卡项的订单详情

---
 packageA/pages/details_serviceCard/details_serviceCard.js   |  6 +++++-
 packageA/pages/details_serviceCard/details_serviceCard.wxml | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index d8ea6ed..be73ad2 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -70,8 +70,12 @@ Page({
 				}).then(res => {
 					if (res.data.code == 0) {
 						// console.log('请求成功', res);
+						var dd=res.data.data.pageData[0];
+						dd.prom_type=dd.list[0].prom_type;
+						dd.pt_status=dd.list[0].pt_status;
+
 						this.setData({
-							details: res.data.data.pageData[0],
+							details: dd,
 						});
 					} else {
 						throw (res);
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index 71e61af..b86e499 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -8,8 +8,17 @@
 				<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
 				<!-- 订单状态 -->
 				<block>
-					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>
-					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status<2 && details.pay_status==0 }}">
+						<block wx:if="{{details.prom_type==6}}">
+							<block wx:if="{{details.pt_status==0}}" >未支付</block>
+							<block wx:if="{{details.pt_status==1}}" >组团中</block>
+							<block wx:if="{{details.pt_status==2 && details.pt_tail_money>0}}">待支付尾款</block>
+						</block>
+						<block wx:else>
+							待支付
+						</block>
+					</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1 && details.pay_status==1}}">待评价</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
 					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
@@ -68,14 +77,20 @@
 	</view>
 	
 	<!-- 底部按钮栏 -->
-	<view class="btn-bar t-r bg-white pd20">
+	<view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
 		<!-- 待支付 -->
-		<block wx:if="{{details.order_status == 0}}">
+		<block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
 			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
 		</block>
+
+		<block wx:if="{{details.pt_status == 0 && details.order_status<2 && details.prom_type==6  }}">
+			<text class="btn btn-border" bindtap="cancle">取消订单</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+		</block>
+
 		<!-- 已支付/未评价 -->
-		<block wx:if="{{details.order_status == 1}}">
+		<block wx:if="{{details.order_status == 1 && details.pay_status == 1 }}">
 			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
 			<text class="btn bg-red white mgl20" bindtap="access">立即评价</text>
 		</block>
--
libgit2 0.21.4