diff --git a/src/pages.json b/src/pages.json index 6820a94..511b582 100644 --- a/src/pages.json +++ b/src/pages.json @@ -734,12 +734,6 @@ } }, { - "path": "pages/index/recharge_record", - "style" : { - "navigationBarTitleText": "充值记录" - } - }, - { "path": "pages/baofu_withdraw/index", "style" : { "navigationBarTitleText": "新宝付提现" diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4a4feb8..ea4a2b4 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -146,10 +146,10 @@ serverKey: 1015 // 后端对应权限编号 1015 }, { - id: 10, + id: 11, name: '钱包', path: '/subpackage/wallet/pages/index/index', - serverKey: 1015 // 后端对应权限编号 1015 + serverKey: 1017 // 后端对应权限编号 1017 }, ]; diff --git a/src/static/images/icon/index/tab_11.png b/src/static/images/icon/index/tab_11.png new file mode 100644 index 0000000..3f4f05c Binary files /dev/null and b/src/static/images/icon/index/tab_11.png differ diff --git a/src/store/index.js b/src/store/index.js index cdc5dcc..043eaef 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -43,6 +43,7 @@ export default new Vuex.Store({ '1013': '课程管理', '1014': '储值卡管理', '1015': '进场人数异常', + '1017': '钱包提现' }, // 场地占用提交页面信息 occupyInfo: { diff --git a/src/subpackage/wallet/components/dy_withdraw_apply.vue b/src/subpackage/wallet/components/dy_withdraw_apply.vue index a86d363..56c8777 100644 --- a/src/subpackage/wallet/components/dy_withdraw_apply.vue +++ b/src/subpackage/wallet/components/dy_withdraw_apply.vue @@ -12,11 +12,11 @@ *账户名称 - + *银行卡号 - + *银行名称 @@ -29,11 +29,11 @@ *支行名称 - + 联系电话 - + diff --git a/src/subpackage/wallet/components/filtrate_bar.vue b/src/subpackage/wallet/components/filtrate_bar.vue index e432dd7..62eb787 100644 --- a/src/subpackage/wallet/components/filtrate_bar.vue +++ b/src/subpackage/wallet/components/filtrate_bar.vue @@ -23,8 +23,14 @@ - - \ No newline at end of file diff --git a/src/subpackage/wallet/components/top_up.vue b/src/subpackage/wallet/components/top_up.vue deleted file mode 100644 index 40c05b2..0000000 --- a/src/subpackage/wallet/components/top_up.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue index 14d73ec..98681d5 100644 --- a/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue +++ b/src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue @@ -23,21 +23,21 @@ 可提现资金(元) - + {{ accountInfo.currBal || 0 }} 总资产(元) - + {{ accountInfo.pendingBal || 0 }} 在途资金(元) - + @@ -79,6 +79,18 @@ export default { this.refreshItem(true); }, methods:{ + showModalTip(type){ + let tipArr = [ + '该账户支持提现的资金', + '在途资金+可提现资金总和', + '用户支付后金额进入到商户在途户中,商户发起分账且达到T+1条件后资金才能从在途户结算到可提现资金', + ] + uni.showModal({ + title: '提示', + content: tipArr[type], + showCancel: false + }) + }, refreshItem(loadStatus){ this.getBaofuV2PriceInfo({ type: this.tag, diff --git a/src/subpackage/wallet/pages/douyin_withdraw/index.vue b/src/subpackage/wallet/pages/douyin_withdraw/index.vue index 54c7ad4..f3322d7 100644 --- a/src/subpackage/wallet/pages/douyin_withdraw/index.vue +++ b/src/subpackage/wallet/pages/douyin_withdraw/index.vue @@ -73,7 +73,8 @@ export default { }) .then(res=>{ hideLoad(); - this.balance = +res.total_amount ?? 0; + let _balance = +res.total_amount ?? 0; + this.balance = _balance * 0.01; }) .catch(hideLoad) }, @@ -81,7 +82,8 @@ export default { dyConfirmExtract(e){ this.douyinWalletExtract({ brand_id: this.brand_id, - ...e + ...e, + amount: e.amount * 100 }) }, /** diff --git a/src/subpackage/wallet/pages/douyin_withdraw/record.vue b/src/subpackage/wallet/pages/douyin_withdraw/record.vue index 8e91038..01941e7 100644 --- a/src/subpackage/wallet/pages/douyin_withdraw/record.vue +++ b/src/subpackage/wallet/pages/douyin_withdraw/record.vue @@ -1,9 +1,17 @@ - - \ No newline at end of file