feat(shoppingMall): tab id变更

src/components/HeaderTop.vue

@@ -174,91 +174,15 @@
 <script>
 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";
 export default {
   name: "Tabbar",
+  mixins: [specialListMixin],
   data() {
     return {
       abounts: process.env.VUE_APP_BASE_API1 + "/#/aboutUs", // 关于我们
       globalDivision: process.env.VUE_APP_BASE_API1 + "/#/globalDivision", // 全球分布
-      zoneList: [
-        {
-          label: "注册专区",
-          value: 1,
-          name: "regiest",
-          defaultChildId: 24,
-          children: [],
-        },
-        {
-          label: "升级专区",
-          value: 2,
-          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",
-        },
-        {
-          label: "续约专区",
-          value: 30,
-          children: [],
-          name: "renewalArea",
-        },
-        {
-          label: "专供专区",
-          value: 31,
-          children: [],
-          name: "wolesaleArea",
-        },
-        {
-          label: "架构管理",
-          value: 6,
-          name: "frame",
-          children: [
-            {
-              label: "安置架构",
-              value: 6,
-              name: "architecture",
-            },
-            {
-              label: "推荐架构",
-              value: 7,
-              name: "recommend",
-            },
-          ],
-        },
-        {
-          label: "创客空间专区",
-          value: 28,
-          children: [],
-          name: "makerArea",
-        },
-      ],
       marketList: [
         {
           text: "数据查询",

src/components/special-area-list/index.vue

@@ -5,15 +5,15 @@
       <span class="area-title">{{ title }}</span>
       <el-button
         v-if="list.length > 0"
-        type="primary"
+        type="text"
         size="mini"
         round
         plain
         class="more-button"
-        @click="goToMore"
+        @click="() => goToMore()"
       >
         <span class="more-text">更多</span>
-        <el-icon class="el-icon--right"><ArrowRight /></el-icon>
+        <i class="el-icon-arrow-right"></i>
       </el-button>
     </div>
     <div class="product-container">
@@ -21,7 +21,7 @@
         class="product-item"
         v-for="item in list"
         :key="item.pkWares"
-        @click="handleProductClick"
+        @click="handleProductClick(item)"
       >
         <img :src="item.cover1" class="product-image" alt="product image" />
         <div class="product-info">
@@ -63,13 +63,18 @@ export default {
     formatPrice(price) {
       return isLocal(numberToCurrencyNo(price));
     },
-    goToMore() {
+    goToMore(specialArea) {
-      if (this.$router && this.specialAreaId && this.subCategoryId) {
+      console.log(
+        "🚀 ~ goToMore ~ specialArea",
+        specialArea,
+        this.specialAreaId
+      );
+      if (this.$router && this.specialAreaId) {
         this.$router.push({
-          path: "/special",
+          path: "/shoppingMall",
           query: {
-            code: this.specialAreaId,
+            idTh: specialArea || this.specialAreaId,
-            id: this.subCategoryId,
+            id: this.specialAreaId,
           },
         });
       } else if (!this.specialAreaId) {
@@ -80,8 +85,8 @@ export default {
         console.error("Vue Router is not available.");
       }
     },
-    handleProductClick() {
+    handleProductClick(product) {
-      this.goToMore();
+      this.goToMore(product?.specialArea);
     },
   },
 };

src/mixins/special-list-mixin.js

@@ -0,0 +1,83 @@
+export default {
+  data() {
+    return {
+      zoneList: [
+        {
+          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",
+        },
+        {
+          label: "续约专区",
+          value: 30,
+          children: [],
+          name: "renewalArea",
+        },
+        {
+          label: "专供专区",
+          value: 31,
+          children: [],
+          name: "wolesaleArea",
+        },
+        {
+          label: "架构管理",
+          value: 6,
+          name: "frame",
+          children: [
+            {
+              label: "安置架构",
+              value: 6,
+              name: "architecture",
+            },
+            {
+              label: "推荐架构",
+              value: 7,
+              name: "recommend",
+            },
+          ],
+        },
+        {
+          label: "创客空间专区",
+          value: 28,
+          children: [],
+          name: "makerArea",
+        },
+      ],
+    };
+  },
+};

src/views/goodsDetails/index.vue

@@ -345,7 +345,7 @@ export default {
         },
         {
           label: "注册专区",
-          value: 1,
+          value: 24,
           name: "regiest",
           children: [
             {
@@ -353,16 +353,11 @@ export default {
               value: 1,
               name: "regiestArea",
             },
-            {
-              label: "乐学易考",
-              value: 24,
-              name: "ezLearnReg",
-            },
           ],
         },
         {
           label: "升级专区",
-          value: 2,
+          value: 25,
           name: "upgrade",
           children: [
             {
@@ -370,11 +365,6 @@ export default {
               value: 2,
               name: "upgradeArea",
             },
-            {
-              label: "乐学易考",
-              value: 25,
-              name: "ezLearnUp",
-            },
             {
               label: "海粉专区",
               value: 27,

src/views/index/index.vue

@@ -166,7 +166,16 @@
         </div>
       </div>
 
-      <div style="height: 300px"></div>
+      <div style="margin-top: 20px">
+        <specialAreaList
+          v-for="(item, index) in areaGoodsList"
+          :key="index"
+          :list="item.waresList"
+          :title="item.specialAreaName"
+          :specialAreaId="item.specialArea"
+        />
+      </div>
+      <!-- <div style="height: 300px"></div> -->
     </div>
     <div>
       <!-- 右侧侧侧边栏 -->

src/views/newGiftPay/index.vue

@@ -329,7 +329,7 @@ export default {
       moren: '',
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/pickPay/index.vue

@@ -361,7 +361,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/shareConfirm/index.vue

@@ -362,7 +362,7 @@ export default {
       moren: '',
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/shareFansConfirm/index.vue

@@ -333,7 +333,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/shoppingMall/index.vue

@@ -418,9 +418,11 @@ import * as api from "@/api/goods.js";
 import { mapGetters } from "vuex";
 import noticePopup from "@/components/noticePopup.vue";
 import selSpaceGoods from "@/components/selSpaceGoods.vue";
+import specialListMixin from "@/mixins/special-list-mixin.js";
 import * as ads from "@/api/register.js";
 
 export default {
+  mixins: [specialListMixin],
   components: {
     noticePopup,
     personInfo,
@@ -447,107 +449,6 @@ export default {
       startPrice: "",
       endPrice: "",
       index: 30,
-      zoneList: [
-        {
-          label: "分享专区",
-          value: 100,
-          name: "share",
-          children: [
-            {
-              label: "海粉分享",
-              value: 7,
-              name: "hiFans",
-            },
-            {
-              label: "免费注册",
-              value: 21,
-              name: "haiFans",
-            },
-          ],
-        },
-        {
-          label: "注册专区",
-          value: 1,
-          name: "regiest",
-          children: [
-            {
-              label: "乐学易考",
-              value: 24,
-              name: "ezLearnReg",
-            },
-          ],
-        },
-        {
-          label: "升级专区",
-          value: 2,
-          name: "upgrade",
-          children: [
-            {
-              label: "乐学易考",
-              value: 25,
-              name: "ezLearnUp",
-            },
-          ],
-        },
-        {
-          label: "复购专区",
-          value: 3,
-          name: "repurchase",
-          children: [
-            {
-              label: "自营专区",
-              value: 3,
-              name: "self",
-            },
-            {
-              label: "三方供应",
-              value: 21,
-              name: "haiFans",
-            },
-            {
-              label: "复购合作",
-              value: 22,
-              name: "cooperation",
-            },
-            {
-              label: "乐学易考",
-              value: 26,
-              name: "ezLearnRep",
-            },
-          ],
-        },
-        {
-          label: "福利专区",
-          value: 13,
-          children: [],
-          name: "welfare",
-        },
-
-        {
-          label: "重消专区",
-          value: 10,
-          children: [],
-          name: "rescission",
-        },
-        {
-          label: "续约专区",
-          value: 30,
-          children: [],
-          name: "renewalArea",
-        },
-        {
-          label: "专供专区",
-          value: 31,
-          children: [],
-          name: "wolesaleArea",
-        },
-        {
-          label: "创客空间专区",
-          value: 28,
-          children: [],
-          name: "makerArea",
-        },
-      ],
       specialArea: 0,
       specialArea0: 0,
       goodList: [],

src/views/tvIng/index.vue

@@ -395,7 +395,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/upgrade/index.vue

@@ -504,7 +504,7 @@ export default {
       moren: "",
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {

src/views/welfare/index.vue

@@ -377,7 +377,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {