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/repurchase/index.vue

@@ -9,61 +9,113 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex" v-if="specialArea != 28 && specialArea != 31 && specialArea != 30">
+      <div
-				{{ '复购会员信息' }}
+        class="rti dis_flex"
+        v-if="specialArea != 28 && specialArea != 31 && specialArea != 30"
+      >
+        {{ "复购会员信息" }}
       </div>
       <div class="rti dis_flex" v-else>
-				{{ '会员信息' }}
+        {{ "会员信息" }}
       </div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <el-col :span="6">
-					<el-form-item :label="'复购编号'"
+          <el-form-item
-						v-if="specialArea != 28 && specialArea != 31 && specialArea != 30" prop="upgradeMemberCode">
+            :label="'复购编号'"
-						<el-input v-model="ruleForm.upgradeMemberCode" :disabled="toShow"
+            v-if="specialArea != 28 && specialArea != 31 && specialArea != 30"
-							:placeholder="'请输入复购编号'"></el-input>
+            prop="upgradeMemberCode"
+          >
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :disabled="toShow"
+              :placeholder="'请输入复购编号'"
+            ></el-input>
           </el-form-item>
           <el-form-item :label="'会员编号'" v-else prop="upgradeMemberCode">
-						<el-input v-model="ruleForm.upgradeMemberCode" :disabled="toShow"
+            <el-input
-							:placeholder="'请输入复购编号'"></el-input>
+              v-model="ruleForm.upgradeMemberCode"
+              :disabled="toShow"
+              :placeholder="'请输入复购编号'"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-					<el-form-item :label="'复购姓名'"
+          <el-form-item
-						v-if="specialArea != 28 && specialArea != 31 && specialArea != 30" prop="upgradeMemberName">
+            :label="'复购姓名'"
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="'请输入复购姓名'" disabled></el-input>
+            v-if="specialArea != 28 && specialArea != 31 && specialArea != 30"
+            prop="upgradeMemberName"
+          >
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="'请输入复购姓名'"
+              disabled
+            ></el-input>
           </el-form-item>
           <el-form-item :label="'会员姓名'" v-else prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="'请输入复购姓名'" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="'请输入复购姓名'"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="'发货方式'" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery"
+            <el-select
-							:disabled="this.userInfo.pkSettleCountry == 1" :placeholder="'请选择发货方式'">
+              v-model="ruleForm.deliveryWay"
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label"
+              @change="selDelivery"
-								:value="item.value">
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="'请选择发货方式'"
+            >
+              <el-option
+                v-for="item in deliList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="'运输方式'" prop="transType">
-						<el-select v-model="ruleForm.transType" :disabled="this.userInfo.pkSettleCountry == 1"
+            <el-select
-							:placeholder="'请选择运输方式'">
+              v-model="ruleForm.transType"
-							<el-option v-for="item in transList" :key="item.value" :label="item.label"
+              :disabled="this.userInfo.pkSettleCountry == 1"
-								:value="item.value">
+              :placeholder="'请选择运输方式'"
+            >
+              <el-option
+                v-for="item in transList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="howSure">
           <el-form-item :label="'创客空间'" prop="makerSpaceMember">
-						<el-select v-model="ruleForm.makerSpaceMember" :placeholder="'请选择'">
+            <el-select
-							<el-option v-for="item in queryCardList" :key="item.pkMember" :label="item.storeName"
+              v-model="ruleForm.makerSpaceMember"
-								:value="item.pkMember">
+              :placeholder="'请选择'"
+            >
+              <el-option
+                v-for="item in queryCardList"
+                :key="item.pkMember"
+                :label="item.storeName"
+                :value="item.pkMember"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -72,18 +124,32 @@
       <el-row :gutter="40" class="padRow">
         <el-col :span="6" v-if="userInfo.pkSettleCountry != 1">
           <el-form-item :label="'会员店铺'">
