From 96616c94ca451c76801eab58bd2ebba7b332dec2 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 19 Jul 2022 15:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/dispatch-order.vue | 22 ++++++++++++++--------
 pages/order-manage/order-manage.vue   |  7 ++++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index a901b5b..8b7b4c5 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -142,15 +142,21 @@
 					}
 				});
 				if (goodsToAssign.length > 0) {
-					let params = {
-						goodsList: goodsToAssign,
-						workerId: member.workerId,
-						totalPay: this.dispatchTotalPrice,
-						orderMasterId: this.curOrder.orderMasterId,
-						isAll: isAll
+					if (this.dispatchTotalPrice) {
+						let params = {
+							goodsList: goodsToAssign,
+							workerId: member.workerId,
+							totalPay: this.dispatchTotalPrice,
+							orderMasterId: this.curOrder.orderMasterId,
+							isAll: isAll
+						}
+						this.$emit('assignWork', params);
+					} else {
+						uni.showToast({
+							title: '请填写派单价格',
+							icon: 'none'
+						})
 					}
-					console.log(params)
-					this.$emit('assignWork', params);
 				} else {
 					uni.showToast({
 						title: '请至少选择一种规格',
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 6104595..e109be4 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -752,13 +752,18 @@
 			},
 			async assignWork(params) {
 				let res = await this.$request.assign(params);
-				if (res.code === 0) {
+				if (res && res.code === 0) {
 					this.getCanAssignList(this.curOrder);
 					this.reloadMasterOrderPage();
 					uni.showToast({
 						title: '派单成功',
 						icon: 'success'
 					})
+				} else {
+					uni.showToast({
+						title: '派单失败，请确认派单价格不高于本订单价格',
+						icon: 'none'
+					})
 				}
 			},
 			async assignWork2MySelf(orderInfo) {