From 284c72aa39b97edbd104005f654fcce33bc67f4f Mon Sep 17 00:00:00 2001
From: unknown <ihzero@163.com>
Date: Wed, 15 May 2024 10:57:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/statement/components/list1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/statement/components/list1.vue b/src/pages/statement/components/list1.vue
index 290c2ae..4c20fd3 100644
--- a/src/pages/statement/components/list1.vue
+++ b/src/pages/statement/components/list1.vue
@@ -24,7 +24,7 @@
       </view>
       <view class="flex-1">{{ item.store.title }}</view>
       <view class="flex-1" v-if="checkPermission(['admin'])">{{
-        item.expenditure
+        item.new_customers
       }}</view>
       <view class="flex-1" v-if="checkPermission(['admin'])">{{
         item.sales

From ca6c04348c6e4612dfc62f4602298b8aa935cc23 Mon Sep 17 00:00:00 2001
From: unknown <ihzero@163.com>
Date: Wed, 15 May 2024 11:38:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/statement/index.vue | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/pages/statement/index.vue b/src/pages/statement/index.vue
index 46cb6c1..a159d7e 100644
--- a/src/pages/statement/index.vue
+++ b/src/pages/statement/index.vue
@@ -4,7 +4,7 @@
     <uv-sticky bgColor="#fff" v-if="checkPermission(['admin'])">
       <StoreDown color="#333333" @change="storeChange"></StoreDown>
     </uv-sticky>
-    
+
     <view class="card">
       <uv-tabs
         :lineColor="'#ee2c37'"
@@ -27,11 +27,16 @@
         </view>
 
         <view class="text-center flex-1 tr">
-          <view class="flex-center h-80rpx" v-if="!isLotteryStore || checkPermission(['admin'])">
+          <view
+            class="flex-center h-80rpx"
+            v-if="!isLotteryStore || checkPermission(['admin'])"
+          >
             <view>支出金额</view>
           </view>
           <view class="flex-center h-80rpx" v-else>兑奖金额</view>
-          <view class="font-600 flex-center h-80rpx">{{ ledger.expenditure }}</view>
+          <view class="font-600 flex-center h-80rpx">{{
+            ledger.expenditure
+          }}</view>
         </view>
 
         <view class="text-center flex-1 tr">
@@ -219,7 +224,7 @@ function generateTimeArrayWithLastPeriod() {
             .toDate(),
           endDate: dayjs(timeRange.current.endDate)
             .subtract(1, 'month')
-            .endOf('month')
+            .endOf('month'),
         }
         break
       default:
@@ -261,12 +266,18 @@ const tabChange1 = (e) => {
 
 const getList = async () => {
   const url = tabIndex1.value == 0 ? '/statistics/sales' : '/statistics/stores'
-  const resData = await http.get(url, {
-    params: {
-      start_at: currentC.value.start,
-      end_at: currentC.value.end,
+  let params = {
+    start_at: currentC.value.start,
+    end_at: currentC.value.end
+  }
+  if (tabIndex.value == 0) {
+    params = {
+      ...params,
       ...shoreInfo.value,
-    },
+    }
+  }
+  const resData = await http.get(url, {
+    params: params,
   })
   list.value = resData
 }

From 3abe54740ef0be11a63842752e36c3db3dd28f1d Mon Sep 17 00:00:00 2001
From: unknown <ihzero@163.com>
Date: Wed, 15 May 2024 11:47:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97di?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/statement/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/statement/index.vue b/src/pages/statement/index.vue
index a159d7e..4e92319 100644
--- a/src/pages/statement/index.vue
+++ b/src/pages/statement/index.vue
@@ -270,12 +270,13 @@ const getList = async () => {
     start_at: currentC.value.start,
     end_at: currentC.value.end
   }
-  if (tabIndex.value == 0) {
+  if (tabIndex1.value == 0) {
     params = {
       ...params,
       ...shoreInfo.value,
     }
   }
+  
   const resData = await http.get(url, {
     params: params,
   })