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 @@
-
+
+
+
+
@@ -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,