From e80100199f73deed2469eb84e20257694d7f4833 Mon Sep 17 00:00:00 2001 From: donqi Date: Thu, 21 Jul 2022 15:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7-1=E7=8A=B6=E6=80=81=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E8=B4=A6=E6=88=B7=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/vertify/vertify-bank-bind.vue | 2 +- pages.json | 60 +++++++++---------- pages/demand-center/accept-demand-center.vue | 2 +- pages/index/my-home.vue | 5 +- ...nk-account-bind.vue => b-account-bind.vue} | 0 pages/my/withdraw.vue | 2 +- 6 files changed, 36 insertions(+), 35 deletions(-) rename pages/my/{bank-account-bind.vue => b-account-bind.vue} (100%) diff --git a/components/vertify/vertify-bank-bind.vue b/components/vertify/vertify-bank-bind.vue index 826d75a..efd02a8 100644 --- a/components/vertify/vertify-bank-bind.vue +++ b/components/vertify/vertify-bank-bind.vue @@ -36,7 +36,7 @@ }, goToBindBank() { uni.navigateTo({ - url: '/pages/my/bank-account-bind' + url: '/pages/my/b-account-bind' }) } } diff --git a/pages.json b/pages.json index 3df00da..f8bd462 100644 --- a/pages.json +++ b/pages.json @@ -1,8 +1,8 @@ { "pages": [{ "path": "pages/index/index" - }, { - "path": "pages/index/msg-dialog" + }, { + "path": "pages/index/msg-dialog" }], "subPackages": [{ "root": "pages/area-proxy/", @@ -26,37 +26,37 @@ "path": "serv-detail" }, { "path": "finish-order" - }, { - "path": "cancel-order" + }, { + "path": "cancel-order" + }] + }, { + "root": "pages/my/", + "pages": [{ + "path": "new-serv" + }, { + "path": "master-occupancy" + }, { + "path": "withdraw" + }, { + "path": "b-account-bind" + }, { + "path": "my-money-bag" + }, { + "path": "statement-desc" + }, { + "path": "pay-deposit" + }, { + "path": "personal-info" + }, { + "path": "account-security" + }, { + "path": "master-settled-info" + }, { + "path": "certification" }] - }, { - "root": "pages/my/", - "pages": [{ - "path": "new-serv" - }, { - "path": "master-occupancy" - }, { - "path": "withdraw" - }, { - "path": "bank-account-bind" - }, { - "path": "my-money-bag" - }, { - "path": "statement-desc" - }, { - "path": "pay-deposit" - }, { - "path": "personal-info" - }, { - "path": "account-security" - }, { - "path": "master-settled-info" - }, { - "path": "certification" - }] }], "globalStyle": { "navigationStyle": "custom", "navigationBarTextStyle": "black" } -} +} diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue index ebf7ed6..14f1afd 100644 --- a/pages/demand-center/accept-demand-center.vue +++ b/pages/demand-center/accept-demand-center.vue @@ -295,7 +295,7 @@ // 查询实名信息 let certifyInfoRes = await this.$request.getWorkerCertify(); this.certifyInfo = certifyInfoRes.data; - if (!this.bankCard || !this.bankCard.bankNum) { + if ((!this.bankCard || !this.bankCard.bankNum) && this.curUserInfo.status != -1) { this.$refs.vertifyBankBind.showModal(); return false; } else if (!this.certifyInfo || !this.certifyInfo.workerCertificationId) { diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue index 9074373..1cb89c1 100644 --- a/pages/index/my-home.vue +++ b/pages/index/my-home.vue @@ -44,7 +44,7 @@ + v-if="item.show || (item.showByStatus ? curUserInfo.status != -1 : false)"> {{item.name}} @@ -70,7 +70,8 @@ name: '提现账户', icon: 'moneybag', pageUrl: '/pages/my/withdraw', - show: true + // show: true, + showByStatus: true }, { name: '交易明细', icon: 'form', diff --git a/pages/my/bank-account-bind.vue b/pages/my/b-account-bind.vue similarity index 100% rename from pages/my/bank-account-bind.vue rename to pages/my/b-account-bind.vue diff --git a/pages/my/withdraw.vue b/pages/my/withdraw.vue index a2628b1..fcbf6c4 100644 --- a/pages/my/withdraw.vue +++ b/pages/my/withdraw.vue @@ -104,7 +104,7 @@ }, bindAccount() { uni.navigateTo({ - url: '/pages/my/bank-account-bind' + url: '/pages/my/b-account-bind' }) }, chooseImage(e) {