From 82e73b91b07d6aff0534a4c839e9faa264a14bea Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 7 Dec 2024 20:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tobe_shipped/Tobe_shipped.vue               | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/page_salesman_index/Tobe_shipped/Tobe_shipped.vue b/page_salesman_index/Tobe_shipped/Tobe_shipped.vue
index 59b855c..9b8347f 100644
--- a/page_salesman_index/Tobe_shipped/Tobe_shipped.vue
+++ b/page_salesman_index/Tobe_shipped/Tobe_shipped.vue
@@ -105,11 +105,17 @@
 					<div class="df jcsb" @click="Collection">
 						<div>收款记录</div>
 						<div class="df">
-							<div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>
-							<div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>
-							<div v-else-if="data.sales_balance==0">已支付</div>
-							<div v-else>暂无收款记录</div>
-							<image style="width: 28rpx;height: 28rpx;margin: 10rpx 0rpx;"
+<!--							<div v-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==1">待确认</div>-->
+<!--							<div v-else-if="data.wait_status==1 && data.sales_balance==1 &&data.wait_status==2">已确认</div>-->
+<!--							<div v-else-if="data.sales_balance==0">已支付</div>-->
+<!--							<div v-else>暂无收款记录</div>-->
+
+              <div v-if="!(data.pay || false)">暂无收款记录{{data.pay.pay_status}}</div>
+              <div v-else-if="data.pay.pay_status == 2">已支付</div>
+              <div v-else-if="data.pay.pay_status == 0 && data.pay.pay_money > 0 && data.pay.received_money > 0">部分支付</div>
+              <div v-else>未支付</div>
+
+              <image style="width: 28rpx;height: 28rpx;margin: 10rpx 0rpx;"
 								:src="$util.img(`/upload/weapp/user/you.png`)"></image>
 						</div>
 					</div>
@@ -358,6 +364,7 @@
 				},
 				success: res => {
 					this.data = res.data
+          console.log('xxx',res.data);
 					for (var i = 0; i < this.data.order_goods.length; i++) {
 						this.data.order_goods[i].const = false
 						// console.log(this.data.order_goods,'待发货');