From eaaf2586e61572598cac9febc65c061d64e176c4 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Fri, 29 Jul 2022 23:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E9=97=AE=E9=A2=98=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=8F=AF=E6=B4=BE=E5=8D=95=E5=B8=88=E5=82=85?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=85=88=E5=B1=95=E7=A4=BA=E7=9C=9F?=
 =?UTF-8?q?=E5=AE=9E=E5=90=8D=E7=A7=B0=E5=86=8D=E5=B1=95=E7=A4=BA=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/dispatch-order.vue | 2 +-
 pages/order-manage/order-manage.vue   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index 8b7b4c5..21114a8 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -31,7 +31,7 @@
 					<view class="flex justify-start align-center">
 						<view class="cu-avatar round"
 							:style="'background-image:url(' + member.workerLogoUrl + ');min-width: 80rpx;min-height: 80rpx'"></view>
-						<view class="text-lg margin-left-sm">{{member.workerName}}</view>
+						<view class="text-lg margin-left-sm">{{member.workerName ? member.workerName : member.name}}</view>
 					</view>
 					<view>
 						<button class="cu-btn bg-main-color shadow-blur" @click="assignWork(member)">指派</button>
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index a931f34..a7e4ae6 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -711,7 +711,9 @@
 				this.orderList[index].afterSaleDealStatus = status;
 			},
 			getCanAssignList(order) {
-				this.$refs.dispatchOrderPopup.$children[0].loadData(order);
+				if (this.myTeamMembers && this.myTeamMembers.length) {
+					this.$refs.dispatchOrderPopup.$children[0].loadData(order);
+				}
 			},
 			async workBegin(order) {
 				let curDate = new Date();