From f00cf327bf3baf7c3855d40daae528d476cf2055 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 7 Feb 2023 15:53:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=92=B1=E5=8C=85=E3=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E3=80=81=E4=BD=A3=E9=87=91=E9=A1=B5=E9=9D=A2=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=BD=93=E5=A4=A9=E5=8F=8A=E4=BB=A5=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/wallet/commission.vue | 17 +++++++++++++----
 pages/user/wallet/money.vue      |  7 ++++---
 pages/user/wallet/score.vue      |  9 +++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/pages/user/wallet/commission.vue b/pages/user/wallet/commission.vue
index f301076a..4e6e2c3e 100644
--- a/pages/user/wallet/commission.vue
+++ b/pages/user/wallet/commission.vue
@@ -47,7 +47,12 @@
     <su-sticky>
       <!-- 统计 -->
       <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime">
+        <uni-datetime-picker
+          v-model="state.data"
+          type="daterange"
+          @change="onChangeTime"
+          :end="state.today"
+        >
           <button class="ss-reset-button date-btn">
             <text>{{ dateFilterText }}</text>
             <text class="cicon-drop-down ss-seldate-icon"></text>
@@ -158,6 +163,7 @@
     pagination,
     loadStatus: '',
     showModal: false,
+    today: '',
   });
 
   const tabMaps = [
@@ -251,11 +257,14 @@
       },
     });
   }
-
+  async function getAgentInfo() {
+    const { code, data } = await sheep.$store('user').getAgentInfo();
+  }
   onLoad(async (options) => {
-    const today = dayjs().format('YYYY-MM-DD');
-    state.date = [today, today];
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
     getLogList();
+    getAgentInfo();
   });
 
   onReachBottom(() => {
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
index 4e918387..82d922ed 100644
--- a/pages/user/wallet/money.vue
+++ b/pages/user/wallet/money.vue
@@ -23,7 +23,7 @@
     <su-sticky>
       <!-- 统计 -->
       <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime">
+        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
           <button class="ss-reset-button date-btn">
             <text>{{ dateFilterText }}</text>
             <text class="cicon-drop-down ss-seldate-icon"></text>
@@ -98,6 +98,7 @@
     currentTab: 0,
     pagination,
     loadStatus: '',
+    today: '',
   });
 
   const tabMaps = [
@@ -149,8 +150,8 @@
     }
   }
   onLoad(async (options) => {
-    const today = dayjs().format('YYYY-MM-DD');
-    state.date = [today, today];
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
     getLogList();
   });
 
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index 7c0dbab6..74c02ed0 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -14,7 +14,7 @@
       <view class="score-box ss-flex-col ss-row-center ss-col-center">
         <view class="ss-m-b-30">
           <text class="all-title ss-m-r-8">当前积分</text>
-          <text class="cicon-help-o"></text>
+          <!-- <text class="cicon-help-o"></text> -->
         </view>
         <text class="all-num">{{ userInfo.score || 0 }}</text>
       </view>
@@ -23,7 +23,7 @@
     <su-sticky :customNavHeight="sys_navBar">
       <!-- 统计 -->
       <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
-        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime">
+        <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
           <button class="ss-reset-button date-btn">
             <text>{{ dateFilterText }}</text>
             <text class="cicon-drop-down ss-seldate-icon"></text>
@@ -99,6 +99,7 @@
     pagination,
     loadStatus: '',
     date: [],
+    today:'',
   });
 
   const tabMaps = [
@@ -150,8 +151,8 @@
     }
   }
   onLoad(async (options) => {
-    const today = dayjs().format('YYYY-MM-DD');
-    state.date = [today, today];
+    state.today = dayjs().format('YYYY-MM-DD');
+    state.date = [state.today, state.today];
     getLogList();
   });