From 7d2d2eb6e0ba4312f63a04f0c7b415a7e01383ea Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 16 Dec 2022 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=BD=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css            | 1 -
 pages/ProductManage/ZjDelivery.vue | 2 +-
 utils/getData2.js                  | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 9bf72a8..45da19a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -291,7 +291,6 @@ uni-button:after {
 	border-radius: 4px;
 	border: 1px solid #ebeef5;
 	box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-	overflow: hidden;
 	backface-visibility: hidden;
 }
 
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index b56ba06..2308b40 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -221,7 +221,7 @@
 					return
 				}
 				try {
-					let res = await returnVehicle(this.val3)
+					let res = await returnVehicle(this.val3, this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/utils/getData2.js b/utils/getData2.js
index f4adc6a..320e577 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -177,10 +177,11 @@ export const shippingConfirm = (rows, code, vcode) => request({
 	}
 })
 // 1.4载具送回
-export const returnVehicle = (code) => request({
+export const returnVehicle = (code, vcode) => request({
 	url:'api/pda/shipping/returnVehicle',
 	data: {
-		point_code: code
+		point_code: code,
+		vehicle_code: vcode
 	}
 })
 // 1.5配送校验