From 267f9cf17fcc6cdf5053647c9e1d00ae33e0b552 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Mon, 1 Nov 2021 16:03:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E8=8A=82=E7=82=B9=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=9A=84=E6=88=91=E7=9A=84=E4=BC=99=E4=BC=B4=E6=9D=BF=E5=9D=97?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E4=BC=99=E4=BC=B4=E6=96=87=E5=AD=97=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=B8=BA=E7=B2=89=E4=B8=9D=E3=80=82=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=AA=E4=BA=BA=E8=AE=A4=E8=AF=81=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=B4=AD=E4=B9=B0=E9=A1=B5=E9=9D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- pages/user/index.vue | 44 +++++++++++++++++++++--------------------- pages/user/partner.vue | 3 +++ 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/pages.json b/pages.json index 7b2f80b..4cef897 100644 --- a/pages.json +++ b/pages.json @@ -211,7 +211,7 @@ "name": "userPartner", "auth": true, "style": { - "navigationBarTitleText": "我的伙伴" + "navigationBarTitleText": "我的粉丝" } }, { "path": "pages/user/clause", diff --git a/pages/user/index.vue b/pages/user/index.vue index a0afe20..9c92e86 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -154,19 +154,19 @@ - 我的伙伴 + 我的粉丝 - 伙伴总数 + 粉丝总数 {{userData.relation_count.all || 0}} - 直接伙伴 + 直接粉丝 {{userData.relation_count.one || 0}} - 间接伙伴 + 间接粉丝 {{userData.relation_count.two || 0}} @@ -362,24 +362,24 @@ methods: { // 开通VIP openVip(identityId) { - if (!this.userData.certification) { - uni.showModal({ - title: '提示', - content: '为了保障您的用户权益，未个人认证无法开通节点', - cancelColor: '#555', - cancelText: '稍后开通', - confirmColor: '#8b64fd', - confirmText: '去认证', - success: res => { - if (res.confirm) { - this.$Router.push({ - name: 'Personal' - }) - } - } - }) - return - } + // if (!this.userData.certification) { + // uni.showModal({ + // title: '提示', + // content: '为了保障您的用户权益，未个人认证无法开通节点', + // cancelColor: '#555', + // cancelText: '稍后开通', + // confirmColor: '#8b64fd', + // confirmText: '去认证', + // success: res => { + // if (res.confirm) { + // this.$Router.push({ + // name: 'Personal' + // }) + // } + // } + // }) + // return + // } this.$Router.push({ name: 'vipIndex', params: { diff --git a/pages/user/partner.vue b/pages/user/partner.vue index 996fca5..b35f191 100644 --- a/pages/user/partner.vue +++ b/pages/user/partner.vue @@ -106,6 +106,9 @@ .tabs{ position: fixed; top: 0; + //#ifdef H5 + top:100rpx; + //#endif left: 0; right: 0; z-index: 99; From f47eb531b705901d0f6bcc8f0d9c432d623cf374 Mon Sep 17 00:00:00 2001 From: zhangdongxue Date: Mon, 1 Nov 2021 16:33:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?['=E7=94=A8=E6=88=B7=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E3=80=81=E9=80=9A=E8=AF=81=E5=85=91=E6=8D=A2=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E7=AD=89=E4=B8=AA=E4=BA=BA=E8=AE=A4=E8=AF=81=E9=99=90=E5=88=B6?= =?UTF-8?q?']?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/wallet/extract.vue | 22 +++++++++++++++++++++- pages/wallet/extractRed.vue | 25 +++++++++++++++++++++---- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index 5773fd0..e571e39 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -45,7 +45,8 @@ card: '', // 银行卡号 withdraw_input: '', // 提现通证数量 bank_accounts: 0, - bankInfo: {} + bankInfo: {}, + certification:false,//默认没有认证 }; }, onLoad() { @@ -65,6 +66,7 @@ this.balance = res.balance this.cost = res.cost this.total = Number(res.balance) * Number(res.cost) + this.certification = res.certification uni.setStorageSync('refresh', false) }).catch(err => { uni.showToast({ @@ -125,6 +127,24 @@ }) return; } + if (!this.certification) { + uni.showModal({ + title: '提示', + content: '为了保障您的用户权益，未个人认证无法提现通证', + cancelColor: '#555', + cancelText: '稍后认证', + confirmColor: '#8b64fd', + confirmText: '立即认证', + success: res => { + if (res.confirm) { + this.$Router.push({ + name: 'Personal' + }) + } + } + }) + return + } uni.showModal({ title: '温馨提示', content:'您是否确认提现到现金红包账户，交易将免手续费', diff --git a/pages/wallet/extractRed.vue b/pages/wallet/extractRed.vue index 728bb17..4df9c81 100644 --- a/pages/wallet/extractRed.vue +++ b/pages/wallet/extractRed.vue @@ -51,7 +51,8 @@ card: '', // 银行卡号 withdraw_input: '', // 提现通证金额 bank_accounts: 0, - bankInfo: {} + bankInfo: {}, + certification:false,// 认证状态 }; }, onLoad() { @@ -73,6 +74,7 @@ this.bank_accounts = res.bank_accounts.length this.withdraw_input = Number(res.balance) this.total = Number(res.balance) * Number(res.cost) + this.certification = res.certification uni.setStorageSync('refresh', false) }).catch(err => { uni.showToast({ @@ -105,10 +107,7 @@ this.withdraw_input = this.balance this.total = this.balance * this.cost } - - } - }, // 点击全部 all() { @@ -144,6 +143,24 @@ }) return; } + if (!this.certification) { + uni.showModal({ + title: '提示', + content: '为了保障您的用户权益，未个人认证无法提现红包', + cancelColor: '#555', + cancelText: '稍后认证', + confirmColor: '#8b64fd', + confirmText: '立即认证', + success: res => { + if (res.confirm) { + this.$Router.push({ + name: 'Personal' + }) + } + } + }) + return + } uni.showModal({ title: '温馨提示', content:this.tax === '0'?'您是否确认提现，交易将免手续费':'您是否确认提现，将会扣除' + this.tax + '%手续费',