APP
/
ox_zhiNengZhuShou
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fix tid1505 all

tid1509
刘嘉炜 1 year ago
parent
a8d2cc5573
commit
f6432cfbcd
13 changed files with 125 additions and 195 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/pages.json
  2. 4
      src/pages/index/index.vue
  3. BIN
      src/static/images/icon/index/tab_11.png
  4. 1
      src/store/index.js
  5. 8
      src/subpackage/wallet/components/dy_withdraw_apply.vue
  6. 37
      src/subpackage/wallet/components/filtrate_bar.vue
  7. 82
      src/subpackage/wallet/components/time_selection.vue
  8. 56
      src/subpackage/wallet/components/top_up.vue
  9. 18
      src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
  10. 6
      src/subpackage/wallet/pages/douyin_withdraw/index.vue
  11. 79
      src/subpackage/wallet/pages/douyin_withdraw/record.vue
  12. 3
      src/subpackage/wallet/pages/index/index.vue
  13. 20
      src/subpackage/wallet/pages/index/recharge_record.vue

6
src/pages.json
View File

@ -734,12 +734,6 @@
}
},
{
"path": "pages/index/recharge_record",
"style" : {
"navigationBarTitleText": "充值记录"
}
},
{
"path": "pages/baofu_withdraw/index",
"style" : {
"navigationBarTitleText": "新宝付提现"

4
src/pages/index/index.vue
View File

@ -146,10 +146,10 @@
serverKey: 1015 // 后端对应权限编号 1015
},
{
id: 10,
id: 11,
name: '钱包',
path: '/subpackage/wallet/pages/index/index',
serverKey: 1015 // 后端对应权限编号 1015
serverKey: 1017 // 后端对应权限编号 1017
},
];

BIN
src/static/images/icon/index/tab_11.png
View File

Side by Side

After

Width: 52  |  Height: 52  |  Size: 792 B

1
src/store/index.js
View File