-						<el-select v-model="ruleForm.pkMemberStore" :placeholder="'请选择会员店铺'">
+            <el-select
-							<el-option v-for="item in storeList" :key="item.pkId" :label="item.storeName"
+              v-model="ruleForm.pkMemberStore"
-								:value="item.pkId">
+              :placeholder="'请选择会员店铺'"
+            >
+              <el-option
+                v-for="item in storeList"
+                :key="item.pkId"
+                :label="item.storeName"
+                :value="item.pkId"
+              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="userInfo.pkSettleCountry != 1">
           <el-form-item :label="'仓库'">
-						<el-select v-model="ruleForm.pkStorehouse" :placeholder="'请选择仓库'">
+            <el-select
-							<el-option v-for="item in storehouseList" :key="item.pkId" :label="item.name"
+              v-model="ruleForm.pkStorehouse"
-								:value="item.pkId">
+              :placeholder="'请选择仓库'"
+            >
+              <el-option
+                v-for="item in storehouseList"
+                :key="item.pkId"
+                :label="item.name"
+                :value="item.pkId"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -100,13 +166,17 @@
       <!-- 收货人信息 -->
       <div v-if="isDeliveryWay">
         <div class="xian">
-					<div class="title">{{ '收货人信息' }}</div>
+          <div class="title">{{ "收货人信息" }}</div>
-					<div class="lan" @click="openAddress">{{ '新增收货人地址' }}</div>
+          <div class="lan" @click="openAddress">{{ "新增收货人地址" }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
             <el-form-item :label="'收货人'" prop="recName">
-							<el-input :maxlength="40" v-model="ruleForm.recName" :placeholder="'请输入收货人'"></el-input>
+              <el-input
+                :maxlength="40"
+                v-model="ruleForm.recName"
+                :placeholder="'请输入收货人'"
+              ></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -120,26 +190,41 @@
           </el-col> -->
           <el-col :span="6" v-if="pkCountry == 1">
             <el-form-item :label="'联系方式'" prop="recPhone">
-							<el-input v-model="ruleForm.recPhone" :maxlength="11"
+              <el-input
-								oninput="value=value.replace(/[^\d]/g,'')" :placeholder="'请输入联系方式'"></el-input>
+                v-model="ruleForm.recPhone"
+                :maxlength="11"
+                oninput="value=value.replace(/[^\d]/g,'')"
+                :placeholder="'请输入联系方式'"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-else>
             <el-form-item :label="'联系方式'" prop="recPhone">
-							<el-input v-model="ruleForm.recPhone" :maxlength="30"
+              <el-input
-								:placeholder="'请输入联系方式'"></el-input>
+                v-model="ruleForm.recPhone"
+                :maxlength="30"
+                :placeholder="'请输入联系方式'"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'收货地址'" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData"
+              <el-cascader
-								:props="regionParams" :placeholder="'请选择收货地址'"></el-cascader>
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="'请选择收货地址'"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'详细地址'" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200"
+              <el-input
-								:placeholder="'请输入详细地址'"></el-input>
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="'请输入详细地址'"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -151,47 +236,74 @@
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'备注'">
-							<el-input v-model="ruleForm.remark" :placeholder="'请输入备注'"></el-input>
+              <el-input
+                v-model="ruleForm.remark"
+                :placeholder="'请输入备注'"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox" v-if="isDeliveryWay">
-			<div class="title">{{ '历史地址' }}</div>
+      <div class="title">{{ "历史地址" }}</div>
     </div>
     <div class="local" v-if="isDeliveryWay">
-			<div :class="['local_i', item.pkId == moren ? 'local_a' : '']" v-for="item in addressList" :key="item.pkId">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{ }}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
+        v-for="item in addressList"
+        :key="item.pkId"
+      >
+        <el-radio
+          v-model="moren"
+          @input="checkRadio"
+          :label="item.pkId"
+          >{{
+        }}</el-radio>
         <div class="local1">
           {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
         </div>
         <div class="local2" v-show="item.isDefault == 1">
-					{{ '默认地址' }}
+          {{ "默认地址" }}
         </div>
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">
+        <div
-					{{ '设置默认地址' }}
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ "设置默认地址" }}
         </div>
         <div class="local2" @click="changeAds(item.pkId)">
