diff --git a/components/content-top/index.vue b/components/content-top/index.vue index e0f0051..ab884dd 100644 --- a/components/content-top/index.vue +++ b/components/content-top/index.vue @@ -73,7 +73,7 @@ .z-bootm-img2 { width: 38rpx; - height: 34rpx; + height: 38rpx; margin-top: -15rpx; margin-left: -15rpx; position: absolute; diff --git a/pages/index/index.vue b/pages/index/index.vue index f6db902..55e105c 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -78,26 +78,6 @@ - @@ -2320,7 +2300,6 @@ width: 100%; height: 100%; } - } } @@ -2345,8 +2324,6 @@ margin-top: 61rpx; .content-middlea { - // width: 161rpx; - // flex: 1; width: 33.33%; flex-shrink: 0; text-align: center; @@ -2384,7 +2361,6 @@ .content-bottom { background-color: #ffffff; border-radius: 32rpx 32rpx 0px 0px; - // margin-top: 41rpx; padding-top: 46rpx; .content-order { @@ -2392,7 +2368,6 @@ display: flex; justify-content: space-around; - view { width: 100rpx; diff --git a/pages/withdrawal/add.vue b/pages/withdrawal/add.vue index 3d444a6..60410b6 100644 --- a/pages/withdrawal/add.vue +++ b/pages/withdrawal/add.vue @@ -19,7 +19,7 @@ class="withdrawal-left-empty">{{bindForm.is_own === 0 ? '法人账户' : bindForm.is_own === 1 ? '对公账户':'请选择账户类型'}} - + {{bindForm.is_own === ''?'选择':'更换'}}账户 @@ -30,15 +30,14 @@ 开户银行 - + - {{bindForm.bank?bindForm.bank:'请选择开户银行'}} + {{bindForm.bank?bindForm.bank:'点击选择开户银行'}} - - + @@ -60,7 +59,7 @@ 银行帐号 - @@ -76,14 +75,14 @@ 手机号码 - - - + + 锁定规则:错误输入超 3 次后锁定。
恢复规则:12 时后或次日 0 时恢复。
温馨提示:锁定期间勿重复提交绑定,否则锁定时间延长。 @@ -115,14 +114,14 @@ 开户银行 - + - {{bindForm.bank?bindForm.bank:'请选择开户银行'}} + {{bindForm.bank?bindForm.bank:'点击选择开户银行'}} - + @@ -136,7 +135,7 @@ 银行账号 - @@ -149,7 +148,7 @@ - + 锁定规则:错误输入超 3 次后锁定。
恢复规则:12 时后或次日 0 时恢复。
温馨提示:锁定期间勿重复提交绑定,否则锁定时间延长。 @@ -166,7 +165,7 @@ + @close="show = false" :safeAreaInsetBottom='true'> @@ -241,7 +240,7 @@ //获取法人真实姓名 this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; } else { - this.bindForm.is_own = 0; + this.bindForm.is_own = 1; //获取法人真实姓名 this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; this.list = [{ @@ -254,6 +253,7 @@ //如果绑定银行卡用户为个体户 则不能添加对公账户,只能添加法人账户 is_company =0 个体户 const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company; if (isCompany != 1) { + this.bindForm.is_own = 0; this.list = [{ name: '法人账户' }]; @@ -269,9 +269,9 @@ Object.assign(this.bindForm, res.data.financial_account); this.bindForm.id = res.data.id; this.mer_id = this.bindForm.mer_id; - // if (this.bindForm.is_own === 0 && this.bindForm.financial_img) { - // this.$set(this.bindForm, 'temp', this.bindForm.financial_img.split(",")); - // } + if (this.bindForm.is_own === 0 && this.bindForm.financial_img) { + this.$set(this.bindForm, 'temp', this.bindForm.financial_img.split(",")); + } } }) }, @@ -279,6 +279,8 @@ // 账户类型 handleSelected(e) { this.show = false; + this.bindForm.bank = ''; + this.bindForm.icon = ''; if (e.name == '法人账户') { this.bindForm.is_own = 0; this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name; @@ -302,6 +304,10 @@ this.bindForm.temp.splice(index, 1); }, + handleShow() { + this.show = true; + }, + // 选择银行卡 handleSelectedBank(e) { this.bindForm.bank = e.name; @@ -340,10 +346,10 @@ // 法人账号验证 if (this.bindForm.is_own === 0) { - // if (!this.bindForm.temp.length > 0) return this.$util.Tips({ - // title: '请上传凭证!' - // }); - // this.bindForm.financial_img = this.bindForm.temp.join(","); + if (!this.bindForm.temp.length > 0) return this.$util.Tips({ + title: '请上传凭证!' + }); + this.bindForm.financial_img = this.bindForm.temp.join(","); if (!uni.$u.test.idCard(this.bindForm.id_card)) return this.$util.Tips({ title: '请输入正确的身份证号!' @@ -364,9 +370,10 @@ }) }); }).catch(err => { - this.$util.Tips({ - title: err - }); + uni.showToast({ + title: err, + duration: 3000 + }) }) }, @@ -490,6 +497,11 @@ input { font-size: 30rpx; + width: 460rpx; + } + + text { + color: #40AE36; } } diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue index 5345809..e2e06b6 100644 --- a/pages/withdrawal/index.vue +++ b/pages/withdrawal/index.vue @@ -9,6 +9,7 @@
+ @@ -60,8 +61,8 @@ - - 查看审核进度 + 账户开通审核进度 + 《企业授权法人提现书》 @@ -122,9 +123,8 @@ - + - 点击提现 @@ -190,6 +190,8 @@ this.getBankInfo(); // 用户信息 this.userInfo = JSON.parse(this.$Cache.get("USER_INFO")); + + console.log(this.userInfo.mer_info.is_company) }, methods: { @@ -201,15 +203,15 @@ }, // 图片预览 - // handlePreview() { - // let that = this; - // if (this.bankInfo && this.bankInfo.financial_account.financial_img) { - // uni.previewImage({ - // urls: that.bankInfo.financial_account.financial_img.split(','), - // current: 0 - // }) - // } - // }, + handlePreview() { + let that = this; + if (this.bankInfo && this.bankInfo.financial_account.financial_img) { + uni.previewImage({ + urls: that.bankInfo.financial_account.financial_img.split(','), + current: 0 + }) + } + }, // 添加账户 handleToAdd() { diff --git a/pages/withdrawal/progress.vue b/pages/withdrawal/progress.vue index fb73deb..6d91621 100644 --- a/pages/withdrawal/progress.vue +++ b/pages/withdrawal/progress.vue @@ -17,7 +17,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/static/images/fb2.png b/static/images/fb2.png index a953406..aca4a53 100644 Binary files a/static/images/fb2.png and b/static/images/fb2.png differ diff --git a/static/images/fb21.png b/static/images/fb21.png new file mode 100644 index 0000000..a953406 Binary files /dev/null and b/static/images/fb21.png differ