From 9413b651e0f5c922a7271adcd8af67d9c0f04a72 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Wed, 12 Nov 2025 17:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=80=E7=A7=81?=
 =?UTF-8?q?=E6=9C=89=E8=A7=86=E8=A7=92=E5=88=B0=E6=88=91=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/customer/CustomerManagement.vue | 30 ++++++++++-----
 components/index/ContentDashboard.vue      | 24 ++++++------
 components/my/My.vue                       | 44 +++++++++++++++++++++-
 store/user.js                              | 31 ++++++++++++++-
 4 files changed, 105 insertions(+), 24 deletions(-)

diff --git a/components/customer/CustomerManagement.vue b/components/customer/CustomerManagement.vue
index 78e8bd4..287158e 100644
--- a/components/customer/CustomerManagement.vue
+++ b/components/customer/CustomerManagement.vue
@@ -3,7 +3,7 @@
     <!-- 顶部标题栏 -->
     <view class="header">
       <text class="header-title">客户管理</text>
-      <view v-if="useUserStore().getUserInfo?.roles?.some(r => ['admin','sys_admin'].includes(r))" style="display: flex;align-items: center;gap: 6px">
+      <view v-if="showPrivateSwitch" style="display: flex;align-items: center;gap: 6px">
         <view>私有</view><uv-switch v-model="filterSelf"></uv-switch>
       </view>
 
@@ -161,6 +161,7 @@
 
 <script setup>
 import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
+import { storeToRefs } from 'pinia';
 import FabPlus from '@/components/FabPlus.vue';
 import CustomerSummaryBrief from '@/components/customer/CustomerSummaryBrief.vue';
 import { usePagination } from '@/composables/usePagination';
@@ -171,7 +172,18 @@ import {
 } from '@/utils/customerMappings';
 
 // 筛选状态
-const filterSelf =ref(false);
+const userStore = useUserStore();
+const { userInfo, privateView } = storeToRefs(userStore);
+const filterSelf = computed({
+  get: () => privateView.value,
+  set: (val) => userStore.setPrivateView(val)
+});
+const currentUserId = computed(() =>
+  userInfo.value?.user?.userId || userInfo.value?.userId || null
+);
+const showPrivateSwitch = computed(() =>
+  userInfo.value?.roles?.some(r => ['admin','sys_admin'].includes(r))
+);
 const showFilter = ref(false);
 const filterStatus = ref('');
 
