diff --git a/src/pages/financial/balanceSummary.vue b/src/pages/financial/balanceSummary.vue index a5c88bb..3b28ef7 100644 --- a/src/pages/financial/balanceSummary.vue +++ b/src/pages/financial/balanceSummary.vue @@ -7,20 +7,7 @@ - - - - + @@ -89,7 +76,7 @@ {{ item.account12 }} - +
{{ '国家' }} - - - - {{ item.pkCountryName }} - -
{{ '消费账户余额' + `(${isLocalSymbol()})` }} {{ item.account1 }}
@@ -218,6 +205,10 @@ export default { }, }; }, + onReachBottom() { + this.queryParams.pageNum++; + this.getSearch(); + }, onLoad(options) { if (uni.getStorageSync("userAll")) { this.userCountry = JSON.parse(uni.getStorageSync("userAll")).country; @@ -232,7 +223,7 @@ export default { isLocalSymbol, isLocals, // 设置默认日期,最大值为今天,最小值为去年今天 -chooseTimed() { + chooseTimed() { let date = new Date(); let year = date.getFullYear(); let month = date.getMonth() + 1; @@ -257,20 +248,14 @@ chooseTimed() { this.showData = obj; }); }, - onReachBottom() { - this.queryParams.pageNum++; - this.getSearch(); - }, + getSearch() { api .getBalanceSummaryList(Object.assign({}, this.queryParams, this.select)) .then((res) => { this.total = res.total; - this.tableData = res.rows; - this.tableData.forEach((item) => { - item.pkCountryName = this.userCountry.shortName; - item.pkCountryIcon = this.userCountry.nationalFlag2; - }); + this.tableData = this.tableData.concat(res.rows); + }); }, getList1() { diff --git a/src/pages/financial/walletDetails.vue b/src/pages/financial/walletDetails.vue index 10b82b5..ab9bb21 100644 --- a/src/pages/financial/walletDetails.vue +++ b/src/pages/financial/walletDetails.vue @@ -23,19 +23,7 @@ :key="index"> - - - - + @@ -45,11 +33,11 @@ - + - + diff --git a/src/pages/financial/walletDetailsPro.vue b/src/pages/financial/walletDetailsPro.vue index d50ca6f..6dcc86e 100644 --- a/src/pages/financial/walletDetailsPro.vue +++ b/src/pages/financial/walletDetailsPro.vue @@ -23,19 +23,7 @@ :key="index">
{{ '国家' }} - - - - - {{ item.pkCountryName }} - -
{{ '会员编号' }} {{ item.memberCode }}{{ item.memberName }}
{{ '体系名称' }}隶属体系 {{ item.vertexName }}
{{ '团队名称' }}隶属团队 {{ item.teamName }}
- - - - + @@ -44,6 +32,14 @@ + + + + + + + + @@ -56,18 +52,10 @@ - - - - - - - - diff --git a/vue.config.js b/vue.config.js index f99e183..77b9746 100644 --- a/vue.config.js +++ b/vue.config.js @@ -10,12 +10,19 @@ module.exports = { open: true, port: 8099, proxy: { + // '/prod-api': { + // target: 'http://localhost:8080', + // changeOrigin: true, + // pathRewrite: { + // '^/prod-api': '' + // } + // }, '/prod-api': { - target: 'http://localhost:8080', + target: 'http://t-mana.beida413.com', changeOrigin: true, - pathRewrite: { - '^/prod-api': '' - } + // pathRewrite: { + // '^/prod-api': '' + // } } } },
{{ '国家' }} - - - - - {{ item.pkCountryName }} - -
{{ '会员编号' }} {{ item.memberCode }}{{ '会员姓名' }} {{ item.memberName }}
隶属体系{{ item.vertexName }}
隶属团队{{ item.teamName }}
{{ '钱包类型' }} {{ item.pkAccountVal }}{{ '交易金额' }}({{ isLocalSymbol() }}) {{ item.tradeAmount }}
{{ '交易金额' }}({{ isLocals() }}){{ item.settleTradeAmount }}
{{ '交易余额' }}({{ isLocalSymbol() }}) {{ item.tradeBalance }}
{{ '交易余额' }}({{ isLocals() }}){{ item.settleTradeBalance }}
{{ '交易备注' }} {{ item.remarks }}