From 918ae7e9a13192fa123ee394072a2408c9c3f35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 2 Sep 2024 14:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-shop-list-content.vue               | 35 +++++++-----------
 .../model-shop-tabs-content.vue               | 36 +++++++------------
 2 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 6ec65e6b..e6f558a0 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -66,9 +66,8 @@
 </template>
 <script setup lang="ts">
 import { get_math } from '@/utils';
-import ShopAPI from '@/api/shop';
-import { shopStore } from '@/store';
-const shop_store = shopStore();
+import { commonStore } from '@/store';
+const common_store = commonStore();
 
 const props = defineProps({
     value: {
@@ -124,27 +123,17 @@ const base_list = reactive({
     ],
 });
 
-const init = () => {
-    if (!shop_store.is_shop_api) {
-        shop_store.set_is_shop_api(true);
-        ShopAPI.getShop()
-            .then((res) => {
-                const { goods_category, brand_list } = res.data;
-                base_list.product_category_list = goods_category;
-                base_list.product_brand_list = brand_list;
-                shop_store.set_category_brand(goods_category, brand_list);
-            })
-            .catch((err) => {
-                shop_store.set_is_shop_api(false);
-            });
-    } else {
-        base_list.product_category_list = shop_store.category_list;
-        base_list.product_brand_list = shop_store.brand_list;
-    }
-};
-
 onBeforeMount(() => {
-    init();
+    nextTick(() => {
+        // 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止
+        const interval = setInterval(() => {
+            if (common_store.common.goods_category.length > 0 || common_store.common.brand_list.length > 0) {
+                base_list.product_category_list = common_store.common.goods_category;
+                base_list.product_brand_list = common_store.common.brand_list;
+                clearInterval(interval);
+            }
+        }, 1000);
+    });
 });
 
 const goods_list_remove = (index: number) => {
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index 2fa6f41c..d19203b2 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -94,9 +94,8 @@
 </template>
 <script setup lang="ts">
 import { get_math, tabs_style } from '@/utils';
-import ShopAPI from '@/api/shop';
-import { shopStore } from '@/store';
-const shop_store = shopStore();
+import { commonStore } from '@/store';
+const common_store = commonStore();
 
 const props = defineProps({
     value: {
@@ -162,29 +161,18 @@ const base_list = reactive({
         { name: '浏览量', value: '1' },
     ],
 });
-// 获取商品分类和品牌分类
-const init = () => {
-    // 判断是否有历史数据
-    if (!shop_store.is_shop_api) {
-        shop_store.set_is_shop_api(true);
-        ShopAPI.getShop()
-            .then((res) => {
-                const { goods_category, brand_list } = res.data;
-                base_list.product_category_list = goods_category;
-                base_list.product_brand_list = brand_list;
-                shop_store.set_category_brand(goods_category, brand_list);
-            })
-            .catch((err) => {
-                shop_store.set_is_shop_api(false);
-            });
-    } else {
-        base_list.product_category_list = shop_store.category_list;
-        base_list.product_brand_list = shop_store.brand_list;
-    }
-};
 
 onBeforeMount(() => {
-    init();
+    nextTick(() => {
+        // 定时获取common_store.common.article_category的数据，直到拿到值或者关闭页面为止
+        const interval = setInterval(() => {
+            if (common_store.common.goods_category.length > 0 || common_store.common.brand_list.length > 0) {
+                base_list.product_category_list = common_store.common.goods_category;
+                base_list.product_brand_list = common_store.common.brand_list;
+                clearInterval(interval);
+            }
+        }, 1000);
+    });
 });
 
 const active_index = ref(0);