From f7150998eaaaf27f0d4c8415fe7efba98ff430b0 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 9 Dec 2024 19:36:46 +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=BEtab"=E6=94=B9?=
 =?UTF-8?q?=E6=88=90"=E5=BE=85=E6=94=B6=E6=AC=BE"=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_salesman_index/index/beconfirmed.vue           | 2 +-
 page_salesman_index/index/bereceived.vue            | 2 +-
 page_salesman_index/index/received.vue              | 2 +-
 page_salesman_index/index/reviewed.vue              | 2 +-
 page_salesman_index/index/shipped.vue               | 2 +-
 page_salesman_order/Order_details/Order_details.vue | 4 ++--
 page_salesman_order/index/index.vue                 | 3 ++-
 page_salesman_order/undgbm/undgbm.vue               | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/page_salesman_index/index/beconfirmed.vue b/page_salesman_index/index/beconfirmed.vue
index b8f75c6..cb120c9 100644
--- a/page_salesman_index/index/beconfirmed.vue
+++ b/page_salesman_index/index/beconfirmed.vue
@@ -253,7 +253,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;
diff --git a/page_salesman_index/index/bereceived.vue b/page_salesman_index/index/bereceived.vue
index ba22d4f..9bd7a1c 100644
--- a/page_salesman_index/index/bereceived.vue
+++ b/page_salesman_index/index/bereceived.vue
@@ -256,7 +256,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;
diff --git a/page_salesman_index/index/received.vue b/page_salesman_index/index/received.vue
index 025cd4c..625a490 100644
--- a/page_salesman_index/index/received.vue
+++ b/page_salesman_index/index/received.vue
@@ -262,7 +262,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;
diff --git a/page_salesman_index/index/reviewed.vue b/page_salesman_index/index/reviewed.vue
index a727e09..eeac09f 100644
--- a/page_salesman_index/index/reviewed.vue
+++ b/page_salesman_index/index/reviewed.vue
@@ -344,7 +344,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;
diff --git a/page_salesman_index/index/shipped.vue b/page_salesman_index/index/shipped.vue
index 6a7dc06..4b4b267 100644
--- a/page_salesman_index/index/shipped.vue
+++ b/page_salesman_index/index/shipped.vue
@@ -298,7 +298,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;
diff --git a/page_salesman_order/Order_details/Order_details.vue b/page_salesman_order/Order_details/Order_details.vue
index 64e0226..9fafd3f 100644
--- a/page_salesman_order/Order_details/Order_details.vue
+++ b/page_salesman_order/Order_details/Order_details.vue
@@ -437,7 +437,7 @@
 					},
 					{
 						id: 2,
-						name: '驳回'
+						name: '反审核'
 					}
 				],
 				isRadio: 0,
@@ -1203,7 +1203,7 @@
 						}
 					})
 				} else if (this.itemid == 2) {
-					//驳回
+					//驳回(反审核)
 					if (this.cause.length == 0) {
 						this.$util.showToast({
 							title: '请填写驳回原因'
diff --git a/page_salesman_order/index/index.vue b/page_salesman_order/index/index.vue
index 747558e..10c804f 100644
--- a/page_salesman_order/index/index.vue
+++ b/page_salesman_order/index/index.vue
@@ -134,7 +134,8 @@
             name: '已收货'
           },
           {
-            name: '待确认收款'
+            //name: '待确认收款'
+            name: '待收款'
           },
           {
             name: '已关闭'
diff --git a/page_salesman_order/undgbm/undgbm.vue b/page_salesman_order/undgbm/undgbm.vue
index ad488ee..ef22130 100644
--- a/page_salesman_order/undgbm/undgbm.vue
+++ b/page_salesman_order/undgbm/undgbm.vue
@@ -302,7 +302,7 @@
 	.list {
 		margin: 42rpx 24rpx 0 24rpx;
 		width: 702rpx;
-		height: 424rpx;
+		//height: 424rpx;
 		background: #FFFFFF;
 		border-radius: 24rpx;
 		// padding: 32rpx;