diff --git a/config/request.js b/config/request.js
index 5fa9b1b..0e8c9e9 100644
--- a/config/request.js
+++ b/config/request.js
@@ -13,7 +13,7 @@ module.exports = (vm) => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = '/prod-api';
+ config.baseURL = 'http://localhost:8080';
//#endif
//#ifdef QA_SERVER
diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue
index ab22769..2e5b5b5 100644
--- a/pages/bonus/index.vue
+++ b/pages/bonus/index.vue
@@ -9,6 +9,7 @@
+ 本月实发合计: {{monthIncomeTotal | toThousandthAndKeepDecimal}}
昨日实发合计: {{toSum | toThousandthAndKeepDecimal}}
@@ -93,7 +94,8 @@
page: {
pageSize: 50,
pageNum: 1,
- }
+ },
+ monthIncomeTotal: 0,
}
},
components: {
@@ -112,7 +114,9 @@
methods: {
getSum() {
api1.queryBonusTotal({}).then((res) => {
+ console.log(res, '....res====aa')
this.toSum = res.rows[0].realIncomeTotal
+ this.monthIncomeTotal = res.rows[0].monthIncomeTotal
})
},
bindPickerChange(e) {
@@ -153,7 +157,8 @@
text-align: right;
margin-top: 10rpx;
padding-right: 20rpx;
-
+ display: flex;
+ justify-content: flex-end;
span {
font-size: 34rpx;
font-weight: bold;