From 234bf52da6207128ce06f7abb833f3e3f562e104 Mon Sep 17 00:00:00 2001
From: zjwmiao <1723168479@qq.com>
Date: Tue, 28 Oct 2025 17:25:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=90=8C=E6=84=8Fcoo?=
 =?UTF-8?q?kie=E5=8C=BA=E5=88=86=E4=B8=AD=E8=8B=B1=E6=96=87=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src-new/components/CookieNotice.vue       | 88 ++++++++++++-------
 .../src-new/i18n/cookie/cookie-zh.ts          |  4 +-
 app/.vitepress/src-new/stores/common.ts       | 24 +----
 .../src-new/views/search/SearchResult.vue     |  7 +-
 .../src-new/views/search/TheSearch.vue        |  4 -
 app/.vitepress/src/shared/analytics/cookie.ts |  6 +-
 app/.vitepress/theme/index.ts                 |  6 ++
 7 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/app/.vitepress/src-new/components/CookieNotice.vue b/app/.vitepress/src-new/components/CookieNotice.vue
index 5a5eeca1e..900b288cc 100644
--- a/app/.vitepress/src-new/components/CookieNotice.vue
+++ b/app/.vitepress/src-new/components/CookieNotice.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, inBrowser } from 'vitepress';
 
 import {
@@ -15,11 +15,12 @@ import ContentWrapper from '~@/components/ContentWrapper.vue';
 
 // TODO:分析代码整改
 
-import { setCookie, removeCookie } from '~@/utils/common';
+import { setCookie, removeCookie, getCookie } from '~@/utils/common';
 
 import {
   COOKIE_AGREED_STATUS,
-  COOKIE_KEY,
+  COOKIE_KEY_EN,
+  COOKIE_KEY_ZH,
   useCookieStore,
 } from '~@/stores/common';
 
@@ -27,7 +28,6 @@ import { useScreen } from '~@/composables/useScreen';
 import { useLocale } from '~@/composables/useLocale';
 
 import IconClose from '~icons/app-new/icon-close.svg';
-import { useLogin } from '@/stores/login';
 
 const route = useRoute();
 
@@ -38,17 +38,25 @@ const cookieStore = useCookieStore();
 
 const COOKIE_DOMAIN = import.meta.env.VITE_COOKIE_DOMAIN;
 
+const cookieKey = computed(() => isZh.value ? COOKIE_KEY_ZH : COOKIE_KEY_EN);
+
 // 是否允许分析cookie
 const analysisAllowed = ref(false);
 
 // 是否未签署
 const isNotSigned = () => {
-  return cookieStore.getUserCookieStatus() === COOKIE_AGREED_STATUS.NOT_SIGNED;
+  if (isZh.value) {
+    return getCookie(cookieKey.value) !== COOKIE_AGREED_STATUS.NOT_SHOW_BUT_AGREED;
+  }
+  return (getCookie(cookieKey.value) ?? '0') === COOKIE_AGREED_STATUS.NOT_SIGNED;
 };
 
 // 是否全部同意
 const isAllAgreed = () => {
-  return cookieStore.getUserCookieStatus() === COOKIE_AGREED_STATUS.ALL_AGREED;
+  if (isZh.value) {
+    return getCookie(cookieKey.value) === COOKIE_AGREED_STATUS.NOT_SHOW_BUT_AGREED;
+  }
+  return getCookie(cookieKey.value) === COOKIE_AGREED_STATUS.ALL_AGREED;
 };
 
 // -------------------- 展示底部提示 --------------------
@@ -59,16 +67,20 @@ const toggleNoticeVisible = (val: boolean) => {
   } else {
     cookieStore.isNoticeVisible = !cookieStore.isNoticeVisible;
   }
+  if (!cookieStore.isNoticeVisible && isZh.value && getCookie(cookieKey.value) !== COOKIE_AGREED_STATUS.NOT_SHOW_BUT_AGREED) {
+    cookieStore.status = COOKIE_AGREED_STATUS.NOT_SHOW_BUT_AGREED;
+    setCookie(cookieKey.value, COOKIE_AGREED_STATUS.NOT_SHOW_BUT_AGREED, 180, COOKIE_DOMAIN);
+  }
 };
 
 // -------------------- 同意/拒绝cookie --------------------
 // 用户同意所有cookie
 const acceptAll = () => {
   cookieStore.status = COOKIE_AGREED_STATUS.ALL_AGREED;
-  removeCookie(COOKIE_KEY);
+  removeCookie(cookieKey.value);
   setCookie(
-    COOKIE_KEY,
-    `${COOKIE_AGREED_STATUS.ALL_AGREED}`,
+    cookieKey.value,
+    COOKIE_AGREED_STATUS.ALL_AGREED,
     180,
     COOKIE_DOMAIN
   );
@@ -78,10 +90,10 @@ const acceptAll = () => {
 // 用户拒绝所有cookie，即仅同意必要cookie
 const rejectAll = () => {
   cookieStore.status = COOKIE_AGREED_STATUS.NECCESSARY_AGREED;
-  removeCookie(COOKIE_KEY);
+  removeCookie(cookieKey.value);
   setCookie(
-    COOKIE_KEY,
-    `${COOKIE_AGREED_STATUS.NECCESSARY_AGREED}`,
+    cookieKey.value,
+    COOKIE_AGREED_STATUS.NECCESSARY_AGREED,
     180,
     COOKIE_DOMAIN
   );
@@ -145,17 +157,15 @@ const onDlgChange = (val: boolean) => {
 };
 
 // -------------------- 初次加载 --------------------
-if (inBrowser) {
-  // 未签署，展示cookie notice
+onMounted(() => {
   if (isNotSigned()) {
     toggleNoticeVisible(true);
+    if (isZh.value && getCookie(cookieKey.value) !== COOKIE_AGREED_STATUS.ALL_AGREED) {
+      cookieStore.status = COOKIE_AGREED_STATUS.ALL_AGREED;
+      setCookie(cookieKey.value, COOKIE_AGREED_STATUS.ALL_AGREED, 180, COOKIE_DOMAIN);
+    }
   }
-
-  if (cookieStore.isAllAgreed) {
-    cookieStore.status = COOKIE_AGREED_STATUS.ALL_AGREED;
-    analysisAllowed.value = true;
-  }
-}
+});
 
 // -------------------- 路由变化 --------------------
 watch(
@@ -174,20 +184,28 @@ watch(
     <div class="cookie-notice-content">
       <ContentWrapper class="cookie-notice-wrap">
         <div class="cookie-notice-left">
-          <p class="cookie-title">{{ t('cookie.title') }}</p>
-          <p class="cookie-desc">
+          <p v-if="isZh" class="cookie-desc" style="margin-top: 0;">
             {{ t('cookie.desc') }}
-            <a
-              :href="isZh ? '/zh/other/cookies/' : '/en/other/cookies/'"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
+            <a href="/zh/cookies" target="_blank" rel="noopener noreferrer">
               {{ t('cookie.link') }}
             </a>
-            {{ isZh ? '。' : '.' }}
           </p>
+          <template v-else>
+            <p class="cookie-title">{{ t('cookie.title') }}</p>
+            <p class="cookie-desc">
+              {{ t('cookie.desc') }}
+              <a
+                :href="isZh ? '/zh/other/cookies/' : '/en/other/cookies/'"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {{ t('cookie.link') }}
+              </a>
+              {{ isZh ? '。' : '.' }}
+            </p>
+          </template>
         </div>
-        <div class="cookie-notice-right">
+        <div v-if="!isZh" class="cookie-notice-right">
           <OButton round="pill" color="primary" @click="acceptAll">
             {{ t('cookie.acceptAll') }}
           </OButton>
@@ -199,7 +217,7 @@ watch(
           </OButton>
         </div>
 
-        <OIcon class="cookie-notice-close" @click="toggleNoticeVisible(false)">
+        <OIcon class="cookie-notice-close" :type="!isZh ? 'en' : ''" @click="toggleNoticeVisible(false)">
           <IconClose />
         </OIcon>
       </ContentWrapper>
@@ -330,13 +348,15 @@ watch(
 }
 
 .cookie-notice-close {
-  position: absolute;
-  top: 12px;
-  right: var(--layout-content-padding);
+  &[type="en"] {
+    position: absolute;
+    top: 12px;
+    right: var(--layout-content-padding);
+    transform-origin: center;
+  }
   @include x-hover;
   cursor: pointer;
   color: var(--o-color-info1);
-  transform-origin: center;
   @include h4;
 
   @include hover {
diff --git a/app/.vitepress/src-new/i18n/cookie/cookie-zh.ts b/app/.vitepress/src-new/i18n/cookie/cookie-zh.ts
index ee48fc4d5..2bfb9e732 100644
--- a/app/.vitepress/src-new/i18n/cookie/cookie-zh.ts
+++ b/app/.vitepress/src-new/i18n/cookie/cookie-zh.ts
@@ -1,7 +1,7 @@
 export default {
   title: 'openEuler社区重视您的隐私',
-  desc: '我们在本网站上使用Cookie，包括第三方Cookie，以便网站正常运行和提升浏览体验。单击“全部接受”即表示您同意这些目的；单击“全部拒绝”即表示您拒绝非必要的Cookie；单击“管理Cookie”以选择接受或拒绝某些Cookie。需要了解更多信息或随时更改您的Cookie首选项，请参阅我们的',
-  link: '《关于cookies》',
+  desc: '我们使用cookie来确保您的高速浏览体验。继续浏览本站，即表示您同意我们使用cookie。',
+  link: '查看详情',
   acceptAll: '全部接受',
   rejectAll: '全部拒绝',
   manage: '管理Cookie',
diff --git a/app/.vitepress/src-new/stores/common.ts b/app/.vitepress/src-new/stores/common.ts
index 779e47333..c55a15a3b 100644
--- a/app/.vitepress/src-new/stores/common.ts
+++ b/app/.vitepress/src-new/stores/common.ts
@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia';
-import { getCookie } from '~@/utils/common';
 
 /**
  * 风格
@@ -15,8 +14,12 @@ export const COOKIE_AGREED_STATUS = {
   NOT_SIGNED: '0', // 未签署
   ALL_AGREED: '1', // 同意所有cookie
   NECCESSARY_AGREED: '2', // 仅同意必要cookie
+  NOT_SHOW_BUT_AGREED: '3', // 不再显示但已同意
 };
 
+export const COOKIE_KEY_ZH = 'agreed-cookiepolicy-zh';
+export const COOKIE_KEY_EN = 'agreed-cookiepolicy-en';
+
 export const COOKIE_KEY = 'agreed-cookiepolicy';
 
 /**
@@ -27,25 +30,6 @@ export const useCookieStore = defineStore('cookie', {
     status: '0',
     isNoticeVisible: false,
   }),
-  getters: {
-    isAllAgreed: (state) => state.status === '1',
-  },
-  actions: {
-    getUserCookieStatus() {
-      const cookieVal = getCookie(COOKIE_KEY) ?? '0';
-      const cookieStatusVal = cookieVal[0];
-      if (cookieStatusVal === COOKIE_AGREED_STATUS.ALL_AGREED) {
-        this.status = COOKIE_AGREED_STATUS.ALL_AGREED;
-        return COOKIE_AGREED_STATUS.ALL_AGREED;
-      } else if (cookieStatusVal === COOKIE_AGREED_STATUS.NECCESSARY_AGREED) {
-        this.status = COOKIE_AGREED_STATUS.NECCESSARY_AGREED;
-        return COOKIE_AGREED_STATUS.NECCESSARY_AGREED;
-      } else {
-        this.status = COOKIE_AGREED_STATUS.NOT_SIGNED;
-        return COOKIE_AGREED_STATUS.NOT_SIGNED;
-      }
-    },
-  },
 });
 
 // -------------------- 移动端 --------------------
diff --git a/app/.vitepress/src-new/views/search/SearchResult.vue b/app/.vitepress/src-new/views/search/SearchResult.vue
index 8610e383c..991cba6f1 100644
--- a/app/.vitepress/src-new/views/search/SearchResult.vue
+++ b/app/.vitepress/src-new/views/search/SearchResult.vue
@@ -37,8 +37,6 @@ import { SCENARIO_LIST, archMap } from '~@/data/download/download';
 
 import type { AppItemT } from '~@/@types/type-search';
 
-import { useCookieStore } from '@/stores/common';
-
 import IconChevronRight from '~icons/app-new/icon-chevron-right.svg';
 
 import NotFound from '@/NotFound.vue';
@@ -126,7 +124,6 @@ const { searchType, currentPage, pageSize, activeVersion, activeSort } =
   useVModels(props, emits);
 
 const { locale } = useLocale();
-const cookieStore = useCookieStore();
 const { lePadV, lePad } = useScreen();
 
 const contentRef = ref();
@@ -169,9 +166,7 @@ const getLink = (data: any) => {
 };
 
 function handleLinkClick(data: any, index: number) {
-  if (cookieStore.isAllAgreed) {
-    reportSelectSearchResult(data, index, getLink(data), props.searchVal);
-  }
+  reportSelectSearchResult(data, index, getLink(data), props.searchVal);
 }
 //
 const downloadZoneData = computed(() => {
diff --git a/app/.vitepress/src-new/views/search/TheSearch.vue b/app/.vitepress/src-new/views/search/TheSearch.vue
index 4a436de15..43248fffe 100644
--- a/app/.vitepress/src-new/views/search/TheSearch.vue
+++ b/app/.vitepress/src-new/views/search/TheSearch.vue
@@ -9,7 +9,6 @@ import type { SearchCountResItemT, AppItemT } from '~@/@types/type-search';
 import { getSoftwareDocs } from '~@/api/api-search';
 
 import { useSearchValue } from '~@/stores/search';
-import { useCookieStore } from '~@/stores/common';
 import { useScreen } from '~@/composables/useScreen';
 import { useLocale } from '~@/composables/useLocale';
 
@@ -142,9 +141,6 @@ const suggestList = ref([]);
 //
 const activeVersion = ref('');
 
-// cookie
-const cookieStore = useCookieStore();
-
 function getVersionTag() {
   versionList.value = communityVersionData[locale.value].COMMUNITY_LIST.reduce(
     (versions, currentValue) => {
diff --git a/app/.vitepress/src/shared/analytics/cookie.ts b/app/.vitepress/src/shared/analytics/cookie.ts
index aedb86a6f..82ba5f79c 100644
--- a/app/.vitepress/src/shared/analytics/cookie.ts
+++ b/app/.vitepress/src/shared/analytics/cookie.ts
@@ -7,14 +7,10 @@ export function setIsCookieAgreed(fn: () => boolean) {
 // 监听cookie set
 export default function startListenCookieSet(callback: () => void) {
   const origDesc = Object.getOwnPropertyDescriptor(Document.prototype, 'cookie')!;
-  Object.defineProperty(Document.prototype, '_cookie', origDesc);
   Object.defineProperty(Document.prototype, 'cookie', {
     ...origDesc,
-    get() {
-      return this['_cookie'];
-    },
     set(val: string) {
-      this['_cookie'] = val;
+      origDesc.set?.call(this, val);
       callback();
     },
   });
diff --git a/app/.vitepress/theme/index.ts b/app/.vitepress/theme/index.ts
index da7f7666c..3eec07e20 100644
--- a/app/.vitepress/theme/index.ts
+++ b/app/.vitepress/theme/index.ts
@@ -24,6 +24,8 @@ import NotFound from '@/NotFound.vue';
 import { installer } from '@/shared/analytics';
 import { reporAnalytics } from '@/api/api-analytics';
 import { removeCustomCookie } from '@/shared/utils';
+import { getCookie } from '~@/utils/common';
+import { COOKIE_KEY_EN } from '~@/stores/common';
 
 export default {
   Layout,
@@ -69,6 +71,10 @@ export default {
           keys.forEach(key => storage.removeItem(key));
         })
       },
+      isCookieAgreed() {
+        if (window.location.pathname.startsWith('/zh')) return true;
+        return getCookie(COOKIE_KEY_EN) === '1';
+      },
       request(data) {
         reporAnalytics(data)
       },
-- 
Gitee