@@ -230,10 +242,10 @@ const formatDateTime = (dateTime) => {
 
 // 构建查询参数（包含筛选条件）
 const buildQueryParams = () => {
-  const params = {};
-
-    params.joinUserId = filterSelf.value? useUserStore().getUserInfo.user.userId : null
-  console.log(filterSelf.value? useUserStore().getUserInfo.user.userId : null)
+  const params = {
+    joinUserId: filterSelf.value && currentUserId.value ? currentUserId.value : null
+  };
+  console.log(filterSelf.value ? currentUserId.value : null)
 
 
   // 只有有效的筛选状态才添加statusList参数
@@ -373,8 +385,8 @@ watch(filterStatus, () => {
     // 重置分页状态
     reset();
     // 清除所有查询参数，只保留基础分页参数，保留用户id过滤参数
-    queryParams.value = {
-      joinUserId: filterSelf.value? useUserStore().getUserInfo.user.userId : null,
+  queryParams.value = {
+      joinUserId: filterSelf.value && currentUserId.value ? currentUserId.value : null,
       pageNum: 1,
       pageSize: 10
     };
@@ -390,7 +402,7 @@ watch(filterStatus, () => {
 watch(filterSelf, () => {
   console.log('筛选是否自己变化:', filterSelf.value);
   const params = buildQueryParams();
-  console.log('<UNK>:当前参数', params);
+  console.log('客户列表查询参数', params);
   updateParams(params);
 })
 
diff --git a/components/index/ContentDashboard.vue b/components/index/ContentDashboard.vue
index 815ca11..46b80c4 100644
--- a/components/index/ContentDashboard.vue
+++ b/components/index/ContentDashboard.vue
@@ -8,13 +8,7 @@
     
     
     <view class="dashboard-content" v-else>
-      <view
-        v-if="showPrivateSwitch"
-        class="private-filter"
-      >
-        <view>私有</view>
-        <uv-switch v-model="filterSelf"></uv-switch>
-      </view>
+
       <!-- 任务概览 -->
       <view class="task-overview">
       <view 
@@ -160,15 +154,20 @@
 
 <script setup>
 import { ref, onMounted, watch, computed } from 'vue';
+import { storeToRefs } from 'pinia';
 import { getTaskStatusType, getTaskStatusStyle, getStatusText } from '@/utils/taskConfig.js';
 import { getDashboardBrief, getTaskList } from '@/api';
 import { useUserStore } from '@/store/user';
 import {truncateText} from "@/utils/textSolve/truncateText";
 
 const userStore = useUserStore();
-const filterSelf = ref(false);
-const showPrivateSwitch = computed(() =>
-  userStore.getUserInfo?.roles?.some(r => ['admin', 'sys_admin'].includes(r))
+const { userInfo, privateView } = storeToRefs(userStore);
+const filterSelf = computed({
+  get: () => privateView.value,
+  set: (val) => userStore.setPrivateView(val)
+});
+const currentUserId = computed(() =>
+  userInfo.value?.user?.userId || userInfo.value?.userId || null
 );
 
 // 任务统计
@@ -339,9 +338,8 @@ const loadDashboardData = async () => {
       keys
     };
 
-    if (filterSelf.value) {
-      const joinUserId = userStore.userInfo?.user?.userId;
-      params.joinUserId = joinUserId;
+    if (filterSelf.value && currentUserId.value) {
+      params.joinUserId = currentUserId.value;
     }
 
     const res = await getDashboardBrief(params);
diff --git a/components/my/My.vue b/components/my/My.vue
index 5023154..a680b3c 100644
--- a/components/my/My.vue
+++ b/components/my/My.vue
@@ -1,5 +1,16 @@
 <template>
   <view class="mine-page">
+    <view 
+      class="card settings-card"
+      v-if="showPrivateSwitch"
+    >
+      <view class="setting-row">
+        <text class="setting-label">私有视角</text>
+        <uv-switch v-model="filterSelf" />
+      </view>
+      <text class="setting-desc">开启后仅展示分配给我的客户和任务数据</text>
+    </view>
+
     <view class="card">
 
       <uv-button type="error" :plain="true" @click="onLogout" :loading="loading">
@@ -10,12 +21,21 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
+import { storeToRefs } from 'pinia'
 import { useUserStore } from '@/store/user'
 import { logout } from '@/api/user'
 
 const loading = ref(false)
 const userStore = useUserStore()
+const { privateView, userInfo } = storeToRefs(userStore)
+const filterSelf = computed({
+  get: () => privateView.value,
+  set: (val) => userStore.setPrivateView(val)
+})
+const showPrivateSwitch = computed(() =>
+  userInfo.value?.roles?.some(r => ['admin', 'sys_admin'].includes(r))
+)
 
 const onLogout = async () => {
   if (loading.value) return
@@ -50,6 +70,28 @@ const onLogout = async () => {
   box-shadow: 0 6rpx 20rpx rgba(0, 0, 0, 0.04);
 }
 
+.settings-card {
+  margin-bottom: 24rpx;
+}
+
+.setting-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.setting-label {
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #111827;
+}
+
+.setting-desc {
+  margin-top: 14rpx;
+  font-size: 24rpx;
+  color: #6b7280;
+}
+
 .title {
   font-size: 30rpx;
   font-weight: 600;
diff --git a/store/user.js b/store/user.js
index 551fee7..8b16600 100644
--- a/store/user.js
+++ b/store/user.js
@@ -6,13 +6,24 @@ import { defineStore } from 'pinia'
  */
 export const useUserStore = defineStore('user', {
   state: () => {
+    const storedPrivateView = uni.getStorageSync('privateView')
+    const normalizePrivateView = () => {
+      if (typeof storedPrivateView === 'boolean') return storedPrivateView
+      if (storedPrivateView === '' || storedPrivateView === undefined || storedPrivateView === null) {
+        return false
+      }
+      return !!storedPrivateView
+    }
+
     return {
       // 用户 token
       token: uni.getStorageSync('token') || '',
       // 用户信息
       userInfo: uni.getStorageSync('userInfo') || null,
       // token 过期时间（可选）
-      tokenExpireTime: uni.getStorageSync('tokenExpireTime') || null
+      tokenExpireTime: uni.getStorageSync('tokenExpireTime') || null,
+      // 是否启用私有视角
+      privateView: normalizePrivateView()
     }
   },
 
@@ -38,6 +49,13 @@ export const useUserStore = defineStore('user', {
       return state.userInfo
     },
 
+    /**
+     * 获取私有视角设置
+     */
+    getPrivateView: (state) => {
+      return state.privateView
+    },
+
     /**
      * 判断 token 是否过期（如果设置了过期时间）
      */
@@ -93,11 +111,13 @@ export const useUserStore = defineStore('user', {
       this.token = ''
       this.userInfo = null
       this.tokenExpireTime = null
+      this.privateView = false
       
       // 清除本地存储
       uni.removeStorageSync('token')
       uni.removeStorageSync('userInfo')
       uni.removeStorageSync('tokenExpireTime')
+      uni.removeStorageSync('privateView')
     },
 
     /**
@@ -107,6 +127,15 @@ export const useUserStore = defineStore('user', {
      */
     updateToken(token, expireTime = null) {
       this.setToken(token, expireTime)
+    },
+
+    /**
+     * 设置私有视角
+     * @param {boolean} value
+     */
+    setPrivateView(value) {
+      this.privateView = value
+      uni.setStorageSync('privateView', value)
     }
   }
 })