diff --git a/apis/interfaces/withdraws.js b/apis/interfaces/withdraws.js new file mode 100644 index 0000000..9fad558 --- /dev/null +++ b/apis/interfaces/withdraws.js @@ -0,0 +1,97 @@ +/** + * zdx + * moduleName: 提现模块 + */ + +import { + request +} from '../index.js' + + +// 添加前置条件 +const accountsCreate = () => { + return request({ + url: 'withdraws/accounts/create' + }) +} + +// 添加银行卡 +const withdrawsAccounts = (data) => { + return request({ + url: 'withdraws/accounts', + method: 'POST', + data: data + }) +} + +// 银行卡列表 +const withdrawsAccountsList = (data) => { + return request({ + url: 'withdraws/accounts', + method: 'get', + data: data + }) +} + +// 编辑银行卡前置 +const accountsCreateEdit = (id) => { + return request({ + url: 'withdraws/accounts/'+id+'/edit' + }) +} + +// 编辑银行卡 +const withdrawsAccountsEdits = (data) => { + return request({ + url: 'withdraws/accounts/'+data.bank_account_id, + method: 'PUT', + data: data + }) +} + +// 删除银行卡 +const withdrawsAccountsDelete = (id) => { + return request({ + url: 'withdraws/accounts/'+id, + method: 'DELETE' + }) +} + +// 提现前置记录 +const withdrawsIndexCreate = () => { + return request({ + url: 'withdraws/index/create' + }) +} + +// 提现接口 +const withdrawsIndex = (data) => { + return request({ + url: 'withdraws/index', + method: 'POST', + data: data + }) +} + +// 提现记录 +const withdrawsIndexLists = (data) => { + return request({ + url: 'withdraws/index', + method: 'get', + data: data + }) +} + +// + +export { + accountsCreate, + withdrawsAccounts, + withdrawsAccountsList, + accountsCreateEdit, + withdrawsAccountsEdits, + withdrawsAccountsDelete, + withdrawsIndexCreate, + withdrawsIndex, + withdrawsIndexLists +} diff --git a/pages.json b/pages.json index 9cf4aac..44b1411 100644 --- a/pages.json +++ b/pages.json @@ -256,23 +256,23 @@ "name": "Fragment" }, { - "path": "pages/wallet/addCard", + "path": "pages/wallet/addBank", "style": { "navigationBarTitleText": "添加银行卡", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" }, - "name": "addCard" + "name": "addBank" },{ - "path": "pages/wallet/selectCard", + "path": "pages/wallet/bankList", "style": { "navigationBarTitleText": "银行卡列表", "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#774ffd", "navigationBarTextStyle": "white" }, - "name": "selectCard" + "name": "bankList" },{ "path": "pages/wallet/withdrawList", "style": { diff --git a/pages/wallet/addBank.vue b/pages/wallet/addBank.vue new file mode 100644 index 0000000..768e856 --- /dev/null +++ b/pages/wallet/addBank.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/pages/wallet/addCard.vue b/pages/wallet/addCard.vue deleted file mode 100644 index 02446ee..0000000 --- a/pages/wallet/addCard.vue +++ /dev/null @@ -1,180 +0,0 @@ - - - - - diff --git a/pages/wallet/bankList.vue b/pages/wallet/bankList.vue new file mode 100644 index 0000000..d69c7e0 --- /dev/null +++ b/pages/wallet/bankList.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue index 053a33b..7c64fa1 100644 --- a/pages/wallet/extract.vue +++ b/pages/wallet/extract.vue @@ -4,9 +4,9 @@ 能量球钱包 - + (≈ {{ cost || '0.00' }} CNY) - {{ balance.balance || '0.00' }} + {{ balance || '0.00' }} 提现记录 @@ -14,98 +14,59 @@ 提现至银行卡 - 添加银行卡 - - - - - 选择银行卡 - - 选择银行卡 + 添加银行卡 + {{bankInfo.name?bankInfo.name:'选择银行卡'}} + - ≈ ¥{{total}} + placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" placeholder="提现数量" /> 全部提现 - 提现至银行卡 - 预计5- 10个工作日到账 + ≈ ¥{{total}} + 提现至银行卡 + 预计5- 10个工作日到账 手续费: {{tax}}% - - diff --git a/pages/wallet/withdrawList.vue b/pages/wallet/withdrawList.vue index 338cf5f..2cb5c4a 100644 --- a/pages/wallet/withdrawList.vue +++ b/pages/wallet/withdrawList.vue @@ -30,16 +30,23 @@ - + + + {{item.way}} + {{item.status.status_text}} + - 能量球:150 - 金额≈¥300 - - - {{item.created_at}} 提现 - {{item.paid_at || index === 0 ? '2021-11-11 11:11:11到账':'努力打款中'}} + + 能量球:{{item.quantity}} + 金额≈¥{{item.take}} 手续费:{{item.tax}} + + {{item.create_at}} + @@ -53,16 +60,15 @@