From 99aa1737e4c3e9282b6b0b1444388f46946f2ef4 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 23 Aug 2022 16:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E5=8F=91=E8=B5=B7=E5=AE=8C?=
 =?UTF-8?q?=E5=8D=95=E5=89=8D=E8=BF=9B=E8=A1=8C=E5=AE=9E=E5=90=8D=E5=8F=8A?=
 =?UTF-8?q?=E7=BB=91=E5=8D=A1=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index-home.vue            |  6 ++++++
 pages/order-manage/dispatch-order.vue |  1 +
 pages/order-manage/order-manage.vue   | 30 ++++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 30409aa..79f8a42 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -272,6 +272,12 @@
 				})
 			},
 			async clickServModule(pageObj) {
+				if (pageObj && !pageObj.pageUrl) {
+					uni.showToast({
+						icon: 'none',
+						title: '功能开发中'
+					})
+				}
 				if (pageObj.checkLogin) {
 					let res = await this.authLogin();
 					if (res) {
diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index 21114a8..64bbeca 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -130,6 +130,7 @@
 				let goodsToAssign = [];
 				// 标识是否派完所有goods，1为派完，0为未派完
 				let isAll = 1;
+				console.log(this.pickedList)
 				this.pickedList.forEach((item) => {
 					if (item.goodsNum !== item.toAssignNum) {
 						isAll = 0;
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 21232ad..7edbd1a 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -235,7 +235,10 @@
 			</view>
 			<!-- 底部占位 -->
 			<view class="cu-bar bg-white fixed-bottom-bar"></view>
-		</uni-popup>
+		</uni-popup>
+		<!-- 账户及实名弹窗 -->
+		<vertify-bank-bind ref="vertifyBankBind"></vertify-bank-bind>
+		<vertify-certify ref="vertifyCertify"></vertify-certify>
 	</view>
 </template>
 
@@ -477,7 +480,6 @@
 			async loadTeamMembers() {
 				let res = await this.$request.getTeamPage({
 					leaderId: this.curUserInfo.workerId,
-					workerStatus: 0,
 					workerId: null
 				});
 				this.myTeamMembers = res.rows;
@@ -705,11 +707,33 @@
 					url: '/pages/order-manage/serv-detail?order=' + encodeURIComponent(JSON.stringify(order))
 				})
 			},
-			finishOrder(order) {
+			async finishOrder(order) {
+				let checkRes = await this.checkBankAndCertify();
+				if (!checkRes) {
+					return;
+				}
 				uni.navigateTo({
 					url: '/pages/order-manage/finish-order?order=' + encodeURIComponent(JSON.stringify(order))
 				})
 			},
+			async checkBankAndCertify() {
+				// 查询账户绑定信息
+				let bankCardRes = await this.$request.getBindBankCardByWorkerId({
+					workerId: this.curUserInfo.workerId
+				});
+				this.bankCard = bankCardRes.data;
+				// 查询实名信息
+				let certifyInfoRes = await this.$request.getWorkerCertify();
+				this.certifyInfo = certifyInfoRes.data;
+				if ((!this.bankCard || !this.bankCard.bankNum) && this.curUserInfo.status != -1) {
+					this.$refs.vertifyBankBind.showModal();
+					return false;
+				} else if (!this.certifyInfo || !this.certifyInfo.workerCertificationId) {
+					this.$refs.vertifyCertify.showModal();
+					return false;
+				}
+				return true;
+			},
 			async updateMasterOrder(order, status) {
 				let res = await this.$request.updateMasterOrder({
 					id: order.orderMasterId,