From 7e5c468ffc5fa36f3a13e55d51d5be5038e11a7a Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 6 May 2021 11:44:54 +0800 Subject: [PATCH] no message --- api/payment.js | 6 ++++-- app.js | 2 +- pages/setting/index/index.js | 1 - pages/settlement/bill-list/index.js | 15 +++------------ pages/settlement/bill-list/index.json | 1 + pages/settlement/bill-list/index.wxml | 13 +++++-------- pages/settlement/withdrawal/index.js | 12 ++++++------ pages/settlement/withdrawal/index.wxml | 6 +++--- 8 files changed, 23 insertions(+), 33 deletions(-) diff --git a/api/payment.js b/api/payment.js index 9336587..36ff791 100644 --- a/api/payment.js +++ b/api/payment.js @@ -18,8 +18,9 @@ const getTradeOrder = (id) => mGet(`/payment-settlement-center/get/payment-order const paymentFor = (params) => mPost(`/payment-settlement-center/pay`, params, pconfig) const getBalanceInfo = () => mGet(`/payment-settlement-center/balance/get/factorybalance`, null, pconfig) const getWithdrawalList = () => mGet(`/payment-settlement-center/balance/get/factoryorder-withdrawal-list`, null, pconfig) -const paymentOrder = (params) => mPost(`/payment-settlement-center/balance/order/factorywithdraw`, params, pconfig) +const paymentOrder = (params) => mPost(`/payment-settlement-center/balance/factory-order/withdraw`, params, pconfig) const getAgentOrderList = (params) => mGet(`/payment-settlement-center/get/agency-payment-order-receivable-list`, params, pconfig) +const getBillList = () => mGet(`/payment-settlement-center/get/factory-bill-list`, null, pconfig) export { pconfig, @@ -33,5 +34,6 @@ export { getBalanceInfo, getWithdrawalList, paymentOrder, - getAgentOrderList + getAgentOrderList, + getBillList } \ No newline at end of file diff --git a/app.js b/app.js index 7710cb7..539fc8d 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 1, // 0: 开发版本；1：测试版本；2：生产版本 + evn: 0, // 0: 开发版本；1：测试版本；2：生产版本 tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'], version: '1.4.1', xAppId: '503258978847953926', diff --git a/pages/setting/index/index.js b/pages/setting/index/index.js index d691a67..639dce5 100644 --- a/pages/setting/index/index.js +++ b/pages/setting/index/index.js @@ -8,7 +8,6 @@ const storage = require('../../../utils/storage') const app = getApp() Scene({ - /** * 页面的初始数据 */ diff --git a/pages/settlement/bill-list/index.js b/pages/settlement/bill-list/index.js index b6156d6..2e5f100 100644 --- a/pages/settlement/bill-list/index.js +++ b/pages/settlement/bill-list/index.js @@ -1,6 +1,6 @@ // pages/message/detail/index.js import Scene from '../../index/scene' -import { getBillList } from "../../../api/ztb" +import { getBillList } from "../../../api/payment" const util = require('../../../utils/util') const app = getApp() @@ -30,12 +30,7 @@ Scene({ if (this.data.requesting) { return } - this.setData({ - orderList: [], - ['form.pageNum']: 1, - loading: true, - finished: false - }) + this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) this.fetchBillList() }, fetchBillList: function () { @@ -49,11 +44,7 @@ Scene({ let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum var finished = this.data.form.pageNum >= result.data.pages - if(this.data.form.pageNum == 1){ - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), top: 0, finished, requesting: false, loading: false }) - } else { - this.setData({[nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } + this.setData({[nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ finished: true, requesting: false, loading: false }) } diff --git a/pages/settlement/bill-list/index.json b/pages/settlement/bill-list/index.json index c15bc1b..23601bf 100644 --- a/pages/settlement/bill-list/index.json +++ b/pages/settlement/bill-list/index.json @@ -1,6 +1,7 @@ { "usingComponents": { "refresh-view": "/components/refresh-view/index", + "van-cell": "/components/cell/index", "van-divider": "/components/divider/index", "van-loading": "/components/loading/index", "notification": "/pages/message/notification/index" diff --git a/pages/settlement/bill-list/index.wxml b/pages/settlement/bill-list/index.wxml index 18a8d8a..0b94a9d 100644 --- a/pages/settlement/bill-list/index.wxml +++ b/pages/settlement/bill-list/index.wxml @@ -12,16 +12,13 @@ {{loading? '正在加载' : '暂无数据'}} - - + + - {{item.type}} - {{item.amount}} - - - {{item.createTime}} - + {{item.type}} + {{item.amount}} + {{item.createTime}} diff --git a/pages/settlement/withdrawal/index.js b/pages/settlement/withdrawal/index.js index 83c959c..61025ed 100644 --- a/pages/settlement/withdrawal/index.js +++ b/pages/settlement/withdrawal/index.js @@ -1,6 +1,7 @@ // pages/setting/withdrawal/index.js import Dialog from '../../../components/dialog/dialog' -import { getBalanceInfo, getWithdrawalList, getBankCardList, paymentOrder } from '../../../api/payment' +import { getBalanceInfo, getWithdrawalList, paymentOrder } from '../../../api/payment' +import { getBankCardList } from "../../../api/saas" const util = require('../../../utils/util') const math = require('../../../utils/math') const event = require('../../../utils/event') @@ -15,7 +16,6 @@ Page({ accountMoney: 0, //用户余额 sumMoney: 0, //用户余额 expendMoney: '', - xsaccountMoney: 0, //显示余额 banckCardList: [], //用户银行卡列表 banckList: [], orderList: [], @@ -59,7 +59,7 @@ Page({ if(!result.data){ return } - this.setData({ accountMoney: result.data.accountMoney, xsaccountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney) }) + this.setData({ accountMoney: result.data.accountMoney }) }).catch(err => { console.log(err) }) @@ -88,7 +88,7 @@ Page({ sum = math.plus(sum, element.money) } } - this.setData({ orderList: this.data.orderList, expendMoney: sum || '' }) + this.setData({ orderList: this.data.orderList, expendMoney: sum}) }, chooseCard: function () { if (this.data.columns.length > 0) { @@ -110,7 +110,7 @@ Page({ onHide: function(){ this.setData({ visible: false }) }, - checkoutAmount: function () { + checkAmount: function () { if (Number(this.data.expendMoney) <= 0) { util.showToast('提现金额必须大于0') return @@ -120,7 +120,7 @@ Page({ return } wx.showLoading({ title: '加载中', mask: true }) - paymentOrder({ bankId: this.data.chooseBankCard.cardId, ids: this.data.checkIds }).then(res => { + paymentOrder({ factoryPermittedBankId: this.data.chooseBankCard.cardId, ids: this.data.checkIds }).then(res => { wx.hideLoading() if(res.data.markedWords){ Dialog.alert({ title: '温馨提示', message: res.data.markedWords }).then(() => { diff --git a/pages/settlement/withdrawal/index.wxml b/pages/settlement/withdrawal/index.wxml index 454e5fa..ab815a9 100644 --- a/pages/settlement/withdrawal/index.wxml +++ b/pages/settlement/withdrawal/index.wxml @@ -25,7 +25,7 @@ - 账户余额￥{{formate.formateAmount(xsaccountMoney, 2)}} + 账户余额￥{{formate.formateAmount(sumMoney, 2)}} 全部提现 @@ -37,14 +37,14 @@ {{item.createTime}} - 金额：{{item.money}} + 金额：{{item.money}}元 - 申请提现 + 申请提现