@ -43,6 +43,7 @@ export default new Vuex.Store({
'1013': '课程管理',
'1014': '储值卡管理',
'1015': '进场人数异常',
'1017': '钱包提现'
},
// 场地占用提交页面信息
occupyInfo: {

8
src/subpackage/wallet/components/dy_withdraw_apply.vue
View File

@ -12,11 +12,11 @@
</view>
<view class="dwa-opt-line" :key="i">
<view class="dol-name">*账户名称</view>
<input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account_name_of_bank">
<input type="text" class="dol-ipt" placeholder="请输入账户名称" v-model="info.account_name_of_bank">
</view>
<view class="dwa-opt-line" :key="i">
<view class="dol-name">*银行卡号</view>
<input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.account">
<input type="number" class="dol-ipt" placeholder="请输入银行卡号" v-model="info.account">
</view>
<view class="dwa-opt-line">
<view class="dol-name">*银行名称</view>
@ -29,11 +29,11 @@
</view>
<view class="dwa-opt-line" :key="i">
<view class="dol-name">*支行名称</view>
<input type="text" class="dol-ipt" placeholder="请输入提现金额" v-model="info.bank_address">
<input type="text" class="dol-ipt" placeholder="请输入支行名称" v-model="info.bank_address">
</view>
<view class="dwa-opt-line" :key="i">
<view class="dol-name">联系电话</view>
<input type="number" class="dol-ipt" placeholder="请输入提现金额" v-model="info.mobile">
<input type="number" class="dol-ipt" placeholder="请输入联系电话" v-model="info.mobile">
</view>
</scroll-view>

37
src/subpackage/wallet/components/filtrate_bar.vue
View File

@ -23,8 +23,14 @@
</template>
<script>
import { formatDate } from '@/utils/util';
import { formatDate, showNone } from '@/utils/util';
export default {
props: {
filterList: {
type: Array,
default: () => ['全部', '待处理', '已处理']
}
},
data(){
return {
startDate: '',
@ -32,22 +38,41 @@ export default {
}
},
created(){
let _date = new Date();
this.startDate = formatDate({ date: new Date(_date.setFullYear(_date.getFullYear() - 1))});
this.endDate = formatDate({});
this.initDate({});
},
methods: {
initDate({ startDate, endDate }){
let _date = new Date();
this.startDate = startDate ?? formatDate({ date: new Date(_date.setFullYear(_date.getFullYear() - 1))});
this.endDate = endDate ?? formatDate({});
},
getTimes(){
return { startDate: this.startDate, endDate: this.endDate };
},
startDateChange(e){
this.startDate = e.detail.value;
this.emitTimes();
},
endDateChange(e){
this.endDate = e.detail.value;
this.emitTimes();
},
emitTimes(){
let { startDate, endDate } = this;
if(!startDate || !endDate)return;
let _sdTimestamp = new Date(startDate.replace(/-/g, '/')).getTime();
let _edTimestamp = new Date(endDate.replace(/-/g, '/')).getTime();
if(_sdTimestamp > _edTimestamp){
showNone('开始时间不能大于结束时间');
return;
}
this.$emit('change:times', { startDate, endDate });
},
filterBtn(){
uni.showActionSheet({
itemList: ['全部', '待处理', '已处理'],
itemList: this.filterList,
success: (res) => {
console.log(res.tapIndex);
this.$emit('change:filter', res.tapIndex);
}
})
}

82
src/subpackage/wallet/components/time_selection.vue
View File

@ -1,82 +0,0 @@
<template>
<view class="time-selection">
<view class="ts-left">
<picker class="tl-class">
<view class="tl-frame">
<input type="text" class="tf-time" disabled value="2021-12-12">
<image class="tf-icon"></image>
</view>
</picker>
<view class="tl-txt">至</view>
<picker class="tl-class">
<view class="tl-frame">
<input type="text" class="tf-time" disabled value="2021-12-12">
<image class="tf-icon"></image>
</view>
</picker>
</view>
<view class="ts-right">
<text class="tr-txt">筛选</text>
<image class="tr-icon"></image>
</view>
</view>
</template>
<script>
export default {
}
</script>
<style lang="scss">
.time-selection{
padding: 26upx 24upx;
background: #fff;
@include ctf(space-between);
.ts-left{
@include ctf;
.tl-class{
flex-shrink: 0;
}
.tl-frame{
flex-shrink: 0;
padding: 0 16upx;
height: 92upx;
width: 240upx;
border-radius: 10upx;
background: #F2F2F7;
@include ctf(space-between);
.tf-time{
flex-grow: 1;
box-sizing: border-box;
height: 100%;
@include flcw(28upx, 40upx, #1A1A1A);
}
.tf-icon{
margin-left: 4upx;
flex-shrink: 0;
width: 20upx;
height: 20upx;
background: skyblue;
}
}
.tl-txt{
margin: 0 18upx;
@include flcw(32upx, 44upx, #1A1A1A);
}
}
.ts-right{
@include ctf(flex-end);
.tr-txt{
margin-right: 12upx;
@include flcw(28upx, 40upx, #9C9C9F);
}
.tr-icon{
flex-shrink: 0;
width: 40upx;
height: 40upx;
background: skyblue;
}
}
}
</style>

56
src/subpackage/wallet/components/top_up.vue
View File

@ -1,56 +0,0 @@
<template>
<wallet-modal title="充值">
<view class="top-up">
<view class="tu-txt">
可提现资金：
<text class="bt-price">399.63元</text>
</view>
<input type="text" class="bw-ipt">
<view class="tu-btns">
<wm-button>取消</wm-button>
<wm-button green>确认</wm-button>
</view>
</view>
</wallet-modal>
</template>
<script>
import walletModal from './wallet_modal.vue';
import wmButton from './wm_button.vue';
export default {
components: {
'wallet-modal': walletModal,
'wm-button': wmButton
}
}
</script>
<style lang="scss">
.top-up{
padding: 60upx 50upx 0;
.tu-txt{
@include flcw(28upx, 48upx, #1A1A1A);
.bt-price{
color: $mColor;
}
}
.bw-ipt{
box-sizing: border-box;
width: 100%;
margin-top: 20upx;
height: 108upx;
border-radius: 10upx;
padding: 0 20upx;
font-size: 32upx;
color: #1A1A1A;
background: #F2F2F7;
}
.tu-btns{
margin-top: 80upx;
@include ctf(space-between);
}
}
</style>

18
src/subpackage/wallet/pages/baofu_withdraw/modules/baofu_item.vue
View File

@ -23,21 +23,21 @@
</view>
<view class="bi-tip">
<view class="bt-txt">可提现资金(元)</view>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(0)"></image>
</view>
<view class="bi-mony-info">
<view class="bmi-item">
<view class="bi-num">{{ accountInfo.currBal || 0 }}</view>
<view class="bi-tip">
<view class="bt-txt">总资产(元)</view>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(1)"></image>
</view>
</view>
<view class="bmi-item">
<view class="bi-num">{{ accountInfo.pendingBal || 0 }}</view>
<view class="bi-tip">
<view class="bt-txt">在途资金(元)</view>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png"></image>
<image class="bt-icon" mode="aspect" src="/subpackage/wallet/static/images/question_mark.png" @click="showModalTip(2)"></image>
</view>
</view>
</view>
@ -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,

6
src/subpackage/wallet/pages/douyin_withdraw/index.vue
View File

@ -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
})
},
/**

79
src/subpackage/wallet/pages/douyin_withdraw/record.vue
View File

@ -1,9 +1,17 @@
<template>
<view class="withdraw-record">
<filtrate-bar>123</filtrate-bar>
<filtrate-bar
:filter-list="['全部', '待处理', '已处理']"
ref="filtrateBar"
@change:times="timesChange"
@change:filter="filterBtn"
></filtrate-bar>
<view class="wr-list">
<view class="record-item" v-for="(e, i) in orderList" :key="i">
<record-line name="提现金额">{{ e.amount || 0 }}</record-line>
<record-line
name="提现金额"
:tag="getTagTxt(e.status)"
>{{ formatAmount(e.amount || 0) }}</record-line>
<record-line name="提现单号">{{ e.number || '-' }}</record-line>
<record-line name="申请时间">{{ e.request_time || '-' }}</record-line>
<record-line name="收款人名称">{{ e.account_name_of_bank || '-' }}</record-line>
@ -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=>{

3
src/subpackage/wallet/pages/index/index.vue
View File

@ -16,14 +16,12 @@
</view>
</view>
<wallet-modal v-if="false"></wallet-modal>
<!-- <top-up></top-up> -->
</view>
</template>
<script>
import walletInfo from './modules/wallet_info.vue'
import walletModalSuccess from '../../components/wallet_modal_success.vue'
import topUp from '../../components/top_up.vue';
import { WALLET_API } from '../../js/api';
import servers from '../../js/server';
import { routeTo, showLoad, hideLoad } from '@/utils/util';
@ -31,7 +29,6 @@ export default {
components: {
'wallet-info': walletInfo,
'wallet-modal': walletModalSuccess,
'top-up': topUp
},
data(){
return {

20
src/subpackage/wallet/pages/index/recharge_record.vue
View File

@ -1,20 +0,0 @@
<template>
<view class="recharge-record">
<time-selection></time-selection>
</view>
</template>
<script>
import timeSelection from '../../components/time_selection.vue';
export default {
components: {
'time-selection': timeSelection
}
}
</script>
<style lang="scss">
.recharge-record{
}
</style>
Write Preview
Loading…
Cancel
Save