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 @@
-
-
-
-
- 可提现资金:
- 399.63元
-
-
-
-
-
- 取消
- 确认
-
-
-
-
-
-
-
-
\ 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 @@
- 123
+
- {{ e.amount || 0 }}
+ {{ formatAmount(e.amount || 0) }}
{{ e.number || '-' }}
{{ e.request_time || '-' }}
{{ e.account_name_of_bank || '-' }}
@@ -30,36 +38,85 @@ export default {
return {
orderList: [],
loadPage: 1,
+ brand_id: '',
+ start_time: '',
+ end_time: '',
+ status: '', // 传0展示未处理,传1展示处理。不传展示全部
}
},
onLoad(options){
let _bid = options.brand_id ?? '';
this.brand_id = _bid;
- this.getDouyinWalletWithdrawRecord({ brand_id: _bid });
+ let { startDate, endDate } = this.$refs.filtrateBar.getTimes();
+ this.getDouyinWalletWithdrawRecord({
+ brand_id: _bid,
+ start_time: startDate,
+ end_time: endDate
+ });
},
onReachBottom(){
+
this.getDouyinWalletWithdrawRecord({
brand_id: this.brand_id,
- page: this.loadPage + 1
+ page: this.loadPage + 1,
+ status: this.status,
+ start_time: this.start_time,
+ end_time: this.end_time
});
},
methods: {
+ formatAmount(num = 0){
+ let _num = Number(num) || 0;
+ return _num * 0.01;
+ },
+ getTagTxt(status = ''){
+ return status === 0 ? '待处理' :
+ status === 1 ? '已处理' : '';
+ },
+ filterBtn(idx){
+ this.loadPage = 1;
+ this.status = idx === 0 ? '' : idx - 1;
+ this.getDouyinWalletWithdrawRecord({
+ brand_id: this.brand_id,
+ status: this.status,
+ start_time: this.start_time,
+ end_time: this.end_time
+ });
+ },
+ timesChange(e){
+ let { startDate, endDate } = e;
+ this.loadPage = 1;
+ this.start_time = startDate;
+ this.end_time = endDate;
+ this.getDouyinWalletWithdrawRecord({
+ brand_id: this.brand_id,
+ status: this.status,
+ start_time: startDate,
+ end_time: endDate,
+ });
+ },
/**
* http://api.ouxuan.net:61080/project/11/interface/api/2202
* @param {String} brand_id 品牌id
- * @param {status} status 传0展示未处理,传1展示处理。不传展示全部
* @param {Number} page 页码
* @param {Number} page_size 每页条数
+ * @param {status} status 传0展示未处理,传1展示处理。不传展示全部
+ * @param {String} start_time 开始时间
+ * @param {String} end_time 结束时间
+ *
* */
- getDouyinWalletWithdrawRecord({ brand_id, page = 1, page_size = 10 }){
+ getDouyinWalletWithdrawRecord({
+ brand_id, page = 1, page_size = 10,
+ status = '', start_time = '', end_time = ''
+ }){
showLoad();
+ let _query = { brand_id, page, page_size };
+ if(status !== '')_query.status = status;
+ if(start_time !== '')_query.start_time = start_time;
+ if(end_time !== '')_query.end_time = end_time;
servers.get({
url: WALLET_API.withdrawalOfDouyinOrg_list,
- data: {
- brand_id: brand_id,
- page: page,
- page_size: page_size
- },
+ data: _query,
failMsg: '加载提现记录失败'
})
.then(res=>{
diff --git a/src/subpackage/wallet/pages/index/index.vue b/src/subpackage/wallet/pages/index/index.vue
index 6f4003b..05ffa80 100644
--- a/src/subpackage/wallet/pages/index/index.vue
+++ b/src/subpackage/wallet/pages/index/index.vue
@@ -16,14 +16,12 @@
-
-
-
\ No newline at end of file