From 8f9c980ad2f72537485c77ce5f124fda98736c37 Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Wed, 7 May 2025 11:57:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(specialArea):=20=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80map=E5=A4=84=E7=90=86=EF=BC=8C=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=B7=BB=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i8n.js                                     | 20 +++++-----
 src/components/HeaderTop.vue               |  4 +-
 src/components/special-area-list/index.vue | 27 ++++++++-----
 src/mixins/special-list-mixin.js           | 45 ++++------------------
 src/util/special-area-map.js               | 34 ++++++++++++++++
 src/views/goodsDetails/index.vue           | 27 +++----------
 src/views/shoppingMall/index.vue           | 16 ++++++--
 7 files changed, 89 insertions(+), 84 deletions(-)
 create mode 100644 src/util/special-area-map.js

diff --git a/i8n.js b/i8n.js
index 9758fc4..a389a63 100644
--- a/i8n.js
+++ b/i8n.js
@@ -579,17 +579,17 @@ module.exports = {
   ENU_MENU_303: "免费注册",
   ENU_MENU_310: "注册专区",
   ENU_MENU_311: "自营专区",
-  ENU_MENU_312: "乐学易考",
+  ENU_MENU_312: "乐学甄选",
   ENU_MENU_320: "升级专区",
   ENU_MENU_321: "自营专区",
-  ENU_MENU_322: "乐学易考",
+  ENU_MENU_322: "乐学甄选",
   ENU_MENU_323: "海粉专区",
   ENU_MENU_330: "复购专区",
   ENU_MENU_331: "自营专区",
   ENU_MENU_332: "复购合作",
   ENU_MENU_333: "工具流",
   ENU_MENU_334: "直播专区",
-  ENU_MENU_335: "乐学易考",
+  ENU_MENU_335: "乐学甄选",
   ENU_MENU_336: "三方供应",
   ENU_MENU_340: "福利专区",
   ENU_MENU_350: "积分专区",
@@ -962,9 +962,9 @@ module.exports = {
   ENU_TRADE_T_121: "商品专区",
   ENU_TRADE_T_122: "复购合作",
   ENU_TRADE_T_123: "二次发货",
-  ENU_TRADE_T_124: "乐学易考注册订单",
-  ENU_TRADE_T_125: "乐学易考升级订单",
-  ENU_TRADE_T_126: "乐学易考复购订单",
+  ENU_TRADE_T_124: "乐学甄选注册订单",
+  ENU_TRADE_T_125: "乐学甄选升级订单",
+  ENU_TRADE_T_126: "乐学甄选复购订单",
   ENU_TRADE_T_127: "海粉升级",
   ENU_TRADE_T_128: "创客订单",
   ENU_TRADE_T_129: "续约订单",
@@ -1012,9 +1012,9 @@ module.exports = {
   ENU_TRADE_T_619: "商品订单撤单返钱",
   ENU_TRADE_T_620: "合作订单撤单返钱",
   ENU_TRADE_T_621: "二次发货撤单返钱",
-  ENU_TRADE_T_622: "乐学易考注册订单撤单返钱",
-  ENU_TRADE_T_623: "乐学易考升级订单撤单返钱",
-  ENU_TRADE_T_624: "乐学易考复购订单撤单返钱",
+  ENU_TRADE_T_622: "乐学甄选注册订单撤单返钱",
+  ENU_TRADE_T_623: "乐学甄选升级订单撤单返钱",
+  ENU_TRADE_T_624: "乐学甄选复购订单撤单返钱",
   ENU_TRADE_T_625: "海粉升级订单撤单返钱",
   ENU_TRADE_T_628: "创客订单",
   ENU_TRADE_T_629: "续约订单",
@@ -2850,7 +2850,7 @@ module.exports = {
   w_0026: "账号安全",
   w_0027: "地址管理",
   w_0028: "退出登录",
-  w_0029: "乐学易考",
+  w_0029: "乐学甄选",
   w_0030: "安置架构",
   w_0031: "推荐架构",
   w_0032: "简体中文",
diff --git a/src/components/HeaderTop.vue b/src/components/HeaderTop.vue
index 99b26b6..8121eba 100644
--- a/src/components/HeaderTop.vue
+++ b/src/components/HeaderTop.vue
@@ -176,6 +176,7 @@ import * as api from "@/api/goods.js";
 import * as ads from "@/api/register.js";
 import specialListMixin from "@/mixins/special-list-mixin.js";
 import { mapGetters } from "vuex";
+console.log(specialListMixin, "....specialListMixin");
 export default {
   name: "Tabbar",
   mixins: [specialListMixin],
@@ -336,7 +337,7 @@ export default {
               if (ctem.name == item.menuKey) {
                 ctem.isShow = true;
               }
-              if (ctem.children.length > 0) {
+              if (ctem.children?.length > 0) {
                 ctem.children.forEach((stem) => {
                   if (stem.name == item.menuKey) {
                     stem.isShow = true;
@@ -344,7 +345,6 @@ export default {
                   }
                 });
               }
-              console.log(ctem.value == 13);
               if (ctem.value == 13) {
                 ctem.isShow = false;
               }
diff --git a/src/components/special-area-list/index.vue b/src/components/special-area-list/index.vue
index 0f3d9f2..4d437b6 100644
--- a/src/components/special-area-list/index.vue
+++ b/src/components/special-area-list/index.vue
@@ -39,7 +39,7 @@
 
 <script>
 import { numberToCurrencyNo, isLocal } from "@/util/numberToCurrency";
-
+import { specialAreaMap } from "@/util/special-area-map.js";
 export default {
   props: {
     title: {
@@ -64,18 +64,25 @@ export default {
       return isLocal(numberToCurrencyNo(price));
     },
     goToMore(specialArea) {
-      console.log(
-        "🚀 ~ goToMore ~ specialArea",
-        specialArea,
-        this.specialAreaId
-      );
       if (this.$router && this.specialAreaId) {
+        const query = {
+          // 如果specialArea为26 乐学甄选，则父级id为3 复购专区
+          id:
+            specialArea === specialAreaMap.ezLearnRep.value
+              ? specialAreaMap.repurchase.value
+              : this.specialAreaId,
+        };
+        if (
+          specialArea !== query.id ||
+          specialArea === specialAreaMap.self.value
+        ) {
+          Object.assign(query, {
+            idTh: specialArea,
+          });
+        }
         this.$router.push({
           path: "/shoppingMall",
-          query: {
-            idTh: specialArea || this.specialAreaId,
-            id: this.specialAreaId,
-          },
+          query,
         });
       } else if (!this.specialAreaId) {
         console.error("Special area ID (code) is missing.");
diff --git a/src/mixins/special-list-mixin.js b/src/mixins/special-list-mixin.js
index e3717dc..d5ecbc0 100644
--- a/src/mixins/special-list-mixin.js
+++ b/src/mixins/special-list-mixin.js
@@ -1,47 +1,16 @@
+import { specialAreaMap } from "@/util/special-area-map.js";
+console.log(specialAreaMap, "....specialAreaMap");
 export default {
   data() {
     return {
       zoneList: [
+        specialAreaMap.regiest,
+        specialAreaMap.upgrade,
         {
-          label: "注册专区",
-          value: 24,
-          name: "regiest",
-          defaultChildId: 24,
-          children: [],
-        },
-        {
-          label: "升级专区",
-          value: 25,
-          name: "upgrade",
-          defaultChildId: 25,
-          children: [],
-        },
-
-        {
-          label: "复购专区",
-          value: 3,
-          name: "repurchase",
-          children: [
-            {
-              label: "乐学易考",
-              value: 26,
-              name: "ezLearnRep",
-            },
-
-            {
-              label: "自营专区",
-              value: 3,
-              name: "self",
-            },
-          ],
-        },
-
-        {
-          label: "重消专区",
-          value: 10,
-          children: [],
-          name: "rescission",
+          ...specialAreaMap.repurchase,
+          children: [specialAreaMap.ezLearnRep, specialAreaMap.self],
         },
+        specialAreaMap.rescission,
         {
           label: "续约专区",
           value: 30,
diff --git a/src/util/special-area-map.js b/src/util/special-area-map.js
new file mode 100644
index 0000000..607c529
--- /dev/null
+++ b/src/util/special-area-map.js
@@ -0,0 +1,34 @@
+export const specialAreaMap = {
+  // 父级id 3
+  ezLearnRep: {
+    label: "乐学甄选",
+    value: 26,
+    name: "ezLearnRep",
+  },
+  repurchase: {
+    label: "复购专区",
+    value: 3,
+    name: "repurchase",
+  },
+  // 父级id 3
+  self: {
+    label: "自营专区",
+    value: 3,
+    name: "self",
+  },
+  upgrade: {
+    label: "升级专区",
+    value: 25,
+    name: "upgrade",
+  },
+  regiest: {
+    label: "注册专区",
+    value: 24,
+    name: "regiest",
+  },
+  rescission: {
+    label: "重消专区",
+    value: 10,
+    name: "rescission",
+  },
+};
diff --git a/src/views/goodsDetails/index.vue b/src/views/goodsDetails/index.vue
index 7e39d96..540dc11 100644
--- a/src/views/goodsDetails/index.vue
+++ b/src/views/goodsDetails/index.vue
@@ -289,7 +289,7 @@ import Sidebar from "@/components/Sidebar.vue";
 import * as api from "@/api/goods.js";
 import { mapGetters } from "vuex";
 import selSpaceGoods from "@/components/selSpaceGoods.vue";
-
+import { specialAreaMap } from "@/util/special-area-map.js";
 export default {
   components: {
     personInfo,
@@ -344,9 +344,7 @@ export default {
           ],
         },
         {
-          label: "注册专区",
-          value: 24,
-          name: "regiest",
+          ...specialAreaMap.regiest,
           children: [
             {
               label: "自营专区",
@@ -356,9 +354,7 @@ export default {
           ],
         },
         {
-          label: "升级专区",
-          value: 25,
-          name: "upgrade",
+          ...specialAreaMap.upgrade,
           children: [
             {
               label: "自营专区",
@@ -373,9 +369,7 @@ export default {
           ],
         },
         {
-          label: "复购专区",
-          value: 3,
-          name: "repurchase",
+          ...specialAreaMap.repurchase,
           children: [
             {
               label: "自营专区",
@@ -392,11 +386,7 @@ export default {
               value: 22,
               name: "cooperation",
             },
-            {
-              label: "乐学易考",
-              value: 26,
-              name: "ezLearnRep",
-            },
+            specialAreaMap.ezLearnRep,
             {
               label: "直播专区",
               value: 14,
@@ -421,12 +411,7 @@ export default {
         //   children: [],
         //   name: 'integral',
         // },
-        {
-          label: "重消专区",
-          value: 10,
-          children: [],
-          name: "rescission",
-        },
+        specialAreaMap.rescission,
       ],
     };
   },
diff --git a/src/views/shoppingMall/index.vue b/src/views/shoppingMall/index.vue
index 8f8737b..60e73fe 100644
--- a/src/views/shoppingMall/index.vue
+++ b/src/views/shoppingMall/index.vue
@@ -262,7 +262,7 @@
                 </div>
                 <!-- <img class="addCarImg" :src="addCarImg3" alt=""> -->
                 <div class="addCarImg1">
-                  <img :src="addCarImg2" alt="" />
+                  <i class="el-icon-shopping-cart-2"></i>
                   <div>加入购物车</div>
                 </div>
                 <div class="md">
@@ -364,7 +364,10 @@
                   "
                   @click.stop="addToCar($event, item)"
                 >
-                  <img :src="addCarImg1" alt="" />
+                  <i
+                    class="el-icon-shopping-cart-2"
+                    style="font-size: 16px; font-weight: 600; margin-right: 8px"
+                  ></i>
                   <div>加入购物车</div>
                 </div>
                 <div class="md">
@@ -674,7 +677,7 @@ export default {
             if (ctem.name == item.menuKey) {
               ctem.isShow = true;
             }
-            if (ctem.children.length > 0) {
+            if (ctem.children?.length > 0) {
               ctem.children.forEach((stem) => {
                 if (stem.name == item.menuKey) {
                   stem.isShow = true;
@@ -1331,6 +1334,7 @@ export default {
   color: var(--primary-color);
   font-weight: 500;
   padding: 3px 0;
+  transition: all 0.3s ease-in-out;
 
   img {
     width: 25px;
@@ -1342,6 +1346,12 @@ export default {
   border-radius: 5px;
 }
 
+.addCarImg:hover {
+  transform: scale(1.05);
+  background-color: var(--primary-color);
+  color: #fff;
+}
+
 .addCarImg1 {
   display: flex;
   justify-content: center;