From 9f34a5cc9f872d96fcdc7da7d32dc84a7c8b9ad1 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 10:27:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(bonus):=20=E5=A5=96=E9=87=91=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=9C=AC=E6=9C=88?=
 =?UTF-8?q?=E5=AE=9E=E5=8F=91=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/request.js     | 2 +-
 pages/bonus/index.vue | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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 @@
 			</view>
 		</scroll-view>
 		<view class="sum-val">
+			<view v-if="monthIncomeTotal" style="margin-right: 20rpx;">本月实发合计: <span>{{monthIncomeTotal | toThousandthAndKeepDecimal}}</span></view>
 			昨日实发合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span>
 		</view>
 		<template>
@@ -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;