From 9778069cf5bd5c0612cdddf00108752bb0136a93 Mon Sep 17 00:00:00 2001
From: pb4ustkri <2130793951@qq.com>
Date: Fri, 17 Oct 2025 18:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=B5=E7=A7=B0=E5=92=8Coc?=
 =?UTF-8?q?=E5=9C=A8=E5=9C=B0=E5=9B=BE=E4=B8=8A=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CommunityPage.vue          | 49 +++++++++++++++++--
 .../src/components/UserCenterDialog.vue       |  3 ++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/oc-community-frontend/src/components/CommunityPage.vue b/src/oc-community-frontend/src/components/CommunityPage.vue
index 30800aa..ea0b26f 100644
--- a/src/oc-community-frontend/src/components/CommunityPage.vue
+++ b/src/oc-community-frontend/src/components/CommunityPage.vue
@@ -95,13 +95,14 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
 import { User, Avatar, Phone } from '@element-plus/icons-vue'
 import PhoneWidget from './PhoneWidget.vue'
 import UserCenterDialog from './UserCenterDialog.vue'
 import OCListDialog from './OCListDialog.vue'
 import OCInfoDialog from './OCInfoDialog.vue'
-import { ocList } from '../stores/ocStore.js'
+import { ocList, loadOCFromStorage } from '../stores/ocStore.js'
+import { currentUser } from '../stores/userStore.js'
 
 // 默认头像
 const defaultAvatar = 'https://i.pravatar.cc/100?img=1'
@@ -125,6 +126,8 @@ const locationCoords = {
 const ocPositions = ref([])
 // 每个地点的实时状态（位置、在场人数、对应 oc 列表）
 const locationStatuses = ref([])
+// 是否已经按当前用户加载了专属 ocList
+const ocLoadedForUser = ref(false)
 
 const computePositions = () => {
   const now = new Date()
@@ -135,7 +138,14 @@ const computePositions = () => {
   Object.keys(locationCoords).forEach(k => {
     locMap[k] = { name: k, x: locationCoords[k].x, y: locationCoords[k].y, count: 0, ocs: [] }
   })
-  ocList.value.forEach(oc => {
+  // 选择用于计算位置的 OC 列表：优先使用为当前用户单独加载的列表；否则只使用含 owner 且属当前用户的 OC
+  const sourceList = ocLoadedForUser.value
+    ? ocList.value
+    : (currentUser.value && currentUser.value.username)
+      ? ocList.value.filter(o => o.owner && o.owner === currentUser.value.username)
+      : []
+
+  sourceList.forEach(oc => {
     let loc = ''
     if (oc.schedule && oc.schedule.length) {
       // 找到最近时间点 <= now 的活动
@@ -163,6 +173,19 @@ const computePositions = () => {
 
 let posTimer = null
 onMounted(() => {
+  // 尝试按当前用户加载其专属 OC 列表（如果用户已登录）
+  if (currentUser.value && currentUser.value.username) {
+    try {
+      loadOCFromStorage(currentUser.value.username)
+      ocLoadedForUser.value = true
+    } catch (e) {
+      console.error('Failed to load user-specific OC list:', e)
+      ocLoadedForUser.value = false
+    }
+  } else {
+    ocLoadedForUser.value = false
+  }
+
   computePositions()
   posTimer = setInterval(computePositions, 60 * 1000)
   document.addEventListener('click', closePopoverOnClickOutside)
@@ -172,6 +195,24 @@ onUnmounted(() => {
   document.removeEventListener('click', closePopoverOnClickOutside)
 })
 
+// 当登录用户变更时，尝试加载该用户的 OC 列表并刷新位置（确保地图只显示自己的 OC）
+watch(currentUser, (val) => {
+  if (val && val.username) {
+    try {
+      loadOCFromStorage(val.username)
+      ocLoadedForUser.value = true
+    } catch (e) {
+      console.error('Failed to load OC list for user on change:', e)
+      ocLoadedForUser.value = false
+    }
+  } else {
+    ocLoadedForUser.value = false
+    // 恢复为全局加载（不展示其他账号的 OC）
+    loadOCFromStorage()
+  }
+  computePositions()
+})
+
 // OC 信息弹窗与控制弹窗显示/隐藏
 const showOCInfo = ref(false)
 const selectedOC = ref(null)
@@ -230,7 +271,7 @@ const closePopoverOnClickOutside = (event) => {
 .community-container {
   display: flex;
   height: 100vh;
-  background: linear-gradient(135deg, #ffc6c6 0%, #7486c0 100%);
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
   position: relative;
   overflow: hidden;
 }
diff --git a/src/oc-community-frontend/src/components/UserCenterDialog.vue b/src/oc-community-frontend/src/components/UserCenterDialog.vue
index 8f5615d..9016aea 100644
--- a/src/oc-community-frontend/src/components/UserCenterDialog.vue
+++ b/src/oc-community-frontend/src/components/UserCenterDialog.vue
@@ -30,6 +30,9 @@
       <div class="personal-info">
         <h4>个人信息</h4>
         <el-form :model="userInfo" label-width="80px" size="small">
+            <el-form-item label="昵称">
+              <el-input v-model="userInfo.nickname" placeholder="请输入昵称" />
+            </el-form-item>
           <el-form-item label="生日">
             <el-date-picker
               v-model="userInfo.birthday"