-					{{ '编辑' }}
+          {{ "编辑" }}
         </div>
         <div class="local3" @click="delAds(item.pkId)">
-					{{ '删除' }}
+          {{ "删除" }}
         </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ '商品信息' }}</div>
+      <div class="title">{{ "商品信息" }}</div>
     </div>
-		<el-table :data="allData" :row-style="{ height: '60px', fontSize: '15px', color: '#333333' }"
+    <el-table
-			:cell-style="{ padding: '0' }" :fit="true" :header-cell-style="{
+      :data="allData"
+      :row-style="{ height: '60px', fontSize: '15px', color: '#333333' }"
+      :cell-style="{ padding: '0' }"
+      :fit="true"
+      :header-cell-style="{
         background: 'var(--primary-color)',
         color: '#fff',
         fontWeight: 'bold',
         fontSize: '15px',
-      }" :row-class-name="tableRowClassName">
+      }"
-			<el-table-column align="center" prop="waresName" width="400" :label="'商品名称'">
+      :row-class-name="tableRowClassName"
+    >
+      <el-table-column
+        align="center"
+        prop="waresName"
+        width="400"
+        :label="'商品名称'"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
@@ -199,8 +311,11 @@
               <img :src="scope.row.cover1" alt="" />
               <div>{{ scope.row.waresName }}</div>
             </div>
-						<div class="goods_tit" v-for="item in scope.row.waresItemsParamList"
+            <div
-							:key="item.pkWaresSpecsSku">
+              class="goods_tit"
+              v-for="item in scope.row.waresItemsParamList"
+              :key="item.pkWaresSpecsSku"
+            >
               <div class="goods_tit_l">
                 <img :src="item.specCover" alt="" />
                 <div class="goods_tit_lr">
@@ -222,7 +337,11 @@
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="'商品业绩' + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="'商品业绩' + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
@@ -242,11 +361,11 @@
     </el-table>
     <div class="tab_b">
       <div>
