From 735e91b8b2ed545cbb74cdd8fc082a9de5a05aee Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 21 Mar 2024 16:44:52 +0800
Subject: [PATCH] 1

---
 api/admin.js                    |  2 +-
 pages/admin/orderList/index.vue | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/api/admin.js b/api/admin.js
index ed0e588..9b5958a 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -14,7 +14,7 @@ import request from "@/utils/request.js";
  * @returns {*}
  */
 export function delivery(data) {
-	return request.post(`admin/${data.mer_id}/delivery/${data.delivery_id}`, data);
+	return request.post(`admin/${data.mer_id}/delivery/${data.order_id}`, data);
 }
 
 /**
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index ccc173d..4a9f34b 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -214,9 +214,8 @@
 			<view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
 		</view>
 
-
 		<view class="form-wrap" v-if="popUpShow"
-			style="position: fixed;top: 0;left: 0;width:100vw;height:100vh;background:rgba(0,0,0,.8);display: flex;align-items: center;justify-content: center;">
+			style="position: fixed;z-index: 11; top: 0;left: 0;width:100vw;height:100vh;background:rgba(0,0,0,.4);display: flex;align-items: center;justify-content: center;">
 			<view class="form">
 				<view class="form-item">
 					<view class="form-item-label">送货人姓名</view>
@@ -534,6 +533,9 @@
 				})
 
 				if (!uni.$u.test.mobile(this.deliveryForm.delivery_id)) {
+
+					console.log(3123123);
+
 					return uni.showToast({
 						title: "手机号输入有误!",
 						icon: "none"
@@ -544,8 +546,9 @@
 				delivery(this.deliveryForm).then(res => {
 					if (res.status == 200) {
 						this.$util.Tips({
-							title: '设置收货人成功!'
+							title: res.message
 						})
+						that.init();
 						setTimeout(() => {
 							that.popUpShow = false;
 						}, 1000)
@@ -554,18 +557,19 @@
 					that.$util.Tips({
 						title: err
 					})
-					setTimeout(() => {
-						that.popUpShow = false;
-					}, 1500)
 				})
 			},
 
 			//收件码
 			toPostagequ(item) {
-				this.deliveryForm.mer_id = item.mer_id;
-				this.popUpShow = true;
 				this.deliveryForm.delivery_name = '';
 				this.deliveryForm.delivery_id = '';
+				this.deliveryForm.remark = '';
+
+				this.deliveryForm.mer_id = item.mer_id;
+				this.deliveryForm.order_id = item.order_id;
+				this.popUpShow = true;
+
 				// this.shipment.delivery_name = this.shipment.to_name
 				// this.shipment.delivery_id = this.shipment.to_phone
 
@@ -682,7 +686,7 @@
 <style lang="scss">
 	.form {
 		position: relative;
-		z-index: 9999999;
+		z-index: 11;
 		padding: 40rpx 60rpx;
 		background-color: #fff;
 		border-radius: 20rpx;
@@ -745,7 +749,7 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		z-index: 9999;
+		z-index: 10;
 		width: 100%;
 		background-color: #fff;
 	}