From 3451ee849bb09fb656b8d94bf604e997b4cd17d9 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 25 Aug 2025 17:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/team/TeamBillMore.vue |  4 ++--
 src/views/HistorySalaryView.vue      | 16 +++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/components/team/TeamBillMore.vue b/src/components/team/TeamBillMore.vue
index de14774..da02bf1 100644
--- a/src/components/team/TeamBillMore.vue
+++ b/src/components/team/TeamBillMore.vue
@@ -44,7 +44,7 @@
             <!-- 左侧：用户信息 -->
             <div class="user-info">
               <div class="user-name">{{ member.memberProfile?.userNickname || 'Unknown User' }}</div>
-              <div class="user-id">ID: {{ member.memberProfile?.id || 'N/A' }}</div>
+              <div class="user-id">ID: {{ member.memberProfile?.account || 'N/A' }}</div>
               <div class="user-target">
                 <span class="target-badge">Target: A</span>
               </div>
@@ -58,7 +58,7 @@
               </div>
               <div class="time-info">
                 <span class="time-label">Time (Days):</span>
-                <span class="time-value">{{ calculateEffectiveDays(member.target?.onlineTime) }}</span>
+                <span class="time-value">{{ member.target.onlineTime }}</span>
               </div>
             </div>
           </div>
diff --git a/src/views/HistorySalaryView.vue b/src/views/HistorySalaryView.vue
index 061c682..933c1b0 100644
--- a/src/views/HistorySalaryView.vue
+++ b/src/views/HistorySalaryView.vue
@@ -149,14 +149,14 @@
           <h3>Work Report Help</h3>
           <button class="close-btn" @click="closeHelpModal">×</button>
         </div>
-        
+
         <div class="help-modal-body">
           <div class="help-section">
             <p class="help-description">
               Shown below is the work report of the members "More" can view more work detailed.
             </p>
           </div>
-          
+
           <div class="help-section">
             <h4>Status Description:</h4>
             <div class="status-list">
@@ -219,9 +219,10 @@ import { ref, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import MobileHeader from '../components/MobileHeader.vue'
 import { getTeamMemberWork } from '../api/teamBill.js'
+import {getUserId} from "@/utils/userStore.js";
 
 const router = useRouter()
-const totalSalary = ref('12345')
+const totalSalary = ref('0.00')
 const showSalaryModal = ref(false)
 const showHelpModal = ref(false)
 const loading = ref(false)
@@ -385,16 +386,9 @@ const closeHelpModal = () => {
   showHelpModal.value = false
 }
 
-// 显示薪资信息
-const showSalaryInfo = () => {
-  showSalaryModal.value = true
-}
-
 // 组件挂载时获取数据
 onMounted(() => {
-  // 从路由参数或者默认值获取用户ID
-  const userId = router.currentRoute.value.query.userId || '1911661502909562881'
-  fetchWorkReports(userId)
+  fetchWorkReports(getUserId())
 })
 </script>