-				{{ '商品金额总计' }}:{{ userInfo.currencyIcon
+        {{ "商品金额总计" }}:{{ userInfo.currencyIcon
         }}{{ allGoodsData.priceAmount | numberToCurrency }}
       </div>
       <div>
-				{{ '邮费' }}:{{ userInfo.currencyIcon
+        {{ "邮费" }}:{{ userInfo.currencyIcon
         }}{{ ruleForm.postage | numberToCurrency }}
       </div>
     </div>
@@ -257,70 +376,104 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ '总价' }}:</div>
+            <div class="f1">{{ "总价" }}:</div>
             <div class="f2">
               {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
             </div>
           </div>
           <div class="dis_flex">
-						<div class="f1">{{ '业绩' }}:</div>
+            <div class="f1">{{ "业绩" }}:</div>
             <div class="f3">
               {{ allGoodsData.achieveAmount | numberToCurrency }}
             </div>
           </div>
         </div>
-				<div class="footer_tt" v-show="
+        <div
+          class="footer_tt"
+          v-show="
             ruleForm.recAddress &&
             ruleForm.recName &&
             ruleForm.recPhone &&
             ruleForm.nameList
-          ">
+          "
+        >
           <div class="f2 f4">
-						{{ '寄送至' }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+            {{ "寄送至" }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
           </div>
           <div class="f4">
-						{{ '收货人' }}：{{ ruleForm.recName }}
+            {{ "收货人" }}：{{ ruleForm.recName }}
             {{ ruleForm.recPhone }}
           </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement v-if="specialArea != 30" :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement
+          v-if="specialArea != 30"
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
         <!-- 协议 -->
-				<div class="agreementBox flex_ac" v-if="specialArea == 30">
+        <!-- <div class="agreementBox flex_ac" v-if="specialArea == 30">
           <div class="agreementIcon">
             <el-checkbox v-model="agreementShow" @change="toCheck">
             </el-checkbox>
             <div class="agreementText flex">
               <span>
-								<span>{{ '我已阅读并同意以上协议' }}</span>
+                <span>{{ "我已阅读并同意以上协议" }}</span>
-								<span class="agreementDetail" v-if="userInfo.isDealer == 1"
+                <span
-									@click="openPop">《推广人员服务协议》</span>
+                  class="agreementDetail"
-								<span class="agreementDetail" v-if="userInfo.isDealer == 0"
+                  v-if="userInfo.isDealer == 1"
-									@click="openPop">《经销商合同》</span>
+                  @click="openPop"
+                  >《推广人员服务协议》</span
+                >
+                <span
+                  class="agreementDetail"
+                  v-if="userInfo.isDealer == 0"
+                  @click="openPop"
+                  >《经销商合同》</span
+                >
               </span>
             </div>
           </div>
-				</div>
+        </div> -->
 
         <div v-if="specialArea == 30" class="warn">该礼包一旦购买不能退换</div>
         <div class="btn" @click="submitRegister('ruleForm')">
-					{{ '购买' }}
+          {{ "购买" }}
         </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
-		<mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
+    <!-- <mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent> -->
-		<Pay :isPay="isPay" :onlinePay="onlinePay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
+    <Pay
+      :isPay="isPay"
+      :onlinePay="onlinePay"
+      @closePay="closePay"
+      :paramsPost="paramsPost"
+    ></Pay>
     <!-- 协议 -->
-		<el-dialog class="pop" width="70%" :append-to-body="true" :visible.sync="popupShow">
+    <el-dialog
+      class="pop"
+      width="70%"
+      :append-to-body="true"
+      :visible.sync="popupShow"
+    >
       <div class="pop_box" ref="scrollContainer">
-				<img v-if="userInfo.isDealer == 1" src="@/assets/images/tgxy1.jpg" alt="" />
+        <img
-				<img v-if="userInfo.isDealer == 0" src="@/assets/images/jxsht.jpg" alt="" />
+          v-if="userInfo.isDealer == 1"
+          src="@/assets/images/tgxy1.jpg"
+          alt=""
+        />
+        <img
+          v-if="userInfo.isDealer == 0"
+          src="@/assets/images/jxsht.jpg"
+          alt=""
+        />
         <span class="dialog-footer">
           <el-button type="primary" @click="popupShow = false">{{
-            '我已阅读并同意以上协议'
+            "我已阅读并同意以上协议"
           }}</el-button>
         </span>
       </div>
@@ -332,13 +485,9 @@
 import personInfo from "@/components/personInfo.vue";
 import AddAddress from "@/components/AddAddress.vue";
 import agreement from "@/components/agreement.vue";
-	import {
+import { mapGetters } from "vuex";
-		mapGetters
-	} from "vuex";
 import * as api from "@/api/register.js";
-	import {
+import { setTokenMi } from "@/util/auth";
-		setTokenMi
-	} from "@/util/auth";
 import Pay from "@/components/Pay.vue";
 import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
@@ -352,18 +501,18 @@
   data() {
     let validateRecPhone = (rule, value, callback) => {
       if (this.ruleForm.recPhone === "" && this.isDeliveryWay) {
-					callback(new Error('请输入联系方式'));
+        callback(new Error("请输入联系方式"));
       } else if (this.pkCountry == 1 && this.ruleForm.recPhone.length != 11) {
-					callback(new Error('请输入正确联系方式'));
+        callback(new Error("请输入正确联系方式"));
       } else if (this.pkCountry == 1 && this.ruleForm.recPhone[0] != 1) {
-					callback(new Error('请输入正确联系方式'));
+        callback(new Error("请输入正确联系方式"));
       } else {
         callback();
       }
     };
     let validateRecTransType = (rule, value, callback) => {
       if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-					callback(new Error('请选择运输方式'));
+        callback(new Error("请选择运输方式"));
       } else {
         callback();
       }
@@ -387,50 +536,68 @@
         transType: "",
       },
       rules: {
-					upgradeMemberCode: [{
+        upgradeMemberCode: [
+          {
             required: true,
             validator: this.upgradeMemberCodePass,
             trigger: "blur",
-					}, ],
+          },
-					fwzx: [{
+        ],
+        fwzx: [
+          {
             required: true,
             message: "请输入活动名称",
-						trigger: "change"
-					}, ],
-					gradeName: [{
-						required: true,
-						message: '请输入申请级别',
-						trigger: "change"
-					}, ],
-					upgradeMemberName: [{
-						required: true,
-						message: '请输入升级编号',
-						trigger: "blur"
-					}, ],
-					recName: [{
-						required: true,
-						message: '请输入收件人',
-						trigger: "blur"
-					}, ],
-					recPhone: [{
-						validator: validateRecPhone,
-						trigger: "blur"
-					}],
-					recAddress: [{
-						required: true,
-						message: '请输入详细地址',
-						trigger: "blur"
-					}, ],
-					deliveryWay: [{
-						required: true,
-						message: '请选择发货方式',
             trigger: "change",
-					}, ],
+          },
-					makerSpaceMember: [{
+        ],
+        gradeName: [
+          {
             required: true,
-						message: '请选择',
+            message: "请输入申请级别",
-						trigger: 'change',
+            trigger: "change",
-					}, ],
+          },
+        ],
+        upgradeMemberName: [
+          {
+            required: true,
+            message: "请输入升级编号",
+            trigger: "blur",
+          },
+        ],
+        recName: [
+          {
+            required: true,
+            message: "请输入收件人",
+            trigger: "blur",
+          },
+        ],
+        recPhone: [
+          {
+            validator: validateRecPhone,
+            trigger: "blur",
+          },
+        ],
+        recAddress: [
+          {
+            required: true,
+            message: "请输入详细地址",
+            trigger: "blur",
+          },
+        ],
+        deliveryWay: [
+          {
+            required: true,
+            message: "请选择发货方式",
+            trigger: "change",
+          },
+        ],
+        makerSpaceMember: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
         // transType: [
         //   {
         //     required: true,
@@ -438,17 +605,20 @@
         //     trigger: 'change',
         //   },
         // ],
-					transType: [{
+        transType: [
-						validator: validateRecTransType
+          {
-					}],
+            validator: validateRecTransType,
+          },
+        ],
       },
       addressList: [],
       moren: "",
       allGoodsData: [],
       allData: [],
-				agreementShow: false,
+      agreementShow: true,
       countryList: [],
-				transList: [{
+      transList: [
+        {
           value: 1,
           label: "陆运",
         },
@@ -740,17 +910,17 @@
         this.$router.push({
           path: "/vipCenter",
           query: {
-							id: 1
+            id: 1,
           },
         });
       } else {
-					this.$confirm('确认取消支付' + "?")
+        this.$confirm("确认取消支付" + "?")
           .then((_) => {
             this.isPay = false;
             this.$router.push({
               path: "/vipCenter",
               query: {
-									id: 1
+                id: 1,
               },
             });
           })
@@ -783,7 +953,7 @@
       }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-						message: '请选择收货人信息',
+          message: "请选择收货人信息",
           type: "warning",
         });
         return;
@@ -907,15 +1077,15 @@
       });
     },
     delAds(id) {
-				this.$confirm('确定要删除该收货地址吗' + "?", "", {
+      this.$confirm("确定要删除该收货地址吗" + "?", "", {
-					confirmButtonText: '确定',
+        confirmButtonText: "确定",
-					cancelButtonText: '取消',
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         api.delAddress(id).then((res) => {
           this.$message({
             type: "success",
-							message: '删除成功' + "!",
+            message: "删除成功" + "!",
           });
           this.getAddressList();
         });
@@ -954,10 +1124,7 @@
       });
     },
     // 斑马线
-			tableRowClassName({
+    tableRowClassName({ row, rowIndex }) {
-				row,
-				rowIndex
-			}) {
       if (rowIndex % 2 == 0) {
         return "warning-row";
       } else if (rowIndex % 2 == 1) {
@@ -993,7 +1160,7 @@
   .zca {
     font-size: 18px;
     font-weight: bold;
-			color: #00417C;
+    color: #00417c;
   }
 }
 

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: [
         {