From 3b457b4eb3b4e286a58b927f600a1e827f5b235e Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 19 May 2025 09:40:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat(specialAreaDetail):=20=20=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E8=A7=86=E9=A2=91=E4=B8=BB=E5=9B=BE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/specialArea/details.vue | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pages/specialArea/details.vue b/pages/specialArea/details.vue
index 3f05953..f6cf1a4 100644
--- a/pages/specialArea/details.vue
+++ b/pages/specialArea/details.vue
@@ -156,7 +156,7 @@
       <view class="pop_a">
         <view class="pop_tt">
           <view class="pop_t">
-            <img :src="imgUrlList[1]" alt="" />
+            <img :src="imgUrlList[0]" alt="" />
             <view>{{
               goodDetail.goodsPrice | numberToCurrency | isLocal
             }}</view>
@@ -251,6 +251,7 @@ export default {
       isWidth: 375,
       pkCountry: 1,
       countDown: "",
+      bannerImgList: []
     };
   },
  
@@ -267,11 +268,11 @@ export default {
   },
   computed: {
     ...mapGetters(["user", "shopCarLength"]),
-    bannerImgList() {
-      const list = this.imgUrlList.map(item => item)
-      list.splice(1,1)
-      return list
-    }
+    // bannerImgList() {
+    //   const list = this.imgUrlList.map(item => item)
+    //   list.splice(1,1)
+    //   return list
+    // }
   },
   methods: {  
     toIndex() {
@@ -359,7 +360,6 @@ export default {
           // this.goodDetail.sales = sl
           // this.mainImgUrl = res.data.videoUrl
           this.imgUrlList = [
-            res.data.videoUrl,
             res.data.cover,
             res.data.cover1,
             res.data.cover2,
@@ -368,9 +368,21 @@ export default {
             res.data.cover5,
             res.data.cover6,
           ];
+          this.bannerImgList = [
+            res.data.videoUrl,
+            res.data.cover1,
+            res.data.cover2,
+            res.data.cover3,
+            res.data.cover4,
+            res.data.cover5,
+            res.data.cover6,
+          ];
           this.imgUrlList = this.imgUrlList.filter(
             (item) => item && item.trim()
           );
+          this.bannerImgList = this.bannerImgList.filter(
+            (item) => item && item.trim()
+          );
           this.goodDetail.productParams.forEach((item, index) => {
             item.waresItemsParamsList.forEach((ctem, cndex) => {
               ctem.quantity = 0;

From 9f34a5cc9f872d96fcdc7da7d32dc84a7c8b9ad1 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 10:27:43 +0800
Subject: [PATCH 2/5] =?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;

From 835e6984ca0b17dc9bbd3331dd510d3842573e24 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 10:28:15 +0800
Subject: [PATCH 3/5] feat(request): update request

---
 config/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/request.js b/config/request.js
index 0e8c9e9..5fa9b1b 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 = 'http://localhost:8080';
+    config.baseURL = '/prod-api';
     //#endif
 
     //#ifdef QA_SERVER

From 1e1aa3a6a0ad41e144c521447cbb3a4df94b5595 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 10:33:55 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat(bonus):=20=E5=A5=96=E9=87=91=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86-=E5=90=88=E8=AE=A1=E6=A0=87=E9=A2=98=E6=94=B9?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bonus/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue
index 2e5b5b5..b98f474 100644
--- a/pages/bonus/index.vue
+++ b/pages/bonus/index.vue
@@ -9,8 +9,8 @@
 			</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 v-if="monthIncomeTotal" style="margin-right: 20rpx;">本月合计: <span>{{monthIncomeTotal | toThousandthAndKeepDecimal}}</span></view>
+			昨日合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span>
 		</view>
 		<template>
 			<sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" />

From 2df9abaf42e44c44a50eb581a3e8d96e0c8b84c4 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 20 May 2025 15:13:51 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat(bonus):=20=E5=A5=96=E9=87=91=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=90=88=E8=AE=A1=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bonus/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue
index b98f474..05d15c5 100644
--- a/pages/bonus/index.vue
+++ b/pages/bonus/index.vue
@@ -9,8 +9,8 @@
 			</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 v-if="monthIncomeTotal" >本月合计: <span>{{monthIncomeTotal | toThousandthAndKeepDecimal}}</span></view>
+			<view>昨日合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span></view>
 		</view>
 		<template>
 			<sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" />
@@ -152,12 +152,14 @@
 <style lang="scss">
 	.sum-val {
 		background-color: #fff;
-		height: 100rpx;
-		line-height: 100rpx;
+		// height: 100rpx;
+		line-height: 60rpx;
 		text-align: right;
 		margin-top: 10rpx;
 		padding-right: 20rpx;
 		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
 		justify-content: flex-end;
 		span {
 			font-size: 34rpx;