From f605a106785bd585a0671bedee8731078c8baafa Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 30 Nov 2024 04:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E7=AB=AF-=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order_details/Order_details.vue           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/page_salesman_order/Order_details/Order_details.vue b/page_salesman_order/Order_details/Order_details.vue
index 69469bd..0792bc3 100644
--- a/page_salesman_order/Order_details/Order_details.vue
+++ b/page_salesman_order/Order_details/Order_details.vue
@@ -23,10 +23,17 @@
 					<div class="df jcsb">
 						<div class="connection-head">{{data.nickname}}<span>{{data.store_type}}</span></div>
 						<div class="df" @click="kehutiaozhuan(data.member_id)">
-							<div class="connection-Rearf" v-if="data.order_status_name=='待支付'">
-								{{data.order_status_name}}
-							</div>
-							<div class="connection-Rearf" v-else>{{data.pay_type_name}}</div>
+							<div class="connection-Rearf" v-if="data.pay.pay_status == 0">
+                {{ (data.pay.pay_status == 0 && data.pay.pay_money > 0 && data.pay.received_money > 0) ? '部分支付' : '未支付' }}
+              </div>
+							<div class="connection-Rearf" v-else-if="data.pay.pay_status == 1">支付中</div>
+              <div class="connection-Rearf" v-else-if="data.pay.pay_status == -1">已取消支付</div>
+              <div class="connection-Rearf" v-else>
+              <!--已经支付完毕展示支付方式-->
+                {{data.pay_type_name}}
+              </div>
+
+
 							<image style="width: 28rpx;height: 28rpx;margin: 36rpx 4rpx 0 4rpx;"
 								:src="$util.img(`/upload/weapp/user/you.png`)"></image>
 						</div>
@@ -121,10 +128,10 @@
 								@click="Collection">已确认</div>
 							<div v-else-if="data.sales_balance==0 &&data.order_status_name=='待支付'" @click="Collection">
 								待支付</div>
-							<div v-else-if="data.pay.pay_status == 1 ">已支付</div>
+							<div v-else-if="data.pay.pay_status == 1 ">支付中</div>
 							<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money == 0">未支付</div>
 							<div v-else-if="data.pay.pay_status == 0 && data.pay.received_money > 0">部分支付</div>
-							<div v-else-if="data.pay.sales_balance==0">已支付</div>
+							<div v-else-if="data.pay.pay_status==2">已支付</div>
 							<div v-else-if="data.order_status > 0 && data.sales_status == 0">已支付</div>
 							<div v-else>暂无收款记录</div>
 							<!-- <div v-if="data.sales_balance==1 && data.wait_status==2">已收款</div>