From 402c9c9ebb591abcb17693ac290bbdef6bec7117 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Wed, 11 Nov 2026 14:46:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(buyer):=20=E4=BC=98=E5=8C=96=E9=A6=96?=
 =?UTF-8?q?=E5=B1=8F=E7=AB=99=E7=82=B9=E5=8F=8A=E4=B8=BB=E9=A2=98=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8E=BB=E9=87=8D=EF=BC=8C=E5=B9=B6=E5=9C=A8=E9=A1=B6?=
 =?UTF-8?q?=E6=A0=8F=E9=80=80=E5=87=BA=E6=97=B6=E8=81=94=E5=8A=A8=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=87=BA=E6=B3=A8=E9=94=80=E4=BC=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/App.vue                             | 23 +++-------
 .../indexDecorate/components/TopBar.vue       | 14 ++++++-
 buyer/src/composables/useSiteSettings.js      | 11 +++--
 buyer/src/utils/theme.js                      | 42 ++++++++++++-------
 4 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/buyer/src/App.vue b/buyer/src/App.vue
index 2545eb118..250c9d3d0 100644
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -8,8 +8,7 @@
 import { onMounted } from "vue";
 import { useRoute } from "vue-router";
 import storage from "@/plugins/storage";
-import { getBaseSite, getThemeSetting } from "@/api/common.js";
-import { fetchAndApplyTheme } from "@/utils/theme";
+import { loadSiteSettings } from "@/composables/useSiteSettings";
 import { useAppStore } from "@/stores/app";
 
 defineOptions({ name: "App" });
@@ -49,27 +48,15 @@ function init() {
     });
   }
   getSite();
-  getTheme();
 }
 
 function getSite() {
-  getBaseSite().then((res) => {
-    if (res.success && res.result.settingValue) {
-      try {
-        const data = JSON.parse(res.result.settingValue);
-        applySiteInfo(data);
-      } catch {
-        // 站点配置解析失败时使用缓存
-      }
+  loadSiteSettings().then((data) => {
+    if (data) {
+      applySiteInfo(data);
     }
   }).catch((err) => {
-    console.warn('获取站点配置失败', err);
-  });
-}
-
-function getTheme() {
-  fetchAndApplyTheme(getThemeSetting).catch((err) => {
-    console.warn('获取主题配置失败', err);
+    console.warn("获取站点配置失败", err);
   });
 }
 
diff --git a/buyer/src/components/indexDecorate/components/TopBar.vue b/buyer/src/components/indexDecorate/components/TopBar.vue
index e0232b20d..54f5c7920 100644
--- a/buyer/src/components/indexDecorate/components/TopBar.vue
+++ b/buyer/src/components/indexDecorate/components/TopBar.vue
@@ -37,6 +37,8 @@
 <script setup>
 import { computed } from 'vue';
 import Cookies from 'js-cookie';
+import storage from '@/plugins/storage';
+import { logout } from '@/api/account';
 
 const props = defineProps({
   options: {
@@ -69,12 +71,22 @@ const username = computed(() => {
   return '';
 });
 
-function handleLogout() {
+function clearLocalAuth() {
+  storage.removeItem('userInfo');
+  storage.removeItem('accessToken');
+  storage.removeItem('refreshToken');
+  storage.removeItem('cartNum');
   Cookies.remove('userInfo');
   Cookies.remove('accessToken');
   window.location.reload();
 }
 
+function handleLogout() {
+  logout().finally(() => {
+    clearLocalAuth();
+  });
+}
+
 const customStyle = computed(() => {
   const s = props.componentStyle || {};
   const opt = props.options || {};
diff --git a/buyer/src/composables/useSiteSettings.js b/buyer/src/composables/useSiteSettings.js
index 781523fa6..f094ca665 100644
--- a/buyer/src/composables/useSiteSettings.js
+++ b/buyer/src/composables/useSiteSettings.js
@@ -2,11 +2,14 @@ import { computed, onMounted, ref } from "vue";
 import { getBaseSite } from "@/api/common.js";
 import config from "@/config";
 
-// 同页的页头、页脚共享请求；每次重新进入页面时刷新，避免旧缓存覆盖后台设置。
+// 全局共享站点配置；应用生命周期内仅拉取一次，同页与切页均复用请求与结果。
 const settings = ref(null);
-let pendingRequest;
+let pendingRequest = null;
 
 export function loadSiteSettings() {
+  if (settings.value) {
+    return Promise.resolve(settings.value);
+  }
   if (!pendingRequest) {
     pendingRequest = getBaseSite()
       .then((res) => {
@@ -16,7 +19,9 @@ export function loadSiteSettings() {
         return settings.value;
       })
       .catch(() => settings.value)
-      .finally(() => { pendingRequest = null; });
+      .finally(() => {
+        pendingRequest = null;
+      });
   }
   return pendingRequest;
 }
diff --git a/buyer/src/utils/theme.js b/buyer/src/utils/theme.js
index 93d995925..e65738613 100644
--- a/buyer/src/utils/theme.js
+++ b/buyer/src/utils/theme.js
@@ -69,27 +69,39 @@ export function normalizeTheme(data = {}) {
   };
 }
 
+let pendingThemeRequest = null;
+
 export async function fetchAndApplyTheme(requestFn) {
   const cachedTheme = loadCachedTheme();
   if (cachedTheme) {
     applyThemeToDocument(normalizeTheme(cachedTheme));
   }
 
-  try {
-    const res = await requestFn();
-    if (res?.success && res?.result?.settingValue) {
-      const data = JSON.parse(res.result.settingValue);
-      const normalized = normalizeTheme(data);
-      applyThemeToDocument(normalized);
-      cacheTheme(normalized);
-      return normalized;
-    }
-  } catch (error) {
-    console.warn(
-      "[theme] 主题色加载失败，请确认 buyer-api 已启动且站点主题配置可用",
-      error
-    );
+  if (pendingThemeRequest) {
+    return pendingThemeRequest;
   }
 
-  return cachedTheme ? normalizeTheme(cachedTheme) : normalizeTheme();
+  pendingThemeRequest = (async () => {
+    try {
+      const res = await requestFn();
+      if (res?.success && res?.result?.settingValue) {
+        const data = JSON.parse(res.result.settingValue);
+        const normalized = normalizeTheme(data);
+        applyThemeToDocument(normalized);
+        cacheTheme(normalized);
+        return normalized;
+      }
+    } catch (error) {
+      console.warn(
+        "[theme] 主题色加载失败，请确认 buyer-api 已启动且站点主题配置可用",
+        error
+      );
+    } finally {
+      pendingThemeRequest = null;
+    }
+
+    return cachedTheme ? normalizeTheme(cachedTheme) : normalizeTheme();
+  })();
+
+  return pendingThemeRequest;
 }