From de8ca96edc5869d6a9a899bb72d42c9bf6448422 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 9 Dec 2024 18:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=91=98=E7=AB=AF-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=91=98=E4=BF=AE=E6=94=B9"?=
 =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E6=94=B6=E6=AC=BE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?"=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_salesman_index/index/beconfirmed.vue             |  4 ++++
 page_salesman_order/Goods_received/Goods_received.vue | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/page_salesman_index/index/beconfirmed.vue b/page_salesman_index/index/beconfirmed.vue
index 9aca879..b8f75c6 100644
--- a/page_salesman_index/index/beconfirmed.vue
+++ b/page_salesman_index/index/beconfirmed.vue
@@ -32,6 +32,10 @@
 			<view class="list-time">
 				下单时间<span>{{item.create_time | time}}</span><span>{{item.time}}</span>
 			</view>
+      <view class="list-time">
+        支付状态<span>{{item.pay_status_name}}</span>
+        <span v-if="item.pay.pay_money > 0">剩余未支付金额{{item.pay.pay_money}}</span>
+      </view>
 			<view class="list-money">
 				合计{{item.goods_num}}件商品，
 				<span v-if="item.sales_money>0">订单金额￥{{item.sales_money}}</span>
diff --git a/page_salesman_order/Goods_received/Goods_received.vue b/page_salesman_order/Goods_received/Goods_received.vue
index beaec7f..4263d72 100644
--- a/page_salesman_order/Goods_received/Goods_received.vue
+++ b/page_salesman_order/Goods_received/Goods_received.vue
@@ -99,9 +99,14 @@
 			<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-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-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.pay_money > 0 && data.pay.received_money > 0">部分支付</div>
+          <div v-else-if="data.pay.pay_status==2">已支付</div>
 					<div v-else>暂无收款记录</div>
 					<image style="width: 28rpx;height: 28rpx;margin: 10rpx 0rpx;"
 						:src="$util.img(`/upload/weapp/user/you.png`)"></image>