diff --git a/src/components/HeaderTop.vue b/src/components/HeaderTop.vue
index b2bc6bf..99b26b6 100644
--- a/src/components/HeaderTop.vue
+++ b/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: "数据查询",
diff --git a/src/components/special-area-list/index.vue b/src/components/special-area-list/index.vue
index ee0ab3c..0f3d9f2 100644
--- a/src/components/special-area-list/index.vue
+++ b/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() {
-      if (this.$router && this.specialAreaId && this.subCategoryId) {
+    goToMore(specialArea) {
+      console.log(
+        "🚀 ~ goToMore ~ specialArea",
+        specialArea,
+        this.specialAreaId
+      );
+      if (this.$router && this.specialAreaId) {
         this.$router.push({
-          path: "/special",
+          path: "/shoppingMall",
           query: {
-            code: this.specialAreaId,
-            id: this.subCategoryId,
+            idTh: specialArea || this.specialAreaId,
+            id: this.specialAreaId,
           },
         });
       } else if (!this.specialAreaId) {
@@ -80,8 +85,8 @@ export default {
         console.error("Vue Router is not available.");
       }
     },
-    handleProductClick() {
-      this.goToMore();
+    handleProductClick(product) {
+      this.goToMore(product?.specialArea);
     },
   },
 };
diff --git a/src/mixins/special-list-mixin.js b/src/mixins/special-list-mixin.js
new file mode 100644
index 0000000..e3717dc
--- /dev/null
+++ b/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",
+        },
+      ],
+    };
+  },
+};
diff --git a/src/views/goodsDetails/index.vue b/src/views/goodsDetails/index.vue
index 4a96326..7e39d96 100644
--- a/src/views/goodsDetails/index.vue
+++ b/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,
diff --git a/src/views/hiFans/index.vue b/src/views/hiFans/index.vue
index 9cabe1b..f027bca 100644
--- a/src/views/hiFans/index.vue
+++ b/src/views/hiFans/index.vue
@@ -23,14 +23,15 @@
                       </div>
                     </div> -->
     <!-- 表单 -->
-    <el-form :model="ruleForm"
-             :rules="rules"
-             ref="ruleForm"
-             label-position="top"
-             status-icon
-             class="demo-ruleForm">
-      <el-row :gutter="40"
-              class="padRow">
+    <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="'服务中心'"
                                         prop="fwzx">
@@ -39,28 +40,30 @@
                           </el-form-item>
                         </el-col> -->
         <el-col :span="6">
-          <el-form-item :label="'申请级别'"
-                        prop="pkGradeVal">
-            <el-input v-model="ruleForm.pkGradeVal"
-                      disabled></el-input>
+          <el-form-item :label="'申请级别'" prop="pkGradeVal">
+            <el-input v-model="ruleForm.pkGradeVal" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'自然国家'"
-                        prop="pkCountry"
-                        class="guoqikang">
-            <el-select v-model="ruleForm.pkCountry"
-                       placeholder=""
-                       @change="changeSelection"
-                       ref="select"
-                       popper-class="guoqi">
-              <el-option v-for="item in countryList"
-                         :key="item.pkId"
-                         :label="item.name"
-                         :value="item.pkId">
+          <el-form-item :label="'自然国家'" prop="pkCountry" class="guoqikang">
+            <el-select
+              v-model="ruleForm.pkCountry"
+              placeholder=""
+              @change="changeSelection"
+              ref="select"
+              popper-class="guoqi"
+            >
+              <el-option
+                v-for="item in countryList"
+                :key="item.pkId"
+                :label="item.name"
+                :value="item.pkId"
+              >
                 <div class="option_box">
-                  <el-image class="option_img"
-                            :src="item.nationalFlag2"></el-image>
+                  <el-image
+                    class="option_img"
+                    :src="item.nationalFlag2"
+                  ></el-image>
                   <span v-text="item.shortName"></span>
                 </div>
               </el-option>
@@ -68,22 +71,30 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'结算国家'"
-                        class="guoqikang"
-                        prop="pkSettleCountry">
-            <el-select v-model="ruleForm.pkSettleCountry"
-                       :disabled="true"
-                       @change="changeSelection1"
-                       placeholder=""
-                       ref="select1"
-                       popper-class="guoqi">
-              <el-option v-for="item in countryList"
-                         :key="item.pkId"
-                         :label="item.name"
-                         :value="item.pkId">
+          <el-form-item
+            :label="'结算国家'"
+            class="guoqikang"
+            prop="pkSettleCountry"
+          >
+            <el-select
+              v-model="ruleForm.pkSettleCountry"
+              :disabled="true"
+              @change="changeSelection1"
+              placeholder=""
+              ref="select1"
+              popper-class="guoqi"
+            >
+              <el-option
+                v-for="item in countryList"
+                :key="item.pkId"
+                :label="item.name"
+                :value="item.pkId"
+              >
                 <div class="option_box">
-                  <el-image class="option_img"
-                            :src="item.nationalFlag2"></el-image>
+                  <el-image
+                    class="option_img"
+                    :src="item.nationalFlag2"
+                  ></el-image>
                   <span v-text="item.shortName"></span>
                 </div>
               </el-option>
@@ -91,73 +102,77 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'推荐编号'"
-                        prop="parent">
-            <el-input v-model="ruleForm.parent"
-             @blur="getQuickReg()"
-                      :placeholder="'请输入推荐编号'"></el-input>
+          <el-form-item :label="'推荐编号'" prop="parent">
+            <el-input
+              v-model="ruleForm.parent"
+              @blur="getQuickReg()"
+              :placeholder="'请输入推荐编号'"
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="40"
-              class="padRow">
+      <el-row :gutter="40" class="padRow">
         <el-col :span="6">
-          <el-form-item :label="'推荐姓名'"
-                        prop="parentName">
-            <el-input v-model="ruleForm.parentName"
-                      :placeholder="'请输入推荐姓名'"
-                      disabled></el-input>
+          <el-form-item :label="'推荐姓名'" prop="parentName">
+            <el-input
+              v-model="ruleForm.parentName"
+              :placeholder="'请输入推荐姓名'"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'安置编号'"
-                        prop="placeParent">
-            <el-input v-model="ruleForm.placeParent" :disabled="pt"
-                      :placeholder="'请输入安置编号'"></el-input>
+          <el-form-item :label="'安置编号'" prop="placeParent">
+            <el-input
+              v-model="ruleForm.placeParent"
+              :disabled="pt"
+              :placeholder="'请输入安置编号'"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'安置姓名'"
-                        prop="placeParentName">
-            <el-input v-model="ruleForm.placeParentName"
-                      :placeholder="'请输入安置姓名'"
-                      disabled></el-input>
+          <el-form-item :label="'安置姓名'" prop="placeParentName">
+            <el-input
+              v-model="ruleForm.placeParentName"
+              :placeholder="'请输入安置姓名'"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'安置位置'"
-                        prop="placeDept">
-
-            <el-select v-model="ruleForm.placeDept" :disabled="pt"
-                       :placeholder="'请选择安置位置'">
-              <el-option v-for="item in deptOption"
-                         :key="item.value"
-                         :label="item.name"
-                         :value="item.value">
+          <el-form-item :label="'安置位置'" prop="placeDept">
+            <el-select
+              v-model="ruleForm.placeDept"
+              :disabled="pt"
+              :placeholder="'请选择安置位置'"
+            >
+              <el-option
+                v-for="item in deptOption"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
-
           </el-form-item>
         </el-col>
-        </el-row>
-        <el-row :gutter="40" class="padRow">
-          <el-col :span="6" v-if="userInfo.specialRegistration == 1">
-          <el-form-item :label="'会员姓名'"
-                        prop="memberName">
-            <el-input :maxlength="40" v-model="ruleForm.memberName"
-                      :placeholder="'请输入会员姓名'"></el-input>
+      </el-row>
+      <el-row :gutter="40" class="padRow">
+        <el-col :span="6" v-if="userInfo.specialRegistration == 1">
+          <el-form-item :label="'会员姓名'" prop="memberName">
+            <el-input
+              :maxlength="40"
+              v-model="ruleForm.memberName"
+              :placeholder="'请输入会员姓名'"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="userInfo.specialRegistration == 1">
-<!-- <el-input v-model="ruleForm.phone"
+          <!-- <el-input v-model="ruleForm.phone"
             :maxlength="userInfo.pkSettleCountry == 1?11:20"
                       oninput="value=value.replace(/[^\d.]/g,'')"
                       :placeholder="'请输入联系方式'"></el-input> -->
-                      <el-form-item
-            :label="'联系方式'"
-            prop="phone"
-            v-if="pkCountry == 1"
-          >
+          <el-form-item :label="'联系方式'" prop="phone" v-if="pkCountry == 1">
             <el-input
               v-model="ruleForm.phone"
               :maxlength="11"
@@ -165,8 +180,7 @@
               :placeholder="'请输入联系方式'"
             ></el-input>
           </el-form-item>
-          <el-form-item :label="'联系方式'" prop="phone" 
-          v-else>
+          <el-form-item :label="'联系方式'" prop="phone" v-else>
             <el-input
               v-model="ruleForm.phone"
               :maxlength="30"
@@ -176,49 +190,60 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="userInfo.specialRegistration == 0">
-          <el-form-item :label="'会员姓名'"
-                        prop="memberName">
-            <el-input v-model="ruleForm.memberName"
-            :maxlength="40"
-                      :placeholder="'请输入会员姓名'"></el-input>
+          <el-form-item :label="'会员姓名'" prop="memberName">
+            <el-input
+              v-model="ruleForm.memberName"
+              :maxlength="40"
+              :placeholder="'请输入会员姓名'"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="userInfo.specialRegistration == 0">
-          <el-form-item :label="'联系方式'"
-                        prop="phone">
-            <el-input v-model="ruleForm.phone"
-            :maxlength="30"
-                      :placeholder="'请输入联系方式'"></el-input>
+          <el-form-item :label="'联系方式'" prop="phone">
+            <el-input
+              v-model="ruleForm.phone"
+              :maxlength="30"
+              :placeholder="'请输入联系方式'"
+            ></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="6">
-          <el-form-item :label="'发货方式'"
-                        prop="deliveryWay">
-            <el-select v-model="ruleForm.deliveryWay"
-                       :disabled="this.userInfo.pkSettleCountry == 1"
-                       @change="selDelivery"
-                       :placeholder="'请选择发货方式'">
-              <el-option v-for="item in deliList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item :label="'发货方式'" prop="deliveryWay">
+            <el-select
+              v-model="ruleForm.deliveryWay"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              @change="selDelivery"
+              :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="'运输方式'"
-                        :required="isDeliveryWay"
-                        prop="transType">
-            <el-select v-model="ruleForm.transType"
-                       :disabled="this.userInfo.pkSettleCountry == 1"
-                       :placeholder="'请选择运输方式'">
-              <el-option v-for="item in transList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item
+            :label="'运输方式'"
+            :required="isDeliveryWay"
+            prop="transType"
+          >
+            <el-select
+              v-model="ruleForm.transType"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="'请选择运输方式'"
+            >
+              <el-option
+                v-for="item in transList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -227,23 +252,29 @@
       <!-- 收货人信息 -->
       <div v-show="isDeliveryWay">
         <div class="xian1">
-          <div class="title">{{ '收货人信息' }}</div>
-          <div class="lan"
-               @click="openAddress">{{ '新增收货人地址' }}</div>
+          <div class="title">{{ "收货人信息" }}</div>
+          <div class="lan" @click="openAddress">{{ "新增收货人地址" }}</div>
         </div>
-        <el-row :gutter="40"
-                class="padRow">
-                <el-col :span="6">
-            <el-form-item :label="'收货人'" prop="recName" :required="isDeliveryWay">
+        <el-row :gutter="40" class="padRow">
+          <el-col :span="6">
+            <el-form-item
+              :label="'收货人'"
+              prop="recName"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recName"
-               :maxlength="40"
+                :maxlength="40"
                 :placeholder="'请输入收货人'"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="pkCountry == 1">
-            <el-form-item :label="'联系方式'" prop="recPhone" :required="isDeliveryWay">
+            <el-form-item
+              :label="'联系方式'"
+              prop="recPhone"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recPhone"
                 :maxlength="11"
@@ -253,7 +284,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-else>
-            <el-form-item :label="'联系方式'" prop="recPhone" :required="isDeliveryWay">
+            <el-form-item
+              :label="'联系方式'"
+              prop="recPhone"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recPhone"
                 :maxlength="30"
@@ -262,39 +297,47 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="'收货地址'"
-                          class="dizhi"
-                          :required="isDeliveryWay"
-                          prop="dizhi">
-              <el-cascader v-model="ruleForm.dizhi"
-                           @change="setDizhi"
-                           :options="areaData"
-                           :props="regionParams"
-                           :placeholder="'请选择收货地址'"></el-cascader>
+            <el-form-item
+              :label="'收货地址'"
+              class="dizhi"
+              :required="isDeliveryWay"
+              prop="dizhi"
+            >
+              <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="'详细地址'"
-                          :required="isDeliveryWay"
-                          prop="recAddress">
-              <el-input v-model="ruleForm.recAddress"
-                        maxlength="200"
-                        :placeholder="'请输入详细地址'"></el-input>
+            <el-form-item
+              :label="'详细地址'"
+              :required="isDeliveryWay"
+              prop="recAddress"
+            >
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="'请输入详细地址'"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="40"
-                class="padRow">
+        <el-row :gutter="40" class="padRow">
           <el-col :span="6">
             <el-form-item :label="'邮费'">
-              <el-input v-model="ruleForm.postage"
-                        disabled></el-input>
+              <el-input v-model="ruleForm.postage" disabled></el-input>
             </el-form-item>
           </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>
@@ -303,65 +346,72 @@
     <!-- 历史地址 -->
     <div v-show="isDeliveryWay">
       <div class="nox">
-        <div class="title">{{ '历史地址' }}</div>
+        <div class="title">{{ "历史地址" }}</div>
       </div>
       <div class="local">
-        <div :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"><span></span></el-radio>
+        <div
+          :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"
+            ><span></span
+          ></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" v-show="item.isDefault == 1">
+            {{ "默认地址" }}
           </div>
-          <div class="local2"
-               @click="changeAds(item.pkId)">{{ '编辑' }}</div>
-          <div class="local3"
-               @click="delAds(item.pkId)">{{ '删除' }}</div>
+          <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>
     <!-- 商品信息 -->
     <div class="nox">
-      <div class="title">{{ '商品信息' }}</div>
+      <div class="title">{{ "商品信息" }}</div>
     </div>
-    <el-table :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="'商品名称'">
+    <el-table
+      :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="'商品名称'"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
             <div class="goods_t">
-              <img :src="scope.row.cover1"
-                   alt="" />
+              <img :src="scope.row.cover1" alt="" />
               <div>{{ scope.row.waresName }}</div>
             </div>
-            <div class="goods_tit"
-                 v-for="item in scope.row.waresItemsParamList"
-                 :key="item.pkWaresSpecsSku">
+            <div
+              class="goods_tit"
+              v-for="item in scope.row.waresItemsParamList"
+              :key="item.pkWaresSpecsSku"
+            >
               <div class="goods_tit_l">
-                <img :src="item.specCover"
-                     alt="" />
+                <img :src="item.specCover" alt="" />
                 <div class="goods_tit_lr">
                   <div>
                     {{ item.productName }}
@@ -376,102 +426,104 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="goodsPrice"
-                       :label="'商品单价'">
+      <el-table-column align="center" prop="goodsPrice" :label="'商品单价'">
         <template slot-scope="scope">
           <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>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="quantity"
-                       :label="'商品数量'">
+      <el-table-column align="center" prop="quantity" :label="'商品数量'">
       </el-table-column>
-      <el-table-column align="center"
-                       prop="spyjxj"
-                       :label="'业绩小计'+'PV'">
-<template slot-scope="scope">
-  <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
-</template>
+      <el-table-column align="center" prop="spyjxj" :label="'业绩小计' + 'PV'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
+        </template>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="pvxj"
-                       :label="'金额小计'">
-<template slot-scope="scope">
-  <span>{{ scope.row.priceAmount | numberToCurrency }}</span>
-</template>
+      <el-table-column align="center" prop="pvxj" :label="'金额小计'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.priceAmount | numberToCurrency }}</span>
+        </template>
       </el-table-column>
     </el-table>
     <div class="tab_b">
-      <div>{{ '商品金额总计' }}:{{ userInfo.currencyIcon }}{{ allGoodsData.priceAmount | numberToCurrency }}</div>
-      <div>{{ '邮费' }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}</div>
+      <div>
+        {{ "商品金额总计" }}:{{ userInfo.currencyIcon
+        }}{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>
+        {{ "邮费" }}:{{ userInfo.currencyIcon
+        }}{{ ruleForm.postage | numberToCurrency }}
+      </div>
     </div>
-    <AddAddress ref="addAddress"
-                @getAdList="getAddressList"></AddAddress>
+    <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
     <!-- 购买 -->
     <div class="tfooter">
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-            <div class="f1">{{ '总价' }}:</div>
-            <div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</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.recPhone }}
+            {{ "收货人" }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}
           </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-        <agreement :isShow="agreementShow"
-                   ref="agree"
-                   @agree="agree"></agreement>
-        <div class="btn"
-             @click="submitRegister('ruleForm')">{{ '购买' }}</div>
+        <agreement
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement>
+        <div class="btn" @click="submitRegister('ruleForm')">{{ "购买" }}</div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
-    <mustAgreeMent :waresCodeList='waresCodeList'></mustAgreeMent>
-    <Pay :isPay="isPay"
-         @closePay="closePay"
-         :paramsPost="paramsPost"></Pay>
+    <mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
+    <Pay :isPay="isPay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
   </div>
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue'
-import AddAddress from '@/components/AddAddress.vue'
-import agreement from '@/components/agreement.vue'
-import { mapGetters } from 'vuex'
-import * as api from '@/api/register.js'
-import { setTokenMi } from '@/util/auth'
-import Pay from '@/components/Pay.vue'
-import mustAgreeMent from '@/components/mustAgreeMent.vue'
+import personInfo from "@/components/personInfo.vue";
+import AddAddress from "@/components/AddAddress.vue";
+import agreement from "@/components/agreement.vue";
+import { mapGetters } from "vuex";
+import * as api from "@/api/register.js";
+import { setTokenMi } from "@/util/auth";
+import Pay from "@/components/Pay.vue";
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 
 export default {
   components: {
@@ -484,40 +536,40 @@ export default {
   data() {
     // 验证活动名称的函数
     let validateRecName = (rule, value, callback) => {
-      if (this.ruleForm.recName === '' && this.isDeliveryWay) {
-        callback(new Error('请输入收件人'))
+      if (this.ruleForm.recName === "" && this.isDeliveryWay) {
+        callback(new Error("请输入收件人"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     let validateRecPhone = (rule, value, callback) => {
-      if (this.ruleForm.recPhone === '' && this.isDeliveryWay) {
-        callback(new Error('请输入联系方式'))
+      if (this.ruleForm.recPhone === "" && this.isDeliveryWay) {
+        callback(new Error("请输入联系方式"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     let validateRecAddress = (rule, value, callback) => {
-      if (this.ruleForm.recAddress === '' && this.isDeliveryWay) {
-        callback(new Error('请输入详细地址'))
+      if (this.ruleForm.recAddress === "" && this.isDeliveryWay) {
+        callback(new Error("请输入详细地址"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     let validateRecDizhi = (rule, value, callback) => {
       if (this.ruleForm.dizhi.length == 0 && this.isDeliveryWay) {
-        callback(new Error('请选择收货地址'))
+        callback(new Error("请选择收货地址"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     let validateRecTransType = (rule, value, callback) => {
-      if (this.ruleForm.transType == '' && this.isDeliveryWay) {
-        callback(new Error('请选择运输方式'))
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
+        callback(new Error("请选择运输方式"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
       waresCodeList: [],
       isPay: false,
@@ -525,41 +577,41 @@ export default {
       isClick: 0,
       isDeliveryWay: true,
       ruleForm: {
-        fwzx: '',
-        placeDept: '',
-        pkGradeVal: '',
+        fwzx: "",
+        placeDept: "",
+        pkGradeVal: "",
         dizhi: [],
-        dzName: ['', '', ''],
-        postage: '',
-        pkCountry: '',
-        pkSettleCountry: '',
-        parent: '',
-        parentName: '',
-        placeParent: '',
-        placeParentName: '',
-        recName: '',
-        recPhone: '',
-        recAddress: '',
-        nameList: '',
-        memberName: '',
-        phone: '',
-        idCard: '',
-        pkBank: '',
-        cardNumber: '',
-        subBankName: '',
-        email: '',
-        deliveryWay: '',
-        transType: '',
+        dzName: ["", "", ""],
+        postage: "",
+        pkCountry: "",
+        pkSettleCountry: "",
+        parent: "",
+        parentName: "",
+        placeParent: "",
+        placeParentName: "",
+        recName: "",
+        recPhone: "",
+        recAddress: "",
+        nameList: "",
+        memberName: "",
+        phone: "",
+        idCard: "",
+        pkBank: "",
+        cardNumber: "",
+        subBankName: "",
+        email: "",
+        deliveryWay: "",
+        transType: "",
       },
       rules: {
         fwzx: [
-          { required: true, message: '请输入活动名称', trigger: 'change' },
+          { required: true, message: "请输入活动名称", trigger: "change" },
         ],
         pkGradeVal: [
-          { required: true, message: '请输入申请级别', trigger: 'change' },
+          { required: true, message: "请输入申请级别", trigger: "change" },
         ],
         memberName: [
-          { required: true, message: '请输入会员名称', trigger: 'blur' },
+          { required: true, message: "请输入会员名称", trigger: "blur" },
         ],
         // recName: [{ message: '请输入收件人', trigger: 'blur' }],
         recName: [{ validator: validateRecName }],
@@ -571,44 +623,44 @@ export default {
 
         // dizhi: [{ message: '请选择收货地址', trigger: 'change' }],
         parent: [
-          { required: true, validator: this.parentPass, trigger: 'blur' },
+          { required: true, validator: this.parentPass, trigger: "blur" },
         ],
         parentName: [
-          { required: true, message: '请输入推荐姓名', trigger: 'change' },
+          { required: true, message: "请输入推荐姓名", trigger: "change" },
         ],
         placeParent: [
-          { required: true, validator: this.placeParentPass, trigger: 'blur' },
+          { required: true, validator: this.placeParentPass, trigger: "blur" },
         ],
         placeParentName: [
-          { required: true, message: '请输入安置姓名', trigger: 'change' },
+          { required: true, message: "请输入安置姓名", trigger: "change" },
         ],
-        phone: [{ required: true, validator: this.phonePass, trigger: 'blur' }],
+        phone: [{ required: true, validator: this.phonePass, trigger: "blur" }],
         pkCountry: [
           {
             required: true,
-            message: '请选择自然国',
-            trigger: 'change',
+            message: "请选择自然国",
+            trigger: "change",
           },
         ],
         pkSettleCountry: [
           {
             required: true,
-            message: '请选择结算国',
-            trigger: 'change',
+            message: "请选择结算国",
+            trigger: "change",
           },
         ],
         deliveryWay: [
           {
             required: true,
-            message: '请选择发货方式',
-            trigger: 'change',
+            message: "请选择发货方式",
+            trigger: "change",
           },
         ],
         placeDept: [
           {
             required: true,
             validator: this.placeDeptPass,
-            trigger: 'change',
+            trigger: "change",
           },
         ],
         // transType: [
@@ -620,30 +672,30 @@ export default {
         // ],
         transType: [{ validator: validateRecTransType }],
         email: [
-          { required: false, trigger: 'blur' },
+          { required: false, trigger: "blur" },
           {
             pattern:
               /^([0-9A-Za-z\-_\.]+)@([0-9a-z]+\.[a-z]{2,3}(\.[a-z]{2})?)$/g,
-            message: '请输入正确的邮箱',
-            trigger: 'blur',
+            message: "请输入正确的邮箱",
+            trigger: "blur",
           },
         ],
       },
       addressList: [],
-      moren: '',
+      moren: "",
       deptOption: [
         {
           value: 1,
-          name: '安置左区',
+          name: "安置左区",
         },
         {
           value: 2,
-          name: '安置右区',
+          name: "安置右区",
         },
       ],
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         // {
@@ -663,35 +715,35 @@ export default {
       bankLists: [],
       areaData: [],
       regionParams: {
-        label: 'name',
-        value: 'id',
-        children: 'children',
-        expandTrigger: 'hover',
+        label: "name",
+        value: "id",
+        children: "children",
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-      isLoading: '',
+      isLoading: "",
       shoppingArr: [],
       totalAmont: 0,
-      specialArea: '',
+      specialArea: "",
       pt: false,
-      pkCountry:''
-    }
+      pkCountry: "",
+    };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     this.pkCountry = parseInt(localStorage.getItem("pkCountry"));
-    this.specialArea = this.$route.query.specialArea
+    this.specialArea = this.$route.query.specialArea;
     // 数据源
-    this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'))
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
-    this.getCatDetail()
+    this.getCatDetail();
     // 幂等性
     api.generate().then((res) => {
-      setTokenMi(res.msg)
-    })
+      setTokenMi(res.msg);
+    });
   },
   methods: {
     getCatDetail() {
@@ -701,142 +753,142 @@ export default {
           specialArea: this.specialArea,
         })
         .then((res) => {
-          this.allGoodsData = res.data
+          this.allGoodsData = res.data;
           this.waresCodeList = res.data.orderItemsParams.map((item) => {
-            return item.waresCode
-          })
-          this.allGoodsData.specialArea = this.specialArea
-          this.allData = this.allGoodsData.orderItemsParams
-          this.totalAmont = this.allGoodsData.priceAmount
+            return item.waresCode;
+          });
+          this.allGoodsData.specialArea = this.specialArea;
+          this.allData = this.allGoodsData.orderItemsParams;
+          this.totalAmont = this.allGoodsData.priceAmount;
           // 服务中心赋值
-          this.ruleForm.fwzx = this.userInfo.memberCode
+          this.ruleForm.fwzx = this.userInfo.memberCode;
           // 快速注册/普通注册
-          this.toRegiest(this.isClick)
+          this.toRegiest(this.isClick);
 
           // 获取地址
-          this.getAddressList()
+          this.getAddressList();
           // 获取国家
-          this.getCountry()
+          this.getCountry();
           // 获取运输方式
-          this.getTransList()
+          this.getTransList();
           // 获取发货方式
-          this.getDeliveryList()
+          this.getDeliveryList();
           // 获取银行
-          this.getBank()
+          this.getBank();
           // 获取省市县
-          this.getAllArea()
+          this.getAllArea();
           // 获取会员等级
-          this.getMember()
-        })
+          this.getMember();
+        });
     },
     selDelivery(e) {
       if (e == 2 || e == 3) {
-        this.isDeliveryWay = false
+        this.isDeliveryWay = false;
       } else {
-        this.isDeliveryWay = true
+        this.isDeliveryWay = true;
       }
     },
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)',
-      })
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
     },
     toRegiest(val) {
-      this.isClick = val
-      this.resetAll()
+      this.isClick = val;
+      this.resetAll();
       if (val == 0) {
         // 推荐编号赋值
-        this.ruleForm.parent = this.userInfo.memberCode
+        this.ruleForm.parent = this.userInfo.memberCode;
         // 推荐姓名赋值
-        this.ruleForm.parentName = this.userInfo.memberName
+        this.ruleForm.parentName = this.userInfo.memberName;
         // 从推荐编号获取安置信息
         // this.getQuickReg()
-        this.getValidPcode()
+        this.getValidPcode();
       } else {
       }
       if (this.userInfo.pkSettleCountry == 1) {
-        this.ruleForm.transType = 1
-        this.ruleForm.deliveryWay = 1
+        this.ruleForm.transType = 1;
+        this.ruleForm.deliveryWay = 1;
       }
     },
     resetAll() {
-      this.ruleForm.parent = ''
-      this.ruleForm.parentName = ''
-      this.ruleForm.placeParent = ''
-      this.ruleForm.placeParentName = ''
-      this.ruleForm.placeDept = ''
-      this.ruleForm.memberName = ''
-      this.ruleForm.phone = ''
-      this.ruleForm.idCard = ''
-      this.ruleForm.pkBank = ''
-      this.ruleForm.cardNumber = ''
-      this.ruleForm.subBankName = ''
-      this.ruleForm.email = ''
-      this.ruleForm.deliveryWay = ''
-      this.ruleForm.transType = ''
+      this.ruleForm.parent = "";
+      this.ruleForm.parentName = "";
+      this.ruleForm.placeParent = "";
+      this.ruleForm.placeParentName = "";
+      this.ruleForm.placeDept = "";
+      this.ruleForm.memberName = "";
+      this.ruleForm.phone = "";
+      this.ruleForm.idCard = "";
+      this.ruleForm.pkBank = "";
+      this.ruleForm.cardNumber = "";
+      this.ruleForm.subBankName = "";
+      this.ruleForm.email = "";
+      this.ruleForm.deliveryWay = "";
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
-        this.$refs.ruleForm.clearValidate()
-      })
+        this.$refs.ruleForm.clearValidate();
+      });
     },
     closePay(val) {
       if (val) {
-        this.isPay = false
+        this.isPay = false;
         this.$router.push({
-          path: '/vipCenter',
+          path: "/vipCenter",
           query: { id: 1 },
-        })
+        });
       } else {
-        this.$confirm('确认取消支付' + '?')
+        this.$confirm("确认取消支付" + "?")
           .then((_) => {
-            this.isPay = false
+            this.isPay = false;
             this.$router.push({
-              path: '/vipCenter',
+              path: "/vipCenter",
               query: { id: 1 },
-            })
+            });
           })
-          .catch((_) => {})
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
-      let deleteList = []
+      let deleteList = [];
       this.shoppingArr.forEach((item) => {
         deleteList.push({
           shoppingId: item,
-        })
-      })
+        });
+      });
       this.$refs[formName].validate((valid) => {
         if (!this.agreementShow) {
           this.$message({
-            message: '请阅读并同意购买协议',
-            type: 'warning',
-          })
-          return
+            message: "请阅读并同意购买协议",
+            type: "warning",
+          });
+          return;
         }
         if (valid) {
-          this.openLoading()
+          this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
             deleteList: deleteList,
-          })
+          });
           api
             .confirmFunOrder(obj)
             .then((res) => {
-              this.isLoading.close()
+              this.isLoading.close();
               if (res.code == 200) {
-                this.paramsPost = res.data
-                this.isPay = true
+                this.paramsPost = res.data;
+                this.isPay = true;
               }
             })
             .catch((err) => {
-              this.isLoading.close()
-            })
+              this.isLoading.close();
+            });
         } else {
-          return false
+          return false;
         }
-      })
+      });
       // let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
       // console.log(
       //   '%c [ obj ]-498',
@@ -849,103 +901,103 @@ export default {
         return result.concat(
           item,
           Array.isArray(item.children) ? this.flatten(item.children) : []
-        )
-      }, [])
+        );
+      }, []);
     },
     setDizhi(e, val) {
-      let arr = this.flatten(this.areaData)
-      let nameList = ''
+      let arr = this.flatten(this.areaData);
+      let nameList = "";
       arr.forEach((item) => {
         this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
-            nameList += item.name
+            nameList += item.name;
           }
-        })
-      })
-      this.ruleForm.nameList = nameList
-      this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-      this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || ''
-      this.allGoodsData.recName = this.ruleForm.recName
-      this.allGoodsData.recPhone = this.ruleForm.recPhone
-      this.allGoodsData.recAddress = this.ruleForm.recAddress
-      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-      this.allGoodsData.transType = this.ruleForm.transType
-      this.getPostAge()
+        });
+      });
+      this.ruleForm.nameList = nameList;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || "";
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.getPostAge();
     },
     checkRadio() {
-      this.$set(this.ruleForm, 'dizhi', [])
-      let arr = []
+      this.$set(this.ruleForm, "dizhi", []);
+      let arr = [];
       this.addressList.forEach((item) => {
         if (item.pkId == this.moren) {
-          this.ruleForm.recName = item.recName
-          this.ruleForm.nameList = item.recArea
-          this.ruleForm.recPhone = item.recPhone
-          this.ruleForm.recAddress = item.recAddress
+          this.ruleForm.recName = item.recName;
+          this.ruleForm.nameList = item.recArea;
+          this.ruleForm.recPhone = item.recPhone;
+          this.ruleForm.recAddress = item.recAddress;
           arr = [
-            item.recProvince + '',
-            item.recCity + '',
-            (item.recCounty || '') + '',
-          ]
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
           // this.$set(this.ruleForm, 'dizhi', [
           //   item.recProvince + '',
           //   item.recCity + '',
           //   item.recCounty + '',
           // ])
         }
-      })
+      });
       arr = arr.filter((s) => {
-        return s && s.trim()
-      })
-      this.$set(this.ruleForm, 'dizhi', arr)
-      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-      this.allGoodsData.transType = this.ruleForm.transType
-      this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-      this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-      this.allGoodsData.recCounty = this.ruleForm.dizhi[2]
-      this.allGoodsData.recName = this.ruleForm.recName
-      this.allGoodsData.recPhone = this.ruleForm.recPhone
-      this.allGoodsData.recAddress = this.ruleForm.recAddress
-      this.getPostAge()
-      this.$forceUpdate()
+        return s && s.trim();
+      });
+      this.$set(this.ruleForm, "dizhi", arr);
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2];
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.getPostAge();
+      this.$forceUpdate();
       console.log(
-        '%c [ this.ruleForm ]-813',
-        'font-size:13px; background:#982b93; color:#dc6fd7;',
+        "%c [ this.ruleForm ]-813",
+        "font-size:13px; background:#982b93; color:#dc6fd7;",
         this.ruleForm
-      )
+      );
     },
     getPostAge() {
-      let deleteList = []
+      let deleteList = [];
       this.shoppingArr.forEach((item) => {
         deleteList.push({
           shoppingId: item,
-        })
-      })
-      this.allGoodsData.deleteList = deleteList
+        });
+      });
+      this.allGoodsData.deleteList = deleteList;
       api.queryPostage(this.allGoodsData).then((res) => {
-        this.ruleForm.postage = Number(res.data.postage).toFixed(2)
+        this.ruleForm.postage = Number(res.data.postage).toFixed(2);
         this.totalAmont =
           parseFloat(this.allGoodsData.priceAmount) +
-          parseFloat(res.data.postage)
-      })
+          parseFloat(res.data.postage);
+      });
     },
     getMember() {
-      let deleteList = []
+      let deleteList = [];
       this.shoppingArr.forEach((item) => {
         deleteList.push({
           shoppingId: item,
-        })
-      })
-      this.allGoodsData.deleteList = deleteList
+        });
+      });
+      this.allGoodsData.deleteList = deleteList;
       api.memLevel(this.allGoodsData).then((res) => {
-        this.ruleForm.pkGradeVal = res.data.pkGradeVal
-      })
+        this.ruleForm.pkGradeVal = res.data.pkGradeVal;
+      });
     },
     phonePass(rule, value, callback) {
       if (!value) {
-        callback(new Error('请输入联系电话'))
+        callback(new Error("请输入联系电话"));
       } else {
-        callback()
+        callback();
         // api
         //   .validPhone({
         //     memberName: this.ruleForm.memberName,
@@ -963,7 +1015,7 @@ export default {
     },
     parentPass(rule, value, callback) {
       if (!value) {
-        callback(new Error('请输入推荐编号'));
+        callback(new Error("请输入推荐编号"));
       } else {
         // if (this.isClick == 0) {
         //   this.getQuickReg()
@@ -977,7 +1029,7 @@ export default {
     // 安置编号校验
     placeParentPass(rule, value, callback) {
       if (!value) {
-        callback(new Error('请输入安置编号'))
+        callback(new Error("请输入安置编号"));
       } else {
         api
           .validPPcode({
@@ -987,18 +1039,18 @@ export default {
           })
           .then((res) => {
             if (res.code == 200) {
-              this.ruleForm.placeParentName = res.data.placeParentName
-              this.$forceUpdate()
-              callback()
+              this.ruleForm.placeParentName = res.data.placeParentName;
+              this.$forceUpdate();
+              callback();
             } else {
-              callback(new Error(res.msg))
+              callback(new Error(res.msg));
             }
-          })
+          });
       }
     },
     placeDeptPass(rule, value, callback) {
       if (!value) {
-        callback(new Error('请选择安置位置'))
+        callback(new Error("请选择安置位置"));
       } else {
         api
           .validPPcode({
@@ -1008,34 +1060,34 @@ export default {
           })
           .then((res) => {
             if (res.code == 200) {
-              this.ruleForm.placeParentName = res.data.placeParentName
-              this.$forceUpdate()
-              callback()
+              this.ruleForm.placeParentName = res.data.placeParentName;
+              this.$forceUpdate();
+              callback();
             } else {
-              callback(new Error(res.msg))
+              callback(new Error(res.msg));
             }
-          })
+          });
       }
     },
     getAllArea() {
       api.allArea().then((res) => {
-        this.areaData = res.data
-      })
+        this.areaData = res.data;
+      });
     },
     getBank() {
       api.bankList().then((res) => {
-        this.bankLists = res.data
-      })
+        this.bankLists = res.data;
+      });
     },
     getTransList() {
       api.transportList().then((res) => {
-        this.transList = res.data
-      })
+        this.transList = res.data;
+      });
     },
     getDeliveryList() {
       api.deliveryList().then((res) => {
-        this.deliList = res.data
-      })
+        this.deliList = res.data;
+      });
     },
     getQuickReg() {
       api
@@ -1045,22 +1097,22 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            this.ruleForm.placeDept = res.data.placeDept
-            this.ruleForm.placeParent = res.data.placeParent
-            this.ruleForm.placeParentName = res.data.placeParentName
+            this.ruleForm.placeDept = res.data.placeDept;
+            this.ruleForm.placeParent = res.data.placeParent;
+            this.ruleForm.placeParentName = res.data.placeParentName;
             this.ruleForm.parentName = res.data.parentName;
             if (res.data.isFirst) {
               // 普通注册首单
-              this.pt = true
+              this.pt = true;
             } else {
               // 普通注册首单
-              this.pt = false
+              this.pt = false;
             }
             // 根据推荐人编号获取安置信息覆盖快速注册信息
             // this.getValidPcode()
-            this.$forceUpdate()
+            this.$forceUpdate();
           }
-        })
+        });
     },
     getValidPcode() {
       api
@@ -1070,123 +1122,123 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             // this.ruleForm.parentName = res.data.parentName
-            this.getQuickReg()
-            this.$forceUpdate()
+            this.getQuickReg();
+            this.$forceUpdate();
           }
-        })
+        });
     },
     // 自然国选择国旗、
     changeSelection(e) {
       let optionsImg = this.countryList,
-        i = optionsImg.findIndex((item) => item.pkId == e)
-      this.$refs['select'].$el.children[0].children[0].setAttribute(
-        'style',
+        i = optionsImg.findIndex((item) => item.pkId == e);
+      this.$refs["select"].$el.children[0].children[0].setAttribute(
+        "style",
         `
 				background: url(${optionsImg[i].nationalFlag2}) no-repeat;
 				background-position: 10px center;
 				background-size: 28px 19px;
 				text-indent: 30px;
 				`
-      )
+      );
     },
     // 结算国选择国旗
     changeSelection1(e) {
       let optionsImg = this.countryList,
-        i = optionsImg.findIndex((item) => item.pkId == e)
-      this.$refs['select'].$el.children[0].children[0].setAttribute(
-        'style',
+        i = optionsImg.findIndex((item) => item.pkId == e);
+      this.$refs["select"].$el.children[0].children[0].setAttribute(
+        "style",
         `
 				background: url(${optionsImg[i].nationalFlag2}) no-repeat;
 				background-position: 10px center;
 				background-size: 28px 19px;
 				text-indent: 30px;
 				`
-      )
+      );
     },
     getCountry() {
       api.currencyList().then((res) => {
-        this.countryList = res.data
+        this.countryList = res.data;
         this.countryList.forEach((item) => {
           if (item.pkId == this.userInfo.pkSettleCountry) {
-            this.ruleForm.pkCountry = item.pkId
-            this.ruleForm.pkSettleCountry = item.pkId
+            this.ruleForm.pkCountry = item.pkId;
+            this.ruleForm.pkSettleCountry = item.pkId;
             // 自然国图片赋值
-            this.$refs['select'].$el.children[0].children[0].setAttribute(
-              'style',
+            this.$refs["select"].$el.children[0].children[0].setAttribute(
+              "style",
               `
 				background: url(${item.nationalFlag2}) no-repeat;
 				background-position: 10px center;
 				background-size: 28px 19px;
 				text-indent: 30px;
 				`
-            )
+            );
             // 结算国图片赋值
-            this.$refs['select1'].$el.children[0].children[0].setAttribute(
-              'style',
+            this.$refs["select1"].$el.children[0].children[0].setAttribute(
+              "style",
               `
 				background: url(${item.nationalFlag2}) no-repeat;
 				background-position: 10px center;
 				background-size: 28px 19px;
 				text-indent: 30px;
 				`
-            )
+            );
           }
-        })
-      })
+        });
+      });
     },
     delAds(id) {
-      this.$confirm('确定要删除该收货地址吗' + '?', '', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
+      this.$confirm("确定要删除该收货地址吗" + "?", "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
         api.delAddress(id).then((res) => {
           this.$message({
-            type: 'success',
-            message: '删除成功' + '!',
-          })
-          this.getAddressList()
-        })
-      })
+            type: "success",
+            message: "删除成功" + "!",
+          });
+          this.getAddressList();
+        });
+      });
     },
     changeAds(id) {
-      this.$refs.addAddress.isShowAddress(true, this.areaData, id)
+      this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
       api.addressDefault(id).then((res) => {
-        this.getAddressList()
-      })
+        this.getAddressList();
+      });
     },
     // 同意协议
     agree(val) {
-      this.agreementShow = val
+      this.agreementShow = val;
     },
     openAddress() {
-      this.$refs.addAddress.isShowAddress(true, this.areaData)
+      this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
       api.addressList({}).then((res) => {
-        this.addressList = res.data
+        this.addressList = res.data;
         this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
-            this.moren = item.pkId
-            this.checkRadio()
+            this.moren = item.pkId;
+            this.checkRadio();
           }
-        })
+        });
         // this.moren = this.addressList[0].pkId
-      })
+      });
     },
     // 斑马线
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 0) {
-        return 'warning-row'
+        return "warning-row";
       } else if (rowIndex % 2 == 1) {
-        return 'success-row'
+        return "success-row";
       }
-      return ''
+      return "";
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -1210,7 +1262,7 @@ export default {
   .zca {
     font-size: 18px;
     font-weight: bold;
-    color: #00417C;
+    color: #00417c;
   }
 }
 
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index 10cd4e0..89c60bf 100644
--- a/src/views/index/index.vue
+++ b/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>
       <!-- 右侧侧侧边栏 -->
diff --git a/src/views/integral/index.vue b/src/views/integral/index.vue
index def689d..674d26c 100644
--- a/src/views/integral/index.vue
+++ b/src/views/integral/index.vue
@@ -9,19 +9,18 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-      <div class="rti dis_flex">
-        积分会员信息
-      </div>
+      <div class="rti dis_flex">积分会员信息</div>
     </div>
     <!-- 表单 -->
-    <el-form :model="ruleForm"
-             :rules="rules"
-             ref="ruleForm"
-             label-position="top"
-             status-icon
-             class="demo-ruleForm">
-      <el-row :gutter="40"
-              class="padRow">
+    <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="'服务中心'"
                         prop="fwzx">
@@ -30,48 +29,59 @@
           </el-form-item>
         </el-col> -->
         <el-col :span="6">
-          <el-form-item :label="'会员编号'"
-                        prop="upgradeMemberCode">
+          <el-form-item :label="'会员编号'" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-            <el-input v-model="ruleForm.upgradeMemberCode"
-                      :placeholder="'请输入会员编号'"></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :placeholder="'请输入会员编号'"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item :label="'会员姓名'"
-                        prop="upgradeMemberName">
-            <el-input v-model="ruleForm.upgradeMemberName"
-                      :placeholder="'请输入会员姓名'"
-                      disabled></el-input>
+          <el-form-item :label="'会员姓名'" prop="upgradeMemberName">
+            <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"
-                       :disabled="this.userInfo.pkSettleCountry == 1"
-                       :placeholder="'请选择发货方式'">
-              <el-option v-for="item in deliList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item :label="'发货方式'" prop="deliveryWay">
+            <el-select
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :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="'运输方式'"
-                        :required="isDeliveryWay"
-                        prop="transType">
-            <el-select v-model="ruleForm.transType"
-                       :disabled="this.userInfo.pkSettleCountry == 1"
-                       :placeholder="'请选择运输方式'">
-              <el-option v-for="item in transList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item
+            :label="'运输方式'"
+            :required="isDeliveryWay"
+            prop="transType"
+          >
+            <el-select
+              v-model="ruleForm.transType"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="'请选择运输方式'"
+            >
+              <el-option
+                v-for="item in transList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -79,12 +89,10 @@
       </el-row>
       <div v-show="isDeliveryWay">
         <div class="xian1">
-          <div class="title">{{ '收货人信息' }}</div>
-          <div class="lan"
-               @click="openAddress">{{ '新增收货人地址' }}</div>
+          <div class="title">{{ "收货人信息" }}</div>
+          <div class="lan" @click="openAddress">{{ "新增收货人地址" }}</div>
         </div>
-        <el-row :gutter="40"
-                class="padRow">
+        <el-row :gutter="40" class="padRow">
           <!-- <el-col :span="6">
             <el-form-item :label="'收货人'" 
                           :required="isDeliveryWay"
@@ -105,16 +113,24 @@
           </el-col> -->
 
           <el-col :span="6">
-            <el-form-item :label="'收货人'" prop="recName" :required="isDeliveryWay">
+            <el-form-item
+              :label="'收货人'"
+              prop="recName"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recName"
-               :maxlength="40"
+                :maxlength="40"
                 :placeholder="'请输入收货人'"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6" v-if="pkCountry == 1">
-            <el-form-item :label="'联系方式'" prop="recPhone" :required="isDeliveryWay">
+            <el-form-item
+              :label="'联系方式'"
+              prop="recPhone"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recPhone"
                 :maxlength="11"
@@ -124,7 +140,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" v-else>
-            <el-form-item :label="'联系方式'" prop="recPhone" :required="isDeliveryWay">
+            <el-form-item
+              :label="'联系方式'"
+              prop="recPhone"
+              :required="isDeliveryWay"
+            >
               <el-input
                 v-model="ruleForm.recPhone"
                 :maxlength="30"
@@ -133,107 +153,124 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item :label="'收货地址'"
-                          class="dizhi"
-                          :required="isDeliveryWay"
-                          prop="dizhi">
-              <el-cascader v-model="ruleForm.dizhi"
-                           @change="setDizhi"
-                           :options="areaData"
-                           :props="regionParams"
-                           :placeholder="'请选择收货地址'"></el-cascader>
+            <el-form-item
+              :label="'收货地址'"
+              class="dizhi"
+              :required="isDeliveryWay"
+              prop="dizhi"
+            >
+              <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="'详细地址'"
-                          :required="isDeliveryWay"
-                          prop="recAddress">
-              <el-input v-model="ruleForm.recAddress"
-              maxlength="200"
-                        :placeholder="'请输入详细地址'"></el-input>
+            <el-form-item
+              :label="'详细地址'"
+              :required="isDeliveryWay"
+              prop="recAddress"
+            >
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="'请输入详细地址'"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="40"
-                class="padRow">
+        <el-row :gutter="40" class="padRow">
           <el-col :span="6">
             <el-form-item :label="'邮费'">
-              <el-input v-model="ruleForm.postage"
-                        disabled></el-input>
+              <el-input v-model="ruleForm.postage" disabled></el-input>
             </el-form-item>
           </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">
-        <div class="title">{{ '历史地址' }}</div>
-      </div>
-    <div class="local"
-         v-show="isDeliveryWay">
-      <div :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>
-        <div class="local2"
-             @click="changeAds(item.pkId)">{{ '编辑' }}</div>
-        <div class="local3"
-             @click="delAds(item.pkId)">{{ '删除' }}</div>
+      <div class="title">{{ "历史地址" }}</div>
+    </div>
+    <div class="local" v-show="isDeliveryWay">
+      <div
+        :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>
+        <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' }"
-              :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="'商品名称'">
+    <el-table
+      :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="'商品名称'"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
             <div class="goods_t">
-              <img :src="scope.row.cover1"
-                   alt="">
+              <img :src="scope.row.cover1" alt="" />
               <div>{{ scope.row.waresName }}</div>
             </div>
-            <div class="goods_tit"
-                 v-for="item in scope.row.waresItemsParamList"
-                 :key="item.pkWaresSpecsSku">
+            <div
+              class="goods_tit"
+              v-for="item in scope.row.waresItemsParamList"
+              :key="item.pkWaresSpecsSku"
+            >
               <div class="goods_tit_l">
-                <img :src="item.specCover"
-                     alt="">
+                <img :src="item.specCover" alt="" />
                 <div class="goods_tit_lr">
                   <div>
                     {{ item.productName }}
                   </div>
-                  <div>
-                    x {{ item.quantity }}
-                  </div>
+                  <div>x {{ item.quantity }}</div>
                 </div>
               </div>
               <div class="goods_tit_r">
@@ -243,93 +280,108 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="goodsPrice"
-                       :label="'商品单价'+'(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="'商品单价' + '(¥)'"
+      >
         <template slot-scope="scope">
-          <span>{{ scope.row.price | numberToCurrency}}</span>
+          <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>
+          <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="quantity"
-                       :label="'商品数量'">
+      <el-table-column align="center" prop="quantity" :label="'商品数量'">
       </el-table-column>
-      <el-table-column align="center"
-                       prop="spyjxj"
-                       :label="'业绩小计'+'PV'">
+      <el-table-column align="center" prop="spyjxj" :label="'业绩小计' + 'PV'">
         <template slot-scope="scope">
-          <span>{{
-             scope.row.achieveAmount| numberToCurrency
-            }}</span>
+          <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center"
-                       prop="pvxj"
-                       :label="'金额小计'+'(¥)'">
+      <el-table-column align="center" prop="pvxj" :label="'金额小计' + '(¥)'">
         <template slot-scope="scope">
-          <span>{{ scope.row.priceAmount | numberToCurrency}}</span>
+          <span>{{ scope.row.priceAmount | numberToCurrency }}</span>
         </template>
       </el-table-column>
     </el-table>
     <div class="tab_b">
-      <div>{{ '商品金额总计' }}:{{ userInfo.currencyIcon }}{{ allGoodsData.priceAmount | numberToCurrency }}</div>
-      <div>{{ '邮费' }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}</div>
+      <div>
+        {{ "商品金额总计" }}:{{ userInfo.currencyIcon
+        }}{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>
+        {{ "邮费" }}:{{ userInfo.currencyIcon
+        }}{{ ruleForm.postage | numberToCurrency }}
+      </div>
     </div>
-    <AddAddress ref="addAddress"
-                @getAdList="getAddressList"></AddAddress>
+    <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
     <!-- 购买 -->
     <div class="tfooter">
       <div class="footer_t">
-        <div class="footer_tt ">
+        <div class="footer_tt">
           <div class="dis_flex">
-            <div class="f1">{{ '总价' }}:</div>
-            <div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont  | numberToCurrency}}</div>
+            <div class="f1">{{ "总价" }}:</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
-            <div class="f1">{{ '业绩' }}:</div>
-            <div class="f3">{{ allGoodsData.achieveAmount  | numberToCurrency}}</div>
+            <div class="f1">{{ "业绩" }}:</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
+            </div>
           </div>
         </div>
-        <div class="footer_tt"
-             v-show="ruleForm.recAddress&&ruleForm.recName&&ruleForm.recPhone&&ruleForm.nameList">
-          <div class="f2 f4">{{ '寄送至' }}：{{ruleForm.nameList}}{{ ruleForm.recAddress }}</div>
-          <div class="f4">{{ '收货人' }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+        <div
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ "寄送至" }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ "收货人" }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-        <agreement :isShow="agreementShow"
-                   ref="agree"
-                   @agree="agree"></agreement>
-        <div class="btn"
-             @click="submitRegister('ruleForm')">{{ '购买' }}</div>
+        <agreement
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement>
+        <div class="btn" @click="submitRegister('ruleForm')">{{ "购买" }}</div>
       </div>
     </div>
-     <!-- 强制阅读协议 -->
-     <mustAgreeMent :waresCodeList='waresCodeList'></mustAgreeMent>
-    <Pay :isPay="isPay"
-         @closePay="closePay"
-         :paramsPost="paramsPost"></Pay>
+    <!-- 强制阅读协议 -->
+    <mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
+    <Pay :isPay="isPay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
   </div>
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue'
-import AddAddress from '@/components/AddAddress.vue'
-import agreement from '@/components/agreement.vue'
-import { mapGetters } from 'vuex'
-import * as api from '@/api/register.js'
-import { setTokenMi } from '@/util/auth'
-import Pay from '@/components/Pay.vue'
-import mustAgreeMent from '@/components/mustAgreeMent.vue'
+import personInfo from "@/components/personInfo.vue";
+import AddAddress from "@/components/AddAddress.vue";
+import agreement from "@/components/agreement.vue";
+import { mapGetters } from "vuex";
+import * as api from "@/api/register.js";
+import { setTokenMi } from "@/util/auth";
+import Pay from "@/components/Pay.vue";
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 
 export default {
   components: {
@@ -337,59 +389,59 @@ export default {
     AddAddress,
     agreement,
     Pay,
-    mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-      if (this.ruleForm.transType == '' && this.isDeliveryWay) {
-        callback(new Error('请选择运输方式'))
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
+        callback(new Error("请选择运输方式"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
-      waresCodeList:[],
+      waresCodeList: [],
       isPay: false,
-      paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
         dizhi: [],
-        fwzx: '',
-        upgradeMemberCode:'',
-        upgradeMemberName: '',
-        postage: '',
-        recName: '',
-        recPhone: '',
-        recAddress: '',
-        deliveryWay: '',
-        transType: '',
+        fwzx: "",
+        upgradeMemberCode: "",
+        upgradeMemberName: "",
+        postage: "",
+        recName: "",
+        recPhone: "",
+        recAddress: "",
+        deliveryWay: "",
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-            trigger: 'blur',
+            trigger: "blur",
           },
         ],
         gradeName: [
-          { required: true, message: '请输入申请级别', trigger: 'change' },
+          { required: true, message: "请输入申请级别", trigger: "change" },
         ],
         upgradeMemberName: [
-          { required: true, message: '请输入会员姓名', trigger: 'change' },
+          { required: true, message: "请输入会员姓名", trigger: "change" },
         ],
-        recName: [{ required: true, message: '请输入收件人', trigger: 'blur' }],
+        recName: [{ required: true, message: "请输入收件人", trigger: "blur" }],
         recPhone: [
-          { required: true, message: '请输入联系方式', trigger: 'blur' },
+          { required: true, message: "请输入联系方式", trigger: "blur" },
         ],
         recAddress: [
-          { required: true, message: '请输入详细地址', trigger: 'blur' },
+          { required: true, message: "请输入详细地址", trigger: "blur" },
         ],
         deliveryWay: [
           {
             required: true,
-            message: '请选择发货方式',
-            trigger: 'change',
+            message: "请选择发货方式",
+            trigger: "change",
           },
         ],
         // transType: [
@@ -402,45 +454,45 @@ export default {
         transType: [{ validator: validateRecTransType }],
       },
       addressList: [],
-      moren: '',
+      moren: "",
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
           value: 1,
-          label: '陆运',
+          label: "陆运",
         },
         {
           value: 2,
-          label: '空运',
+          label: "空运",
         },
         {
           value: 3,
-          label: '海运',
+          label: "海运",
         },
       ],
       deliList: [],
       bankLists: [],
       areaData: [],
       regionParams: {
-        label: 'name',
-        value: 'id',
-        children: 'children',
-        expandTrigger: 'hover',
+        label: "name",
+        value: "id",
+        children: "children",
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-      isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-      shoppingArr: '',
+      shoppingArr: "",
       totalAmont: 0,
-      pkCountry:''
-    }
+      pkCountry: "",
+    };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     this.pkCountry = parseInt(localStorage.getItem("pkCountry"));
@@ -464,8 +516,8 @@ export default {
     // this.totalAchive = totalAchive
     // this.allData = this.allGoodsData[0].orderItemsParams
     // // 服务中心赋值
-    this.ruleForm.upgradeMemberCode = this.userInfo.memberCode
-    this.getUserName()
+    this.ruleForm.upgradeMemberCode = this.userInfo.memberCode;
+    this.getUserName();
 
     // // 获取地址
     // this.getAddressList()
@@ -477,23 +529,23 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-    this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'))
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
-    this.getCatDetail()
+    this.getCatDetail();
     // 幂等性
     api.generate().then((res) => {
-      setTokenMi(res.msg)
-    })
+      setTokenMi(res.msg);
+    });
     if (this.userInfo.pkSettleCountry == 1) {
-      this.ruleForm.transType = 1
-      this.ruleForm.deliveryWay = 1
+      this.ruleForm.transType = 1;
+      this.ruleForm.deliveryWay = 1;
     }
   },
   methods: {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-        callback(new Error('请输入会员编号'))
+        callback(new Error("请输入会员编号"));
       } else {
         api
           .upgRel({
@@ -501,15 +553,15 @@ export default {
           })
           .then((res) => {
             if (res.code == 200) {
-              this.ruleForm.upgradeMemberName = res.data.upgradeMemberName
+              this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
-              this.$forceUpdate()
-              callback()
+              this.$forceUpdate();
+              callback();
             }
           })
           .catch((err) => {
-            callback(new Error(err))
-          })
+            callback(new Error(err));
+          });
       }
     },
     getCatDetail() {
@@ -519,50 +571,50 @@ export default {
           specialArea: 11,
         })
         .then((res) => {
-          this.allGoodsData = res.data
-          this.waresCodeList = res.data.orderItemsParams.map(item=>{
-            return item.waresCode
-          })
-          this.allGoodsData.specialArea = 11
-          this.allData = this.allGoodsData.orderItemsParams
-          this.totalAmont = this.allGoodsData.priceAmount
+          this.allGoodsData = res.data;
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
+            return item.waresCode;
+          });
+          this.allGoodsData.specialArea = 11;
+          this.allData = this.allGoodsData.orderItemsParams;
+          this.totalAmont = this.allGoodsData.priceAmount;
           // 服务中心赋值
           // this.ruleForm.fwzx = this.userInfo.memberCode
 
           // 获取地址
-          this.getAddressList()
+          this.getAddressList();
           // 获取运输方式
-          this.getTransList()
+          this.getTransList();
           // 获取发货方式
-          this.getDeliveryList()
+          this.getDeliveryList();
           // 获取省市县
-          this.getAllArea()
+          this.getAllArea();
           // 获取会员等级
           // this.getMember()
-        })
+        });
     },
     selDelivery(e) {
       if (e == 2 || e == 3) {
-        this.isDeliveryWay = false
+        this.isDeliveryWay = false;
       } else {
-        this.isDeliveryWay = true
+        this.isDeliveryWay = true;
       }
     },
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)',
-      })
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
     },
     resetAll() {
-      this.ruleForm.parent = ''
-      this.ruleForm.deliveryWay = ''
-      this.ruleForm.transType = ''
+      this.ruleForm.parent = "";
+      this.ruleForm.deliveryWay = "";
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
-        this.$refs.ruleForm.clearValidate()
-      })
+        this.$refs.ruleForm.clearValidate();
+      });
     },
     getUserName() {
       api
@@ -571,75 +623,75 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            this.ruleForm.upgradeMemberName = res.data.upgradeMemberName
-            this.$forceUpdate()
+            this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
+            this.$forceUpdate();
           }
-        })
+        });
     },
     closePay(val) {
       if (val) {
-        this.isPay = false
+        this.isPay = false;
         this.$router.push({
-          path: '/vipCenter',
+          path: "/vipCenter",
           query: { id: 1 },
-        })
+        });
       } else {
-        this.$confirm('确认取消支付'+'?')
+        this.$confirm("确认取消支付" + "?")
           .then((_) => {
-            this.isPay = false
+            this.isPay = false;
             this.$router.push({
-          path: '/vipCenter',
-          query: { id: 1 },
-        })
+              path: "/vipCenter",
+              query: { id: 1 },
+            });
           })
-          .catch((_) => {})
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
-      let deleteList = []
+      let deleteList = [];
       this.shoppingArr.forEach((item) => {
         deleteList.push({
           shoppingId: item,
-        })
-      })
+        });
+      });
       if (!this.agreementShow) {
         this.$message({
-          message: '请阅读并同意购买协议',
-          type: 'warning',
-        })
-        return
+          message: "请阅读并同意购买协议",
+          type: "warning",
+        });
+        return;
       }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-          message: '请选择收货人信息',
-          type: 'warning',
-        })
-        return
+          message: "请选择收货人信息",
+          type: "warning",
+        });
+        return;
       }
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.openLoading()
+          this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
             deleteList: deleteList,
-          })
+          });
 
           api
             .confirmOthOrder(obj)
             .then((res) => {
-              this.isLoading.close()
+              this.isLoading.close();
               if (res.code == 200) {
-                this.isPay = true
-                this.paramsPost = res.data
+                this.isPay = true;
+                this.paramsPost = res.data;
               }
             })
             .catch((err) => {
-              this.isLoading.close()
-            })
+              this.isLoading.close();
+            });
         } else {
-          return false
+          return false;
         }
-      })
+      });
       // let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
       // console.log(
       //   '%c [ obj ]-498',
@@ -652,76 +704,76 @@ export default {
         return result.concat(
           item,
           Array.isArray(item.children) ? this.flatten(item.children) : []
-        )
-      }, [])
+        );
+      }, []);
     },
     setDizhi(e, val) {
-      let arr = this.flatten(this.areaData)
-      let nameList = ''
+      let arr = this.flatten(this.areaData);
+      let nameList = "";
       arr.forEach((item) => {
         this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
-            nameList += item.name
+            nameList += item.name;
           }
-        })
-      })
-      this.ruleForm.nameList = nameList
-      this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-      this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || ''
-      this.allGoodsData.recName = this.ruleForm.recName
-      this.allGoodsData.recPhone = this.ruleForm.recPhone
-      this.allGoodsData.recAddress = this.ruleForm.recAddress
-      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-      this.allGoodsData.transType = this.ruleForm.transType
-      this.getPostAge()
+        });
+      });
+      this.ruleForm.nameList = nameList;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || "";
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.getPostAge();
     },
     checkRadio() {
-      this.$set(this.ruleForm, 'dizhi', [])
-      let arr = []
+      this.$set(this.ruleForm, "dizhi", []);
+      let arr = [];
       this.addressList.forEach((item) => {
         if (item.pkId == this.moren) {
-          this.ruleForm.recName = item.recName
-          this.ruleForm.nameList = item.recArea
-          this.ruleForm.recPhone = item.recPhone
-          this.ruleForm.recAddress = item.recAddress
+          this.ruleForm.recName = item.recName;
+          this.ruleForm.nameList = item.recArea;
+          this.ruleForm.recPhone = item.recPhone;
+          this.ruleForm.recAddress = item.recAddress;
           arr = [
-            item.recProvince + '',
-            item.recCity + '',
-            (item.recCounty || '') + '',
-          ]
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
-      })
+      });
       arr = arr.filter((s) => {
-        return s && s.trim()
-      })
+        return s && s.trim();
+      });
 
-      this.$set(this.ruleForm, 'dizhi', arr)
-      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-      this.allGoodsData.transType = this.ruleForm.transType
-      this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-      this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-      this.allGoodsData.recCounty = this.ruleForm.dizhi[2]
-      this.allGoodsData.recName = this.ruleForm.recName
-      this.allGoodsData.recPhone = this.ruleForm.recPhone
-      this.allGoodsData.recAddress = this.ruleForm.recAddress
-      this.getPostAge()
-      this.$forceUpdate()
+      this.$set(this.ruleForm, "dizhi", arr);
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2];
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.getPostAge();
+      this.$forceUpdate();
     },
     getPostAge() {
-      let deleteList = []
+      let deleteList = [];
       this.shoppingArr.forEach((item) => {
         deleteList.push({
           shoppingId: item,
-        })
-      })
-      this.allGoodsData.deleteList = deleteList
+        });
+      });
+      this.allGoodsData.deleteList = deleteList;
       api.queryPostage(this.allGoodsData).then((res) => {
-        this.ruleForm.postage = Number(res.data.postage).toFixed(2)
+        this.ruleForm.postage = Number(res.data.postage).toFixed(2);
         this.totalAmont =
           parseFloat(this.allGoodsData.priceAmount) +
-          parseFloat(res.data.postage)
-      })
+          parseFloat(res.data.postage);
+      });
     },
     // getMember() {
     //   this.allGoodsData.upgradeMemberCode = this.ruleForm.upgradeMemberCode
@@ -735,72 +787,72 @@ export default {
     // },
     getTransList() {
       api.transportList().then((res) => {
-        this.transList = res.data
-      })
+        this.transList = res.data;
+      });
     },
     getDeliveryList() {
       api.deliveryList().then((res) => {
-        this.deliList = res.data
-      })
+        this.deliList = res.data;
+      });
     },
     delAds(id) {
-      this.$confirm('确定要删除该收货地址吗'+'?', '', {
-        confirmButtonText: '确定' ,
-        cancelButtonText: '取消',
-        type: 'warning',
+      this.$confirm("确定要删除该收货地址吗" + "?", "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       }).then(() => {
         api.delAddress(id).then((res) => {
           this.$message({
-            type: 'success',
-            message: '删除成功'+'!',
-          })
-          this.getAddressList()
-        })
-      })
+            type: "success",
+            message: "删除成功" + "!",
+          });
+          this.getAddressList();
+        });
+      });
     },
     getAllArea() {
       api.allArea().then((res) => {
-        this.areaData = res.data
-      })
+        this.areaData = res.data;
+      });
     },
     changeAds(id) {
-      this.$refs.addAddress.isShowAddress(true, this.areaData, id)
+      this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
       api.addressDefault(id).then((res) => {
-        this.getAddressList()
-      })
+        this.getAddressList();
+      });
     },
     // 同意协议
     agree(val) {
-      this.agreementShow = val
+      this.agreementShow = val;
     },
     openAddress() {
-      this.$refs.addAddress.isShowAddress(true, this.areaData)
+      this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
       api.addressList({}).then((res) => {
-        this.addressList = res.data
+        this.addressList = res.data;
         this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
-            this.moren = item.pkId
-            this.checkRadio()
+            this.moren = item.pkId;
+            this.checkRadio();
           }
-        })
+        });
         // this.moren = this.addressList[0].pkId
-      })
+      });
     },
     // 斑马线
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 0) {
-        return 'warning-row'
+        return "warning-row";
       } else if (rowIndex % 2 == 1) {
-        return 'success-row'
+        return "success-row";
       }
-      return ''
+      return "";
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -823,7 +875,7 @@ export default {
   .zca {
     font-size: 18px;
     font-weight: bold;
-    color: #00417C;
+    color: #00417c;
   }
 }
 .demo-ruleForm {
@@ -1040,4 +1092,4 @@ export default {
   color: #666666;
   padding: 20px 60px 0 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/newGiftPay/index.vue b/src/views/newGiftPay/index.vue
index 882ca2f..c638c59 100644
--- a/src/views/newGiftPay/index.vue
+++ b/src/views/newGiftPay/index.vue
@@ -329,7 +329,7 @@ export default {
       moren: '',
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/pickPay/index.vue b/src/views/pickPay/index.vue
index a5b4b8b..7128670 100644
--- a/src/views/pickPay/index.vue
+++ b/src/views/pickPay/index.vue
@@ -361,7 +361,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/repurchase/index.vue b/src/views/repurchase/index.vue
index 742b877..36950cc 100644
--- a/src/views/repurchase/index.vue
+++ b/src/views/repurchase/index.vue
@@ -5,111 +5,181 @@
  * @Date: 2023-01-29 17:32:44
 -->
 <template>
-	<div>
-		<!-- 用户头 -->
-		<personInfo></personInfo>
-		<div class="rt dis_flex">
-			<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-row :gutter="40" class="padRow">
-				<el-col :span="6">
-					<el-form-item :label="'复购编号'"
-						v-if="specialArea != 28 && specialArea != 31 && specialArea != 30" 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"
-							:placeholder="'请输入复购编号'"></el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item :label="'复购姓名'"
-						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-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item :label="'发货方式'" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery"
-							: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"
-							: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-option v-for="item in queryCardList" :key="item.pkMember" :label="item.storeName"
-								:value="item.pkMember">
-							</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<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-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-option v-for="item in storehouseList" :key="item.pkId" :label="item.name"
-								:value="item.pkId">
-							</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-			</el-row>
-			<!-- 收货人信息 -->
-			<!-- <div v-show="isDeliveryWay">
+  <div>
+    <!-- 用户头 -->
+    <personInfo></personInfo>
+    <div class="rt dis_flex">
+      <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-row :gutter="40" class="padRow">
+        <el-col :span="6">
+          <el-form-item
+            :label="'复购编号'"
+            v-if="specialArea != 28 && specialArea != 31 && specialArea != 30"
+            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"
+              :placeholder="'请输入复购编号'"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item
+            :label="'复购姓名'"
+            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-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item :label="'发货方式'" prop="deliveryWay">
+            <el-select
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :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"
+              :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-option
+                v-for="item in queryCardList"
+                :key="item.pkMember"
+                :label="item.storeName"
+                :value="item.pkMember"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <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-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-option
+                v-for="item in storehouseList"
+                :key="item.pkId"
+                :label="item.name"
+                :value="item.pkId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- 收货人信息 -->
+      <!-- <div v-show="isDeliveryWay">
         <div class="xian">
           <div class="title">{{ '收货人信息' }}</div>
           <div class="lan"
                @click="openAddress">{{ '新增收货人地址' }}</div>
         </div>
       </div> -->
-			<!-- 收货人信息 -->
-			<div v-if="isDeliveryWay">
-				<div class="xian">
-					<div class="title">{{ '收货人信息' }}</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-form-item>
-					</el-col>
-					<!-- <el-col :span="6">
+      <!-- 收货人信息 -->
+      <div v-if="isDeliveryWay">
+        <div class="xian">
+          <div class="title">{{ "收货人信息" }}</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-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
             <el-form-item :label="'联系方式'"
                           prop="recPhone">
               <el-input v-model="ruleForm.recPhone"
@@ -118,1208 +188,1305 @@
                         :placeholder="'请输入联系方式'"></el-input>
             </el-form-item>
           </el-col> -->
-					<el-col :span="6" v-if="pkCountry == 1">
-						<el-form-item :label="'联系方式'" prop="recPhone">
-							<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"
-								: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"
-								: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"
-								:placeholder="'请输入详细地址'"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="40" class="padRow">
-					<el-col :span="6">
-						<el-form-item :label="'邮费'">
-							<el-input v-model="ruleForm.postage" disabled></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item :label="'备注'">
-							<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>
-		<div class="local" v-if="isDeliveryWay">
-			<div :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>
-				<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>
-		<el-table :data="allData" :row-style="{ height: '60px', fontSize: '15px', color: '#333333' }"
-			:cell-style="{ padding: '0' }" :fit="true" :header-cell-style="{
+          <el-col :span="6" v-if="pkCountry == 1">
+            <el-form-item :label="'联系方式'" prop="recPhone">
+              <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"
+                :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"
+                :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"
+                :placeholder="'请输入详细地址'"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="padRow">
+          <el-col :span="6">
+            <el-form-item :label="'邮费'">
+              <el-input v-model="ruleForm.postage" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'备注'">
+              <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>
+    <div class="local" v-if="isDeliveryWay">
+      <div
+        :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>
+        <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>
+    <el-table
+      :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="'商品名称'">
-				<template slot-scope="scope">
-					<!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
-					<div class="goods">
-						<div class="goods_t">
-							<img :src="scope.row.cover1" alt="" />
-							<div>{{ scope.row.waresName }}</div>
-						</div>
-						<div 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">
-									<div>
-										{{ item.productName }}
-									</div>
-									<div>x {{ item.quantity }}</div>
-								</div>
-							</div>
-							<div class="goods_tit_r">
-								{{ item.skuInfo }}
-							</div>
-						</div>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="'商品单价'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.price | numberToCurrency }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="'商品业绩' + '(PV)'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.achieve | numberToCurrency }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="quantity" :label="'商品数量'">
-			</el-table-column>
-			<el-table-column align="center" prop="spyjxj" :label="'业绩小计' + 'PV'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="pvxj" :label="'金额小计'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.priceAmount | numberToCurrency }}</span>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="tab_b">
-			<div>
-				{{ '商品金额总计' }}:{{ userInfo.currencyIcon
+      }"
+      :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">
+            <div class="goods_t">
+              <img :src="scope.row.cover1" alt="" />
+              <div>{{ scope.row.waresName }}</div>
+            </div>
+            <div
+              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">
+                  <div>
+                    {{ item.productName }}
+                  </div>
+                  <div>x {{ item.quantity }}</div>
+                </div>
+              </div>
+              <div class="goods_tit_r">
+                {{ item.skuInfo }}
+              </div>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="goodsPrice" :label="'商品单价'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.price | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="'商品业绩' + '(PV)'"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.achieve | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="quantity" :label="'商品数量'">
+      </el-table-column>
+      <el-table-column align="center" prop="spyjxj" :label="'业绩小计' + 'PV'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="pvxj" :label="'金额小计'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.priceAmount | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="tab_b">
+      <div>
+        {{ "商品金额总计" }}:{{ userInfo.currencyIcon
         }}{{ allGoodsData.priceAmount | numberToCurrency }}
-			</div>
-			<div>
-				{{ '邮费' }}:{{ userInfo.currencyIcon
+      </div>
+      <div>
+        {{ "邮费" }}:{{ userInfo.currencyIcon
         }}{{ ruleForm.postage | numberToCurrency }}
-			</div>
-		</div>
-		<AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
-		<div class="zhan"></div>
-		<!-- 购买 -->
-		<div class="tfooter">
-			<div class="footer_t">
-				<div class="footer_tt">
-					<div class="dis_flex">
-						<div class="f1">{{ '总价' }}:</div>
-						<div class="f2">
-							{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
-						</div>
-					</div>
-					<div class="dis_flex">
-						<div class="f1">{{ '业绩' }}:</div>
-						<div class="f3">
-							{{ allGoodsData.achieveAmount | numberToCurrency }}
-						</div>
-					</div>
-				</div>
-				<div class="footer_tt" v-show="
+      </div>
+    </div>
+    <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
+    <div class="zhan"></div>
+    <!-- 购买 -->
+    <div class="tfooter">
+      <div class="footer_t">
+        <div class="footer_tt">
+          <div class="dis_flex">
+            <div class="f1">{{ "总价" }}:</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
+          </div>
+          <div class="dis_flex">
+            <div class="f1">{{ "业绩" }}:</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
+            </div>
+          </div>
+        </div>
+        <div
+          class="footer_tt"
+          v-show="
             ruleForm.recAddress &&
             ruleForm.recName &&
             ruleForm.recPhone &&
             ruleForm.nameList
-          ">
-					<div class="f2 f4">
-						{{ '寄送至' }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
-					</div>
-					<div class="f4">
-						{{ '收货人' }}：{{ ruleForm.recName }}
-						{{ ruleForm.recPhone }}
-					</div>
-				</div>
-			</div>
-			<div class="footer_b">
-				<!-- 协议 -->
-				<agreement v-if="specialArea != 30" :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
-				<!-- 协议 -->
-				<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 class="agreementDetail" v-if="userInfo.isDealer == 1"
-									@click="openPop">《推广人员服务协议》</span>
-								<span class="agreementDetail" v-if="userInfo.isDealer == 0"
-									@click="openPop">《经销商合同》</span>
-							</span>
-						</div>
-					</div>
-				</div>
+          "
+        >
+          <div class="f2 f4">
+            {{ "寄送至" }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ "收货人" }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
+        </div>
+      </div>
+      <div class="footer_b">
+        <!-- 协议 -->
+        <!-- <agreement
+          v-if="specialArea != 30"
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <!-- 协议 -->
+        <!-- <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
+                  class="agreementDetail"
+                  v-if="userInfo.isDealer == 1"
+                  @click="openPop"
+                  >《推广人员服务协议》</span
+                >
+                <span
+                  class="agreementDetail"
+                  v-if="userInfo.isDealer == 0"
+                  @click="openPop"
+                  >《经销商合同》</span
+                >
+              </span>
+            </div>
+          </div>
+        </div> -->
 
-				<div v-if="specialArea == 30" class="warn">该礼包一旦购买不能退换</div>
-				<div class="btn" @click="submitRegister('ruleForm')">
-					{{ '购买' }}
-				</div>
-			</div>
-		</div>
-		<!-- 强制阅读协议 -->
-		<mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
-		<Pay :isPay="isPay" :onlinePay="onlinePay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
-		<!-- 协议 -->
-		<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 v-if="userInfo.isDealer == 0" src="@/assets/images/jxsht.jpg" alt="" />
-				<span class="dialog-footer">
-					<el-button type="primary" @click="popupShow = false">{{
-            '我已阅读并同意以上协议'
+        <div v-if="specialArea == 30" class="warn">该礼包一旦购买不能退换</div>
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ "购买" }}
+        </div>
+      </div>
+    </div>
+    <!-- 强制阅读协议 -->
+    <!-- <mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent> -->
+    <Pay
+      :isPay="isPay"
+      :onlinePay="onlinePay"
+      @closePay="closePay"
+      :paramsPost="paramsPost"
+    ></Pay>
+    <!-- 协议 -->
+    <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
+          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>
-		</el-dialog>
-	</div>
+        </span>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-	import personInfo from "@/components/personInfo.vue";
-	import AddAddress from "@/components/AddAddress.vue";
-	import agreement from "@/components/agreement.vue";
-	import {
-		mapGetters
-	} from "vuex";
-	import * as api from "@/api/register.js";
-	import {
-		setTokenMi
-	} from "@/util/auth";
-	import Pay from "@/components/Pay.vue";
-	import mustAgreeMent from "@/components/mustAgreeMent.vue";
-	export default {
-		components: {
-			personInfo,
-			AddAddress,
-			agreement,
-			Pay,
-			mustAgreeMent,
-		},
-		data() {
-			let validateRecPhone = (rule, value, callback) => {
-				if (this.ruleForm.recPhone === "" && this.isDeliveryWay) {
-					callback(new Error('请输入联系方式'));
-				} else if (this.pkCountry == 1 && this.ruleForm.recPhone.length != 11) {
-					callback(new Error('请输入正确联系方式'));
-				} else if (this.pkCountry == 1 && this.ruleForm.recPhone[0] != 1) {
-					callback(new Error('请输入正确联系方式'));
-				} else {
-					callback();
-				}
-			};
-			let validateRecTransType = (rule, value, callback) => {
-				if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-					callback(new Error('请选择运输方式'));
-				} else {
-					callback();
-				}
-			};
-			return {
-				popupShow: false,
-				waresCodeList: [],
-				isPay: false,
-				paramsPost: "",
-				isClick: 0,
-				ruleForm: {
-					upgradeMemberCode: "",
-					dizhi: [],
-					fwzx: "",
-					upgradeMemberName: "",
-					postage: "",
-					recName: "",
-					recPhone: "",
-					recAddress: "",
-					deliveryWay: "",
-					transType: "",
-				},
-				rules: {
-					upgradeMemberCode: [{
-						required: true,
-						validator: this.upgradeMemberCodePass,
-						trigger: "blur",
-					}, ],
-					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: [{
-						required: true,
-						message: '请选择',
-						trigger: 'change',
-					}, ],
-					// transType: [
-					//   {
-					//     required: true,
-					//     message: '请选择运输方式',
-					//     trigger: 'change',
-					//   },
-					// ],
-					transType: [{
-						validator: validateRecTransType
-					}],
-				},
-				addressList: [],
-				moren: "",
-				allGoodsData: [],
-				allData: [],
-				agreementShow: false,
-				countryList: [],
-				transList: [{
-						value: 1,
-						label: "陆运",
-					},
-					{
-						value: 2,
-						label: "空运",
-					},
-					{
-						value: 3,
-						label: "海运",
-					},
-				],
-				deliList: [],
-				bankLists: [],
-				areaData: [],
-				regionParams: {
-					label: "name",
-					value: "id",
-					children: "children",
-					expandTrigger: "hover",
-				},
-				totalPrice: 0,
-				totalAchive: 0,
-				isLoading: "",
-				isDeliveryWay: true,
-				shoppingArr: "",
-				totalAmont: 0,
-				specialArea: "",
-				storeList: [],
-				storehouseList: [],
-				toShow: false,
-				checkObj: [],
-				onlinePay: true,
-				pkCountry: "",
-				howSure: false,
-				queryCardList: [],
-			};
-		},
-		computed: {
-			...mapGetters(["userInfo"]),
-		},
-		mounted() {
-			// // 数据源
-			// this.allGoodsData = JSON.parse(localStorage.getItem('allGoods'))
-			// this.allGoodsData[0].orderItemsParams.forEach((item) => {
-			//   item.goodsPrice = 0
-			//   item.goodsAchive = 0
-			//   item.waresItemsParamList.forEach((ctem) => {
-			//     item.goodsPrice += parseFloat(ctem.priceTotal)
-			//     item.goodsAchive += parseFloat(ctem.achieveTotal)
-			//   })
-			// })
-			// let totalPrice = 0
-			// let totalAchive = 0
-			// this.allGoodsData[0].orderItemsParams.forEach((item) => {
-			//   totalPrice += parseFloat(item.goodsPrice * item.quantity)
-			//   totalAchive += parseFloat(item.goodsAchive * item.quantity)
-			// })
-			// this.totalPrice = totalPrice
-			// this.totalAchive = totalAchive
-			// this.allData = this.allGoodsData[0].orderItemsParams
-			this.specialArea = this.$route.query.specialArea;
-			if (
-				this.specialArea == 12 ||
-				this.specialArea == 22 ||
-				this.specialArea == 14 ||
-				this.specialArea == 28 ||
-				this.specialArea == 31 ||
-				this.specialArea == 30
-			) {
-				this.toShow = true;
-				this.$forceUpdate();
-			}
-			if (this.specialArea == 30) {
-				this.agreementShow = true;
-				this.$forceUpdate();
-			}
-			this.pkCountry = parseInt(localStorage.getItem("pkCountry"));
-			// // 服务中心赋值
-			this.ruleForm.upgradeMemberCode = this.userInfo.memberCode;
-			this.getUserName();
-			if (this.userInfo.pkSettleCountry != 1) {
-				//获取会员店铺
-				this.getStoreList();
-				//获取仓库
-				this.getStorehouseList();
-			}
-			// // 获取地址
-			// this.getAddressList()
-			// // 获取运输方式
-			// this.getTransList()
-			// // 获取发货方式
-			// this.getDeliveryList()
-			// this.getAllArea()
-			// // 获取会员等级
-			// // this.getMember()
-			// 数据源
-			this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
-			// 获取购物车详情
-			this.getCatDetail();
-			// 幂等性
-			api.generate().then((res) => {
-				setTokenMi(res.msg);
-			});
-			if (this.userInfo.pkSettleCountry == 1) {
-				this.ruleForm.transType = 1;
-				this.ruleForm.deliveryWay = 1;
-			}
-		},
-		methods: {
-			getQueryCard() {
-				api
-					.queryCard({
-						specialArea: this.specialArea,
-						upgradeMemberCode: this.ruleForm.upgradeMemberCode,
-					})
-					.then((res) => {
-						this.queryCardList = res.data;
-					});
-			},
-			openPop() {
-				this.popupShow = true;
-			},
-			toCheck(e) {
-				this.agreementShow = e;
-			},
-			getStoreList() {
-				api.storeList().then((res) => {
-					this.storeList = res.rows;
-				});
-			},
-			getStorehouseList() {
-				api.storehouseList().then((res) => {
-					this.storehouseList = res.rows;
-				});
-			},
-			// 升级编号获取name
-			upgradeMemberCodePass(rule, value, callback) {
-				if (!value) {
-					callback(new Error("请输入复购编号"));
-				} else {
-					api
-						.upgRel({
-							upgradeMemberCode: value,
-						})
-						.then((res) => {
-							if (res.code == 200) {
-								this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
-								if (this.howSure) {
-									this.getQueryCard();
-								}
-								// this.getMember()
-								this.$forceUpdate();
-								callback();
-							}
-						})
-						.catch((err) => {
-							callback(new Error(err));
-						});
-				}
-			},
-			getCatDetail() {
-				api
-					.shoppingWaresDetail({
-						shoppingIds: this.shoppingArr,
-						specialArea: this.specialArea,
-					})
-					.then((res) => {
-						this.allGoodsData = res.data;
-						this.waresCodeList = res.data.orderItemsParams.map((item) => {
-							return item.waresCode;
-						});
-						this.allGoodsData.specialArea = this.specialArea;
-						this.allData = this.allGoodsData.orderItemsParams;
-						this.totalAmont = this.allGoodsData.priceAmount;
-						// 服务中心赋值
-						this.ruleForm.fwzx = this.userInfo.memberCode;
-						let orderItemsParams = [];
-						this.waresCodeList.forEach((item) => {
-							orderItemsParams.push({
-								waresCode: item,
-							});
-						});
-						this.checkObj = {
-							specialArea: this.specialArea,
-							orderItemsParams: orderItemsParams,
-						};
+import personInfo from "@/components/personInfo.vue";
+import AddAddress from "@/components/AddAddress.vue";
+import agreement from "@/components/agreement.vue";
+import { mapGetters } from "vuex";
+import * as api from "@/api/register.js";
+import { setTokenMi } from "@/util/auth";
+import Pay from "@/components/Pay.vue";
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
+export default {
+  components: {
+    personInfo,
+    AddAddress,
+    agreement,
+    Pay,
+    mustAgreeMent,
+  },
+  data() {
+    let validateRecPhone = (rule, value, callback) => {
+      if (this.ruleForm.recPhone === "" && this.isDeliveryWay) {
+        callback(new Error("请输入联系方式"));
+      } else if (this.pkCountry == 1 && this.ruleForm.recPhone.length != 11) {
+        callback(new Error("请输入正确联系方式"));
+      } else if (this.pkCountry == 1 && this.ruleForm.recPhone[0] != 1) {
+        callback(new Error("请输入正确联系方式"));
+      } else {
+        callback();
+      }
+    };
+    let validateRecTransType = (rule, value, callback) => {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
+        callback(new Error("请选择运输方式"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      popupShow: false,
+      waresCodeList: [],
+      isPay: false,
+      paramsPost: "",
+      isClick: 0,
+      ruleForm: {
+        upgradeMemberCode: "",
+        dizhi: [],
+        fwzx: "",
+        upgradeMemberName: "",
+        postage: "",
+        recName: "",
+        recPhone: "",
+        recAddress: "",
+        deliveryWay: "",
+        transType: "",
+      },
+      rules: {
+        upgradeMemberCode: [
+          {
+            required: true,
+            validator: this.upgradeMemberCodePass,
+            trigger: "blur",
+          },
+        ],
+        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: [
+          {
+            required: true,
+            message: "请选择",
+            trigger: "change",
+          },
+        ],
+        // transType: [
+        //   {
+        //     required: true,
+        //     message: '请选择运输方式',
+        //     trigger: 'change',
+        //   },
+        // ],
+        transType: [
+          {
+            validator: validateRecTransType,
+          },
+        ],
+      },
+      addressList: [],
+      moren: "",
+      allGoodsData: [],
+      allData: [],
+      agreementShow: true,
+      countryList: [],
+      transList: [
+        {
+          value: 1,
+          label: "陆运",
+        },
+        {
+          value: 2,
+          label: "空运",
+        },
+        {
+          value: 3,
+          label: "海运",
+        },
+      ],
+      deliList: [],
+      bankLists: [],
+      areaData: [],
+      regionParams: {
+        label: "name",
+        value: "id",
+        children: "children",
+        expandTrigger: "hover",
+      },
+      totalPrice: 0,
+      totalAchive: 0,
+      isLoading: "",
+      isDeliveryWay: true,
+      shoppingArr: "",
+      totalAmont: 0,
+      specialArea: "",
+      storeList: [],
+      storehouseList: [],
+      toShow: false,
+      checkObj: [],
+      onlinePay: true,
+      pkCountry: "",
+      howSure: false,
+      queryCardList: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
+  mounted() {
+    // // 数据源
+    // this.allGoodsData = JSON.parse(localStorage.getItem('allGoods'))
+    // this.allGoodsData[0].orderItemsParams.forEach((item) => {
+    //   item.goodsPrice = 0
+    //   item.goodsAchive = 0
+    //   item.waresItemsParamList.forEach((ctem) => {
+    //     item.goodsPrice += parseFloat(ctem.priceTotal)
+    //     item.goodsAchive += parseFloat(ctem.achieveTotal)
+    //   })
+    // })
+    // let totalPrice = 0
+    // let totalAchive = 0
+    // this.allGoodsData[0].orderItemsParams.forEach((item) => {
+    //   totalPrice += parseFloat(item.goodsPrice * item.quantity)
+    //   totalAchive += parseFloat(item.goodsAchive * item.quantity)
+    // })
+    // this.totalPrice = totalPrice
+    // this.totalAchive = totalAchive
+    // this.allData = this.allGoodsData[0].orderItemsParams
+    this.specialArea = this.$route.query.specialArea;
+    if (
+      this.specialArea == 12 ||
+      this.specialArea == 22 ||
+      this.specialArea == 14 ||
+      this.specialArea == 28 ||
+      this.specialArea == 31 ||
+      this.specialArea == 30
+    ) {
+      this.toShow = true;
+      this.$forceUpdate();
+    }
+    if (this.specialArea == 30) {
+      this.agreementShow = true;
+      this.$forceUpdate();
+    }
+    this.pkCountry = parseInt(localStorage.getItem("pkCountry"));
+    // // 服务中心赋值
+    this.ruleForm.upgradeMemberCode = this.userInfo.memberCode;
+    this.getUserName();
+    if (this.userInfo.pkSettleCountry != 1) {
+      //获取会员店铺
+      this.getStoreList();
+      //获取仓库
+      this.getStorehouseList();
+    }
+    // // 获取地址
+    // this.getAddressList()
+    // // 获取运输方式
+    // this.getTransList()
+    // // 获取发货方式
+    // this.getDeliveryList()
+    // this.getAllArea()
+    // // 获取会员等级
+    // // this.getMember()
+    // 数据源
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
+    // 获取购物车详情
+    this.getCatDetail();
+    // 幂等性
+    api.generate().then((res) => {
+      setTokenMi(res.msg);
+    });
+    if (this.userInfo.pkSettleCountry == 1) {
+      this.ruleForm.transType = 1;
+      this.ruleForm.deliveryWay = 1;
+    }
+  },
+  methods: {
+    getQueryCard() {
+      api
+        .queryCard({
+          specialArea: this.specialArea,
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
+          this.queryCardList = res.data;
+        });
+    },
+    openPop() {
+      this.popupShow = true;
+    },
+    toCheck(e) {
+      this.agreementShow = e;
+    },
+    getStoreList() {
+      api.storeList().then((res) => {
+        this.storeList = res.rows;
+      });
+    },
+    getStorehouseList() {
+      api.storehouseList().then((res) => {
+        this.storehouseList = res.rows;
+      });
+    },
+    // 升级编号获取name
+    upgradeMemberCodePass(rule, value, callback) {
+      if (!value) {
+        callback(new Error("请输入复购编号"));
+      } else {
+        api
+          .upgRel({
+            upgradeMemberCode: value,
+          })
+          .then((res) => {
+            if (res.code == 200) {
+              this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
+              if (this.howSure) {
+                this.getQueryCard();
+              }
+              // this.getMember()
+              this.$forceUpdate();
+              callback();
+            }
+          })
+          .catch((err) => {
+            callback(new Error(err));
+          });
+      }
+    },
+    getCatDetail() {
+      api
+        .shoppingWaresDetail({
+          shoppingIds: this.shoppingArr,
+          specialArea: this.specialArea,
+        })
+        .then((res) => {
+          this.allGoodsData = res.data;
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
+            return item.waresCode;
+          });
+          this.allGoodsData.specialArea = this.specialArea;
+          this.allData = this.allGoodsData.orderItemsParams;
+          this.totalAmont = this.allGoodsData.priceAmount;
+          // 服务中心赋值
+          this.ruleForm.fwzx = this.userInfo.memberCode;
+          let orderItemsParams = [];
+          this.waresCodeList.forEach((item) => {
+            orderItemsParams.push({
+              waresCode: item,
+            });
+          });
+          this.checkObj = {
+            specialArea: this.specialArea,
+            orderItemsParams: orderItemsParams,
+          };
 
-						// 判断特殊商品
-						if (this.specialArea == 3) {
-							this.checkGoods();
-						}
-						// let howSure = this.allData.some((item) => item.isMakerGift == 4);
-						// this.howSure = howSure;
-						// if(this.howSure){
-						//     this.getQueryCard();
-						//   }
-						// 获取地址
-						this.getAddressList();
-						// 获取运输方式
-						this.getTransList();
-						// 获取发货方式
-						this.getDeliveryList();
-						// 获取省市县
-						this.getAllArea();
-						// 获取会员等级
-						// this.getMember()
-					});
-			},
-			checkGoods() {
-				// 判断特殊商品
-				api.makerList().then((res) => {
-					if (res.data.length > 0) {
-						let isYes = 0;
-						res.data.forEach((item) => {
-							if (this.allData.some((ctem) => ctem.waresCode == item)) {
-								isYes++;
-							}
-						});
-						if (isYes != 0) {
-							this.howSure = true;
-							if (this.howSure) {
-								this.getQueryCard();
-							}
-						}
-					}
-				});
-			},
-			getUserName() {
-				api
-					.upgRel({
-						upgradeMemberCode: this.ruleForm.upgradeMemberCode,
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
-							this.$forceUpdate();
-						}
-					});
-			},
-			selDelivery(e) {
-				if (e == 2 || e == 3) {
-					this.isDeliveryWay = false;
-				} else {
-					this.isDeliveryWay = true;
-				}
-			},
-			openLoading() {
-				this.isLoading = this.$loading({
-					lock: true,
-					text: "Loading",
-					spinner: "el-icon-loading",
-					background: "rgba(0, 0, 0, 0.7)",
-				});
-			},
-			resetAll() {
-				this.ruleForm.parent = "";
-				this.ruleForm.upgradeMemberName = "";
-				this.ruleForm.deliveryWay = "";
-				this.ruleForm.transType = "";
-				this.$nextTick(() => {
-					this.$refs.ruleForm.clearValidate();
-				});
-			},
-			setDizhi(e, val) {
-				let arr = this.flatten(this.areaData);
-				let nameList = "";
-				arr.forEach((item) => {
-					this.ruleForm.dizhi.forEach((ctem) => {
-						if (ctem == item.id) {
-							nameList += item.name;
-						}
-					});
-				});
-				this.ruleForm.nameList = nameList;
-				this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
-				this.allGoodsData.recCity = this.ruleForm.dizhi[1];
-				this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || "";
-				this.allGoodsData.recName = this.ruleForm.recName;
-				this.allGoodsData.recPhone = this.ruleForm.recPhone;
-				this.allGoodsData.recAddress = this.ruleForm.recAddress;
-				this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
-				this.allGoodsData.transType = this.ruleForm.transType;
-				this.getPostAge();
-			},
-			closePay(val) {
-				if (val) {
-					this.isPay = false;
-					this.$router.push({
-						path: "/vipCenter",
-						query: {
-							id: 1
-						},
-					});
-				} else {
-					this.$confirm('确认取消支付' + "?")
-						.then((_) => {
-							this.isPay = false;
-							this.$router.push({
-								path: "/vipCenter",
-								query: {
-									id: 1
-								},
-							});
-						})
-						.catch((_) => {});
-				}
-			},
-			// 注册
-			submitRegister(formName) {
-				if (this.specialArea == 31) {
-					if (this.totalAmont < 1000) {
-						this.$message({
-							message: "购买商品总价格不能低于1000元",
-							type: "warning",
-						});
-						return;
-					}
-				}
-				let deleteList = [];
-				this.shoppingArr.forEach((item) => {
-					deleteList.push({
-						shoppingId: item,
-					});
-				});
-				if (!this.agreementShow) {
-					this.$message({
-						message: "请阅读并同意协议",
-						type: "warning",
-					});
-					return;
-				}
-				if (this.isDeliveryWay && !this.ruleForm.recPhone) {
-					this.$message({
-						message: '请选择收货人信息',
-						type: "warning",
-					});
-					return;
-				}
-				this.$refs[formName].validate((valid) => {
-					if (valid) {
-						this.openLoading();
-						let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-							deleteList: deleteList,
-						});
+          // 判断特殊商品
+          if (this.specialArea == 3) {
+            this.checkGoods();
+          }
+          // let howSure = this.allData.some((item) => item.isMakerGift == 4);
+          // this.howSure = howSure;
+          // if(this.howSure){
+          //     this.getQueryCard();
+          //   }
+          // 获取地址
+          this.getAddressList();
+          // 获取运输方式
+          this.getTransList();
+          // 获取发货方式
+          this.getDeliveryList();
+          // 获取省市县
+          this.getAllArea();
+          // 获取会员等级
+          // this.getMember()
+        });
+    },
+    checkGoods() {
+      // 判断特殊商品
+      api.makerList().then((res) => {
+        if (res.data.length > 0) {
+          let isYes = 0;
+          res.data.forEach((item) => {
+            if (this.allData.some((ctem) => ctem.waresCode == item)) {
+              isYes++;
+            }
+          });
+          if (isYes != 0) {
+            this.howSure = true;
+            if (this.howSure) {
+              this.getQueryCard();
+            }
+          }
+        }
+      });
+    },
+    getUserName() {
+      api
+        .upgRel({
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
+            this.$forceUpdate();
+          }
+        });
+    },
+    selDelivery(e) {
+      if (e == 2 || e == 3) {
+        this.isDeliveryWay = false;
+      } else {
+        this.isDeliveryWay = true;
+      }
+    },
+    openLoading() {
+      this.isLoading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    resetAll() {
+      this.ruleForm.parent = "";
+      this.ruleForm.upgradeMemberName = "";
+      this.ruleForm.deliveryWay = "";
+      this.ruleForm.transType = "";
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate();
+      });
+    },
+    setDizhi(e, val) {
+      let arr = this.flatten(this.areaData);
+      let nameList = "";
+      arr.forEach((item) => {
+        this.ruleForm.dizhi.forEach((ctem) => {
+          if (ctem == item.id) {
+            nameList += item.name;
+          }
+        });
+      });
+      this.ruleForm.nameList = nameList;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || "";
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.getPostAge();
+    },
+    closePay(val) {
+      if (val) {
+        this.isPay = false;
+        this.$router.push({
+          path: "/vipCenter",
+          query: {
+            id: 1,
+          },
+        });
+      } else {
+        this.$confirm("确认取消支付" + "?")
+          .then((_) => {
+            this.isPay = false;
+            this.$router.push({
+              path: "/vipCenter",
+              query: {
+                id: 1,
+              },
+            });
+          })
+          .catch((_) => {});
+      }
+    },
+    // 注册
+    submitRegister(formName) {
+      if (this.specialArea == 31) {
+        if (this.totalAmont < 1000) {
+          this.$message({
+            message: "购买商品总价格不能低于1000元",
+            type: "warning",
+          });
+          return;
+        }
+      }
+      let deleteList = [];
+      this.shoppingArr.forEach((item) => {
+        deleteList.push({
+          shoppingId: item,
+        });
+      });
+      if (!this.agreementShow) {
+        this.$message({
+          message: "请阅读并同意协议",
+          type: "warning",
+        });
+        return;
+      }
+      if (this.isDeliveryWay && !this.ruleForm.recPhone) {
+        this.$message({
+          message: "请选择收货人信息",
+          type: "warning",
+        });
+        return;
+      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.openLoading();
+          let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
+            deleteList: deleteList,
+          });
 
-						api
-							.confirmOthOrder(obj)
-							.then((res) => {
-								this.isLoading.close();
-								if (this.specialArea == 3 || this.specialArea == 22) {
-									api.checkPay(this.checkObj).then((response) => {
-										if (res.code == 200) {
-											this.isPay = true;
-											this.onlinePay = response.data;
-											this.paramsPost = res.data;
-										}
-									});
-								} else {
-									if (res.code == 200) {
-										this.isPay = true;
-										this.paramsPost = res.data;
-									}
-								}
-							})
-							.catch((err) => {
-								this.isLoading.close();
-							});
-					} else {
-						return false;
-					}
-				});
-				// let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
-				// console.log(
-				//   '%c [ obj ]-498',
-				//   'font-size:13px; background:#88187e; color:#cc5cc2;',
-				//   obj
-				// )
-			},
-			flatten(arr) {
-				return arr.reduce((result, item) => {
-					return result.concat(
-						item,
-						Array.isArray(item.children) ? this.flatten(item.children) : []
-					);
-				}, []);
-			},
-			checkRadio() {
-				this.$set(this.ruleForm, "dizhi", []);
-				let arr = [];
-				this.addressList.forEach((item) => {
-					if (item.pkId == this.moren) {
-						this.ruleForm.recName = item.recName;
-						this.ruleForm.nameList = item.recArea;
-						this.ruleForm.recPhone = item.recPhone;
-						this.ruleForm.recAddress = item.recAddress;
-						arr = [
-							item.recProvince + "",
-							item.recCity + "",
-							(item.recCounty || "") + "",
-						];
-					}
-				});
-				arr = arr.filter((s) => {
-					return s && s.trim();
-				});
+          api
+            .confirmOthOrder(obj)
+            .then((res) => {
+              this.isLoading.close();
+              if (this.specialArea == 3 || this.specialArea == 22) {
+                api.checkPay(this.checkObj).then((response) => {
+                  if (res.code == 200) {
+                    this.isPay = true;
+                    this.onlinePay = response.data;
+                    this.paramsPost = res.data;
+                  }
+                });
+              } else {
+                if (res.code == 200) {
+                  this.isPay = true;
+                  this.paramsPost = res.data;
+                }
+              }
+            })
+            .catch((err) => {
+              this.isLoading.close();
+            });
+        } else {
+          return false;
+        }
+      });
+      // let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
+      // console.log(
+      //   '%c [ obj ]-498',
+      //   'font-size:13px; background:#88187e; color:#cc5cc2;',
+      //   obj
+      // )
+    },
+    flatten(arr) {
+      return arr.reduce((result, item) => {
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
+      }, []);
+    },
+    checkRadio() {
+      this.$set(this.ruleForm, "dizhi", []);
+      let arr = [];
+      this.addressList.forEach((item) => {
+        if (item.pkId == this.moren) {
+          this.ruleForm.recName = item.recName;
+          this.ruleForm.nameList = item.recArea;
+          this.ruleForm.recPhone = item.recPhone;
+          this.ruleForm.recAddress = item.recAddress;
+          arr = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
+        }
+      });
+      arr = arr.filter((s) => {
+        return s && s.trim();
+      });
 
-				this.$set(this.ruleForm, "dizhi", arr);
-				this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
-				this.allGoodsData.transType = this.ruleForm.transType;
-				this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
-				this.allGoodsData.recCity = this.ruleForm.dizhi[1];
-				this.allGoodsData.recCounty = this.ruleForm.dizhi[2];
+      this.$set(this.ruleForm, "dizhi", arr);
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2];
 
-				this.allGoodsData.recName = this.ruleForm.recName;
-				this.allGoodsData.recPhone = this.ruleForm.recPhone;
-				this.allGoodsData.recAddress = this.ruleForm.recAddress;
-				this.getPostAge();
-				this.$forceUpdate();
-			},
-			getPostAge() {
-				let deleteList = [];
-				this.shoppingArr.forEach((item) => {
-					deleteList.push({
-						shoppingId: item,
-					});
-				});
-				this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
-				this.allGoodsData.transType = this.ruleForm.transType;
-				this.allGoodsData.deleteList = deleteList;
-				api.queryPostage(this.allGoodsData).then((res) => {
-					this.ruleForm.postage = Number(res.data.postage).toFixed(2);
-					this.totalAmont =
-						parseFloat(this.allGoodsData.priceAmount) +
-						parseFloat(res.data.postage);
-				});
-			},
-			// getMember() {
-			//   this.allGoodsData.upgradeMemberCode = this.ruleForm.upgradeMemberCode
-			//   api.memLevel(this.allGoodsData).then((res) => {
-			//     if (res.data.isEnough) {
-			//       this.ruleForm.gradeName = res.data.gradeName
-			//     } else {
-			//       this.isLoading.close()
-			//     }
-			//   })
-			// },
-			getTransList() {
-				api.transportList().then((res) => {
-					this.transList = res.data;
-				});
-			},
-			getDeliveryList() {
-				api.deliveryList().then((res) => {
-					this.deliList = res.data;
-				});
-			},
-			delAds(id) {
-				this.$confirm('确定要删除该收货地址吗' + "?", "", {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: "warning",
-				}).then(() => {
-					api.delAddress(id).then((res) => {
-						this.$message({
-							type: "success",
-							message: '删除成功' + "!",
-						});
-						this.getAddressList();
-					});
-				});
-			},
-			getAllArea() {
-				api.allArea().then((res) => {
-					this.areaData = res.data;
-				});
-			},
-			changeAds(id) {
-				this.$refs.addAddress.isShowAddress(true, this.areaData, id);
-			},
-			setDefaultAds(id) {
-				api.addressDefault(id).then((res) => {
-					this.getAddressList();
-				});
-			},
-			// 同意协议
-			agree(val) {
-				this.agreementShow = val;
-			},
-			openAddress() {
-				this.$refs.addAddress.isShowAddress(true, this.areaData);
-			},
-			getAddressList() {
-				api.addressList({}).then((res) => {
-					this.addressList = res.data;
-					this.addressList.forEach((item) => {
-						if (item.isDefault == 1) {
-							this.moren = item.pkId;
-							this.checkRadio();
-						}
-					});
-					// this.moren = this.addressList[0].pkId
-				});
-			},
-			// 斑马线
-			tableRowClassName({
-				row,
-				rowIndex
-			}) {
-				if (rowIndex % 2 == 0) {
-					return "warning-row";
-				} else if (rowIndex % 2 == 1) {
-					return "success-row";
-				}
-				return "";
-			},
-		},
-	};
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.getPostAge();
+      this.$forceUpdate();
+    },
+    getPostAge() {
+      let deleteList = [];
+      this.shoppingArr.forEach((item) => {
+        deleteList.push({
+          shoppingId: item,
+        });
+      });
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.allGoodsData.deleteList = deleteList;
+      api.queryPostage(this.allGoodsData).then((res) => {
+        this.ruleForm.postage = Number(res.data.postage).toFixed(2);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
+      });
+    },
+    // getMember() {
+    //   this.allGoodsData.upgradeMemberCode = this.ruleForm.upgradeMemberCode
+    //   api.memLevel(this.allGoodsData).then((res) => {
+    //     if (res.data.isEnough) {
+    //       this.ruleForm.gradeName = res.data.gradeName
+    //     } else {
+    //       this.isLoading.close()
+    //     }
+    //   })
+    // },
+    getTransList() {
+      api.transportList().then((res) => {
+        this.transList = res.data;
+      });
+    },
+    getDeliveryList() {
+      api.deliveryList().then((res) => {
+        this.deliList = res.data;
+      });
+    },
+    delAds(id) {
+      this.$confirm("确定要删除该收货地址吗" + "?", "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        api.delAddress(id).then((res) => {
+          this.$message({
+            type: "success",
+            message: "删除成功" + "!",
+          });
+          this.getAddressList();
+        });
+      });
+    },
+    getAllArea() {
+      api.allArea().then((res) => {
+        this.areaData = res.data;
+      });
+    },
+    changeAds(id) {
+      this.$refs.addAddress.isShowAddress(true, this.areaData, id);
+    },
+    setDefaultAds(id) {
+      api.addressDefault(id).then((res) => {
+        this.getAddressList();
+      });
+    },
+    // 同意协议
+    agree(val) {
+      this.agreementShow = val;
+    },
+    openAddress() {
+      this.$refs.addAddress.isShowAddress(true, this.areaData);
+    },
+    getAddressList() {
+      api.addressList({}).then((res) => {
+        this.addressList = res.data;
+        this.addressList.forEach((item) => {
+          if (item.isDefault == 1) {
+            this.moren = item.pkId;
+            this.checkRadio();
+          }
+        });
+        // this.moren = this.addressList[0].pkId
+      });
+    },
+    // 斑马线
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "warning-row";
+      } else if (rowIndex % 2 == 1) {
+        return "success-row";
+      }
+      return "";
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.dis_flex {
-		display: flex;
-		align-items: center;
-	}
+.dis_flex {
+  display: flex;
+  align-items: center;
+}
 
-	.rt {
-		border-bottom: 5px solid rgba(7, 7, 7, 0.05);
-		padding: 45px 60px 15px 60px;
+.rt {
+  border-bottom: 5px solid rgba(7, 7, 7, 0.05);
+  padding: 45px 60px 15px 60px;
 
-		.rti {
-			margin-right: 80px;
-		}
+  .rti {
+    margin-right: 80px;
+  }
 
-		.zc {
-			font-size: 18px;
-			font-weight: bold;
-			color: #333333;
-			margin-right: 20px;
-		}
+  .zc {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333333;
+    margin-right: 20px;
+  }
 
-		.zca {
-			font-size: 18px;
-			font-weight: bold;
-			color: #00417C;
-		}
-	}
+  .zca {
+    font-size: 18px;
+    font-weight: bold;
+    color: #00417c;
+  }
+}
 
-	.demo-ruleForm {
-		margin-top: 20px;
-		overflow: hidden;
-	}
+.demo-ruleForm {
+  margin-top: 20px;
+  overflow: hidden;
+}
 
-	.padRow {
-		padding: 0 60px;
-	}
+.padRow {
+  padding: 0 60px;
+}
 
-	::v-deep .el-input__suffix {
-		right: auto;
+::v-deep .el-input__suffix {
+  right: auto;
 
-		.el-input__validateIcon {
-			position: absolute;
-		}
-	}
+  .el-input__validateIcon {
+    position: absolute;
+  }
+}
 
-	::v-deep .el-select {
-		width: 100%;
-	}
+::v-deep .el-select {
+  width: 100%;
+}
 
-	::v-deep .el-select .el-input__suffix {
-		right: 0;
-	}
+::v-deep .el-select .el-input__suffix {
+  right: 0;
+}
 
-	::v-deep .el-icon-circle-check {
-		color: #009900;
-	}
+::v-deep .el-icon-circle-check {
+  color: #009900;
+}
 
-	::v-deep .el-form-item__label {
-		font-size: 14px;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		line-height: 28px;
-	}
+::v-deep .el-form-item__label {
+  font-size: 14px;
+  font-family: PingFang SC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 28px;
+}
 
-	.xian {
-		padding: 10px 60px;
-		border-bottom: 5px solid rgba(7, 7, 7, 0.05);
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 20px;
-	}
+.xian {
+  padding: 10px 60px;
+  border-bottom: 5px solid rgba(7, 7, 7, 0.05);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+}
 
-	.nox {
-		padding: 10px 60px;
-	}
+.nox {
+  padding: 10px 60px;
+}
 
-	.title {
-		font-size: 18px;
-		font-weight: 600;
-		color: #333333;
-	}
+.title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
+}
 
-	.lan {
-		font-size: 18px;
-		font-weight: 400;
-		color: #3499ff;
-		cursor: pointer;
-	}
+.lan {
+  font-size: 18px;
+  font-weight: 400;
+  color: #3499ff;
+  cursor: pointer;
+}
 
-	.local {
-		padding: 0px 60px;
+.local {
+  padding: 0px 60px;
 
-		.local_i {
-			display: flex;
-			align-items: center;
-			padding: 30px 90px;
-		}
+  .local_i {
+    display: flex;
+    align-items: center;
+    padding: 30px 90px;
+  }
 
-		.local_a {
-			background: #eeeeee;
-			border-radius: 8px 8px 8px 8px;
-		}
+  .local_a {
+    background: #eeeeee;
+    border-radius: 8px 8px 8px 8px;
+  }
 
-		.local1 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #333333;
-			margin-right: 50px;
-		}
+  .local1 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #333333;
+    margin-right: 50px;
+  }
 
-		.local2 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #666666;
-			margin-right: 70px;
-			cursor: pointer;
-		}
+  .local2 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    margin-right: 70px;
+    cursor: pointer;
+  }
 
-		.local3 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #f92a28;
-			cursor: pointer;
-		}
-	}
+  .local3 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #f92a28;
+    cursor: pointer;
+  }
+}
 
-	::v-deep .el-radio {
-		margin-right: 0;
-	}
+::v-deep .el-radio {
+  margin-right: 0;
+}
 
-	.guoqi {
-		.el-select-dropdown__item {
-			height: 26px;
-			// text-align: center;
-			margin-bottom: 10px;
-			display: flex;
-			align-items: center;
-		}
+.guoqi {
+  .el-select-dropdown__item {
+    height: 26px;
+    // text-align: center;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+  }
 
-		.shortName {
-			margin-left: 10px;
-		}
-	}
+  .shortName {
+    margin-left: 10px;
+  }
+}
 
-	.guoqikang {
-		::v-deep input {
-			// height: 100px;
-		}
-	}
+.guoqikang {
+  ::v-deep input {
+    // height: 100px;
+  }
+}
 
-	.imgSize {
-		height: 20px;
-	}
+.imgSize {
+  height: 20px;
+}
 
-	.dizhi {
-		::v-deep .el-cascader {
-			width: 100%;
-		}
-	}
+.dizhi {
+  ::v-deep .el-cascader {
+    width: 100%;
+  }
+}
 
-	::v-deep .el-cascader .el-input__suffix {
-		right: 0;
-	}
+::v-deep .el-cascader .el-input__suffix {
+  right: 0;
+}
 
-	.zhan {
-		height: 250px;
-	}
+.zhan {
+  height: 250px;
+}
 
-	.tfooter {
-		position: fixed;
-		width: 100%;
-		bottom: 0;
-		z-index: 10;
+.tfooter {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  z-index: 10;
 
-		.footer_t {
-			padding: 5px 60px 15px 60px;
-			background: #ededed;
+  .footer_t {
+    padding: 5px 60px 15px 60px;
+    background: #ededed;
 
-			.footer_tt {
-				justify-content: right;
-				display: flex;
-				margin-top: 10px;
-			}
-		}
+    .footer_tt {
+      justify-content: right;
+      display: flex;
+      margin-top: 10px;
+    }
+  }
 
-		.footer_b {
-			text-align: right;
-			padding: 10px 60px 10px 60px;
-			background: #fff;
-		}
-	}
+  .footer_b {
+    text-align: right;
+    padding: 10px 60px 10px 60px;
+    background: #fff;
+  }
+}
 
-	.f1 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #333333;
-	}
+.f1 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #333333;
+}
 
-	.f2 {
-		font-size: 18px;
-		font-weight: 500;
-		color: #f43c3a;
-		margin-right: 40px;
-	}
+.f2 {
+  font-size: 18px;
+  font-weight: 500;
+  color: #f43c3a;
+  margin-right: 40px;
+}
 
-	.f3 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #384a8a;
-	}
+.f3 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #384a8a;
+}
 
-	.f4 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #666;
-	}
+.f4 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #666;
+}
 
-	.warn {
-		color: var(--primary-color);
-		font-size: 14px;
-		padding-top: 6px;
-	}
+.warn {
+  color: var(--primary-color);
+  font-size: 14px;
+  padding-top: 6px;
+}
 
-	.btn {
-		background: var(--primary-color);
-		border-radius: 8px 8px 8px 8px;
-		padding: 12px 40px;
-		display: inline-block;
-		color: #fff;
-		font-size: 18px;
-		margin-top: 10px;
-		cursor: pointer;
-	}
+.btn {
+  background: var(--primary-color);
+  border-radius: 8px 8px 8px 8px;
+  padding: 12px 40px;
+  display: inline-block;
+  color: #fff;
+  font-size: 18px;
+  margin-top: 10px;
+  cursor: pointer;
+}
 
-	.goods {
-		text-align: left;
-		padding-top: 20px;
-		padding-left: 50px;
-	}
+.goods {
+  text-align: left;
+  padding-top: 20px;
+  padding-left: 50px;
+}
 
-	.goods_t {
-		display: flex;
-		font-size: 14px;
-		font-weight: 400;
-		color: #333333;
+.goods_t {
+  display: flex;
+  font-size: 14px;
+  font-weight: 400;
+  color: #333333;
 
-		// justify-content: center;
-		img {
-			width: 88px;
-			height: 88px;
-			margin-right: 10px;
-		}
-	}
+  // justify-content: center;
+  img {
+    width: 88px;
+    height: 88px;
+    margin-right: 10px;
+  }
+}
 
-	.goods_tit {
-		font-size: 12px;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #666666;
-		margin-top: 10px;
-		display: flex;
+.goods_tit {
+  font-size: 12px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  margin-top: 10px;
+  display: flex;
 
-		img {
-			width: 35px;
-			height: 35px;
-			margin-right: 10px;
-		}
+  img {
+    width: 35px;
+    height: 35px;
+    margin-right: 10px;
+  }
 
-		.goods_tit_l {
-			flex: 1;
-			display: flex;
-			align-items: center;
-		}
+  .goods_tit_l {
+    flex: 1;
+    display: flex;
+    align-items: center;
+  }
 
-		.goods_tit_r {
-			width: 200px;
-		}
-	}
+  .goods_tit_r {
+    width: 200px;
+  }
+}
 
-	.tab_b {
-		text-align: right;
-		font-size: 12px;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #666666;
-		padding: 20px 60px 0 0;
-	}
+.tab_b {
+  text-align: right;
+  font-size: 12px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  padding: 20px 60px 0 0;
+}
 
-	.agreementBox {
-		.agreementIcon {
-			display: flex;
-			margin-left: 10px;
-			justify-content: flex-end;
-		}
+.agreementBox {
+  .agreementIcon {
+    display: flex;
+    margin-left: 10px;
+    justify-content: flex-end;
+  }
 
-		.agreementText {
-			margin-left: 10px;
-			font-size: 14px;
-			max-width: 600px;
-			display: flex;
-			flex-wrap: wrap;
+  .agreementText {
+    margin-left: 10px;
+    font-size: 14px;
+    max-width: 600px;
+    display: flex;
+    flex-wrap: wrap;
 
-			.agreementDetail {
-				color: #72deed;
-				font-weight: bold;
-				font-size: 14px;
-				cursor: pointer;
-			}
-		}
-	}
+    .agreementDetail {
+      color: #72deed;
+      font-weight: bold;
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+}
 
-	.pop {
-		z-index: 20000 !important;
-		text-align: left;
+.pop {
+  z-index: 20000 !important;
+  text-align: left;
 
-		.pop_box {
-			max-height: 65vh;
-			overflow-y: scroll;
-			padding: 0rem 0.4rem 0.8rem 0.4rem;
-			text-align: center;
+  .pop_box {
+    max-height: 65vh;
+    overflow-y: scroll;
+    padding: 0rem 0.4rem 0.8rem 0.4rem;
+    text-align: center;
 
-			img {
-				width: 100%;
-				margin-bottom: 20px;
-			}
-		}
+    img {
+      width: 100%;
+      margin-bottom: 20px;
+    }
+  }
 
-		.pop_title {
-			width: 100%;
-			height: 1.4rem;
-			line-height: 1.4rem;
-			font-size: 16px;
-			text-align: center;
-		}
+  .pop_title {
+    width: 100%;
+    height: 1.4rem;
+    line-height: 1.4rem;
+    font-size: 16px;
+    text-align: center;
+  }
 
-		.pop_title1 {
-			width: 100%;
-			font-size: 16px;
-			text-align: center;
-			margin-bottom: 20px;
-			font-weight: 500;
-		}
+  .pop_title1 {
+    width: 100%;
+    font-size: 16px;
+    text-align: center;
+    margin-bottom: 20px;
+    font-weight: 500;
+  }
 
-		.pop_title2 {
-			width: 100%;
-			font-size: 16px;
-			text-align: center;
-			margin-top: 20px;
-			font-weight: 500;
-		}
-	}
-</style>
\ No newline at end of file
+  .pop_title2 {
+    width: 100%;
+    font-size: 16px;
+    text-align: center;
+    margin-top: 20px;
+    font-weight: 500;
+  }
+}
+</style>
diff --git a/src/views/rescission/index.vue b/src/views/rescission/index.vue
index f0d2361..e305886 100644
--- a/src/views/rescission/index.vue
+++ b/src/views/rescission/index.vue
@@ -5,82 +5,127 @@
  * @Date: 2023-01-29 17:32:44
 -->
 <template>
-	<div>
-		<!-- 用户头 -->
-		<personInfo></personInfo>
-		<div class="rt dis_flex">
-			<div class="rti dis_flex">
-				{{ '积分会员信息' }}
-			</div>
-		</div>
-		<!-- 表单 -->
-		<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">
+  <div>
+    <!-- 用户头 -->
+    <personInfo></personInfo>
+    <div class="rt dis_flex">
+      <div class="rti dis_flex">
+        {{ "积分会员信息" }}
+      </div>
+    </div>
+    <!-- 表单 -->
+    <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="'服务中心'"
                         prop="fwzx">
             <el-input v-model="ruleForm.fwzx"
                       disabled></el-input>
           </el-form-item>
         </el-col> -->
-				<el-col :span="6">
-					<el-form-item :label="'会员编号'" prop="upgradeMemberCode">
-						<!-- <div class="dis_flex"> -->
-						<el-input v-model="ruleForm.upgradeMemberCode" disabled :placeholder="'请输入会员编号'"></el-input>
-						<!-- </div> -->
-					</el-form-item>
-				</el-col>
-				<el-col :span="6">
-					<el-form-item :label="'会员姓名'" prop="upgradeMemberName">
-						<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"
-							: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="'运输方式'" :required="isDeliveryWay" prop="transType">
-						<el-select v-model="ruleForm.transType" :disabled="this.userInfo.pkSettleCountry == 1"
-							: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-row>
-			<!-- 收货人信息 -->
-			<div v-show="isDeliveryWay">
-				<div class="xian">
-					<div class="title">{{ '收货人信息' }}</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-form-item>
-					</el-col>
-					<el-col :span="6" v-if="pkCountry == 1">
-						<el-form-item :label="'联系方式'" prop="recPhone">
-							<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"
-								:placeholder="'请输入联系方式'"></el-input>
-						</el-form-item>
-					</el-col>
-					<!-- <el-col :span="6">
+        <el-col :span="6">
+          <el-form-item :label="'会员编号'" prop="upgradeMemberCode">
+            <!-- <div class="dis_flex"> -->
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              disabled
+              :placeholder="'请输入会员编号'"
+            ></el-input>
+            <!-- </div> -->
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item :label="'会员姓名'" prop="upgradeMemberName">
+            <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"
+              :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="'运输方式'"
+            :required="isDeliveryWay"
+            prop="transType"
+          >
+            <el-select
+              v-model="ruleForm.transType"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :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-row>
+      <!-- 收货人信息 -->
+      <div v-show="isDeliveryWay">
+        <div class="xian">
+          <div class="title">{{ "收货人信息" }}</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-form-item>
+          </el-col>
+          <el-col :span="6" v-if="pkCountry == 1">
+            <el-form-item :label="'联系方式'" prop="recPhone">
+              <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"
+                :placeholder="'请输入联系方式'"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
             <el-form-item :label="'联系方式'"
                           
                           prop="recPhone">
@@ -90,941 +135,1011 @@
                         :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"
-								: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"
-								:placeholder="'请输入详细地址'"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="40" class="padRow">
-					<el-col :span="6">
-						<el-form-item :label="'邮费'">
-							<el-input v-model="ruleForm.postage" disabled></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item :label="'备注'">
-							<el-input v-model="ruleForm.remark" :placeholder="'请输入备注'"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</div>
-		</el-form>
-		<div class="nox">
-			<div class="title">{{ '历史地址' }}</div>
-		</div>
-		<div class="local" v-show="isDeliveryWay">
-			<div :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>
-				<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>
-		<el-table :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" :label="'商品名称'">
-				<template slot-scope="scope">
-					<!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
-					<div class="goods">
-						<div class="goods_t">
-							<img :src="scope.row.cover1" alt="">
-							<div>{{ scope.row.waresName }}</div>
-						</div>
-						<div 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">
-									<div>
-										{{ item.productName }}
-									</div>
-									<div>
-										x {{ item.quantity }}
-									</div>
-								</div>
-							</div>
-							<div class="goods_tit_r">
-								{{ item.skuInfo }}
-							</div>
-						</div>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="'商品单价'+'(¥)'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.price | numberToCurrency}}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="'商品业绩'+'(PV)'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.achieve | numberToCurrency}}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="quantity" :label="'商品数量'">
-			</el-table-column>
-			<el-table-column align="center" prop="spyjxj" :label="'业绩小计'+'PV'">
-				<template slot-scope="scope">
-					<span>{{
-             scope.row.achieveAmount| numberToCurrency
-            }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column align="center" prop="pvxj" :label="'金额小计'+'(¥)'">
-				<template slot-scope="scope">
-					<span>{{ scope.row.priceAmount | numberToCurrency}}</span>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div class="tab_b">
-			<div>{{ '商品金额总计' }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}</div>
-			<div>{{ '邮费' }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
-		</div>
-		<AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
-		<div class="zhan"></div>
-		<!-- 购买 -->
-		<div class="tfooter">
-			<div class="footer_t">
-				<div class="footer_tt ">
-					<div class="dis_flex">
-						<div class="f1">{{ '总价' }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont  | numberToCurrency}}</div>
-					</div>
-					<div class="dis_flex">
-						<div class="f1">{{ '业绩' }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount  | numberToCurrency}}</div>
-					</div>
-				</div>
-				<div class="footer_tt"
-					v-show="ruleForm.recAddress&&ruleForm.recName&&ruleForm.recPhone&&ruleForm.nameList">
-					<div class="f2 f4">{{ '寄送至' }}：{{ruleForm.nameList}}{{ ruleForm.recAddress }}</div>
-					<div class="f4">{{ '收货人' }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
-				</div>
-			</div>
-			<div class="footer_b">
-				<!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
-				<div class="btn" @click="submitRegister('ruleForm')">{{ '购买' }}</div>
-			</div>
-		</div>
-		<!-- 强制阅读协议 -->
-		<mustAgreeMent :waresCodeList='waresCodeList'></mustAgreeMent>
-		<Pay :isPay="isPay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
-	</div>
+          <el-col :span="6">
+            <el-form-item :label="'收货地址'" class="dizhi" prop="dizhi">
+              <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"
+                :placeholder="'请输入详细地址'"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="40" class="padRow">
+          <el-col :span="6">
+            <el-form-item :label="'邮费'">
+              <el-input v-model="ruleForm.postage" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'备注'">
+              <el-input
+                v-model="ruleForm.remark"
+                :placeholder="'请输入备注'"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <div class="nox">
+      <div class="title">{{ "历史地址" }}</div>
+    </div>
+    <div class="local" v-show="isDeliveryWay">
+      <div
+        :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>
+        <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>
+    <el-table
+      :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" :label="'商品名称'">
+        <template slot-scope="scope">
+          <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
+          <div class="goods">
+            <div class="goods_t">
+              <img :src="scope.row.cover1" alt="" />
+              <div>{{ scope.row.waresName }}</div>
+            </div>
+            <div
+              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">
+                  <div>
+                    {{ item.productName }}
+                  </div>
+                  <div>x {{ item.quantity }}</div>
+                </div>
+              </div>
+              <div class="goods_tit_r">
+                {{ item.skuInfo }}
+              </div>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="'商品单价' + '(¥)'"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.price | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="'商品业绩' + '(PV)'"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.achieve | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="quantity" :label="'商品数量'">
+      </el-table-column>
+      <el-table-column align="center" prop="spyjxj" :label="'业绩小计' + 'PV'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="pvxj" :label="'金额小计' + '(¥)'">
+        <template slot-scope="scope">
+          <span>{{ scope.row.priceAmount | numberToCurrency }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="tab_b">
+      <div>
+        {{ "商品金额总计" }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>{{ "邮费" }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
+    </div>
+    <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
+    <div class="zhan"></div>
+    <!-- 购买 -->
+    <div class="tfooter">
+      <div class="footer_t">
+        <div class="footer_tt">
+          <div class="dis_flex">
+            <div class="f1">{{ "总价" }}:</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
+          </div>
+          <div class="dis_flex">
+            <div class="f1">{{ "业绩" }}:</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
+            </div>
+          </div>
+        </div>
+        <div
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ "寄送至" }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ "收货人" }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}
+          </div>
+        </div>
+      </div>
+      <div class="footer_b">
+        <!-- 协议 -->
+        <!-- <agreement
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <div class="btn" @click="submitRegister('ruleForm')">{{ "购买" }}</div>
+      </div>
+    </div>
+    <!-- 强制阅读协议 -->
+    <mustAgreeMent :waresCodeList="waresCodeList"></mustAgreeMent>
+    <Pay :isPay="isPay" @closePay="closePay" :paramsPost="paramsPost"></Pay>
+  </div>
 </template>
 
 <script>
-	import personInfo from '@/components/personInfo.vue'
-	import AddAddress from '@/components/AddAddress.vue'
-	import agreement from '@/components/agreement.vue'
-	import {
-		mapGetters
-	} from 'vuex'
-	import * as api from '@/api/register.js'
-	import {
-		setTokenMi
-	} from '@/util/auth'
-	import Pay from '@/components/Pay.vue'
-	import mustAgreeMent from '@/components/mustAgreeMent.vue'
-	export default {
-		components: {
-			personInfo,
-			AddAddress,
-			agreement,
-			Pay,
-			mustAgreeMent
-		},
-		data() {
-			let validateRecPhone = (rule, value, callback) => {
-				if (this.ruleForm.recPhone === '' && this.isDeliveryWay) {
-					callback(new Error('请输入联系方式'))
-				} else if (this.pkCountry == 1 && this.ruleForm.recPhone.length != 11) {
-					callback(new Error('请输入正确联系方式'))
-				} else if (this.pkCountry == 1 && this.ruleForm.recPhone[0] != 1) {
-					callback(new Error('请输入正确联系方式'));
-				} else {
-					callback()
-				}
-			}
-			let validateRecTransType = (rule, value, callback) => {
-				if (this.ruleForm.transType == '' && this.isDeliveryWay) {
-					callback(new Error('请选择运输方式'))
-				} else {
-					callback()
-				}
-			}
-			return {
-				waresCodeList: [],
-				isPay: false,
-				paramsPost: '',
-				isClick: 0,
-				ruleForm: {
-					dizhi: [],
-					fwzx: '',
-					upgradeMemberCode: '',
-					upgradeMemberName: '',
-					postage: '',
-					recName: '',
-					recPhone: '',
-					recAddress: '',
-					deliveryWay: '',
-					transType: '',
-				},
-				rules: {
-					upgradeMemberCode: [{
-						required: true,
-						validator: this.upgradeMemberCodePass,
-						trigger: 'blur',
-					}, ],
-					gradeName: [{
-						required: true,
-						message: '请输入申请级别',
-						trigger: 'change'
-					}, ],
-					upgradeMemberName: [{
-						required: true,
-						message: '请输入会员姓名',
-						trigger: 'change'
-					}, ],
-					recName: [{
-						required: true,
-						message: '请输入收件人',
-						trigger: 'blur'
-					}],
-					recPhone: [{
-						validator: validateRecPhone,
-						trigger: 'blur'
-					}],
-					recAddress: [{
-						required: true,
-						message: '请输入详细地址',
-						trigger: 'blur'
-					}, ],
-					deliveryWay: [{
-						required: true,
-						message: '请选择发货方式',
-						trigger: 'change',
-					}, ],
-					// transType: [
-					//   {
-					//     required: true,
-					//     message: '请选择运输方式',
-					//     trigger: 'change',
-					//   },
-					// ],
-					transType: [{
-						validator: validateRecTransType
-					}],
-				},
-				addressList: [],
-				moren: '',
-				allGoodsData: [],
-				allData: [],
-				agreementShow: false,
-				countryList: [],
-				transList: [{
-						value: 1,
-						label: '陆运',
-					},
-					{
-						value: 2,
-						label: '空运',
-					},
-					{
-						value: 3,
-						label: '海运',
-					},
-				],
-				deliList: [],
-				bankLists: [],
-				areaData: [],
-				regionParams: {
-					label: 'name',
-					value: 'id',
-					children: 'children',
-					expandTrigger: 'hover',
-				},
-				totalPrice: 0,
-				totalAchive: 0,
-				isLoading: '',
-				isDeliveryWay: true,
-				shoppingArr: '',
-				totalAmont: 0,
-				pkCountry: ''
-			}
-		},
-		computed: {
-			...mapGetters(['userInfo']),
-		},
-		mounted() {
-			// // 数据源
-			// this.allGoodsData = JSON.parse(localStorage.getItem('allGoods'))
-			// this.allGoodsData[0].orderItemsParams.forEach((item) => {
-			//   item.goodsPrice = 0
-			//   item.goodsAchive = 0
-			//   item.waresItemsParamList.forEach((ctem) => {
-			//     item.goodsPrice += parseFloat(ctem.priceTotal)
-			//     item.goodsAchive += parseFloat(ctem.achieveTotal)
-			//   })
-			// })
-			// let totalPrice = 0
-			// let totalAchive = 0
-			// this.allGoodsData[0].orderItemsParams.forEach((item) => {
-			//   totalPrice += parseFloat(item.goodsPrice * item.quantity)
-			//   totalAchive += parseFloat(item.goodsAchive * item.quantity)
-			// })
-			// this.totalPrice = totalPrice
-			// this.totalAchive = totalAchive
-			// this.allData = this.allGoodsData[0].orderItemsParams
-			// // 服务中心赋值
-			this.ruleForm.upgradeMemberCode = this.userInfo.memberCode
-			this.getUserName()
-			this.pkCountry = parseInt(localStorage.getItem('pkCountry'))
-			// // 获取地址
-			// this.getAddressList()
-			// // 获取运输方式
-			// this.getTransList()
-			// // 获取发货方式
-			// this.getDeliveryList()
-			// this.getAllArea()
-			// // 获取会员等级
-			// // this.getMember()
-			// 数据源
-			this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'))
-			// 获取购物车详情
-			this.getCatDetail()
-			// 幂等性
-			api.generate().then((res) => {
-				setTokenMi(res.msg)
-			})
-			if (this.userInfo.pkSettleCountry == 1) {
-				this.ruleForm.transType = 1
-				this.ruleForm.deliveryWay = 1
-			}
-		},
-		methods: {
-			// 升级编号获取name
-			upgradeMemberCodePass(rule, value, callback) {
-				if (!value) {
-					callback(new Error('请输入会员编号'))
-				} else {
-					api
-						.upgRel({
-							upgradeMemberCode: value,
-						})
-						.then((res) => {
-							if (res.code == 200) {
-								this.ruleForm.upgradeMemberName = res.data.upgradeMemberName
-								// this.getMember()
-								this.$forceUpdate()
-								callback()
-							}
-						})
-						.catch((err) => {
-							callback(new Error(err))
-						})
-				}
-			},
-			setDizhi(e, val) {
-				let arr = this.flatten(this.areaData)
-				let nameList = ''
-				arr.forEach((item) => {
-					this.ruleForm.dizhi.forEach((ctem) => {
-						if (ctem == item.id) {
-							nameList += item.name
-						}
-					})
-				})
-				this.ruleForm.nameList = nameList
-				this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-				this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-				this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || ''
-				this.allGoodsData.recName = this.ruleForm.recName
-				this.allGoodsData.recPhone = this.ruleForm.recPhone
-				this.allGoodsData.recAddress = this.ruleForm.recAddress
-				this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-				this.allGoodsData.transType = this.ruleForm.transType
-				this.getPostAge()
-			},
-			getCatDetail() {
-				api
-					.shoppingWaresDetail({
-						shoppingIds: this.shoppingArr,
-						specialArea: 10,
-					})
-					.then((res) => {
-						this.allGoodsData = res.data
-						this.waresCodeList = res.data.orderItemsParams.map(item => {
-							return item.waresCode
-						})
-						this.allGoodsData.specialArea = 10
-						this.allData = this.allGoodsData.orderItemsParams
-						this.totalAmont = this.allGoodsData.priceAmount
-						// 服务中心赋值
-						// this.ruleForm.fwzx = this.userInfo.memberCode
+import personInfo from "@/components/personInfo.vue";
+import AddAddress from "@/components/AddAddress.vue";
+// import agreement from "@/components/agreement.vue";
+import { mapGetters } from "vuex";
+import * as api from "@/api/register.js";
+import { setTokenMi } from "@/util/auth";
+import Pay from "@/components/Pay.vue";
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
+export default {
+  components: {
+    personInfo,
+    AddAddress,
+    // agreement,
+    Pay,
+    mustAgreeMent,
+  },
+  data() {
+    let validateRecPhone = (rule, value, callback) => {
+      if (this.ruleForm.recPhone === "" && this.isDeliveryWay) {
+        callback(new Error("请输入联系方式"));
+      } else if (this.pkCountry == 1 && this.ruleForm.recPhone.length != 11) {
+        callback(new Error("请输入正确联系方式"));
+      } else if (this.pkCountry == 1 && this.ruleForm.recPhone[0] != 1) {
+        callback(new Error("请输入正确联系方式"));
+      } else {
+        callback();
+      }
+    };
+    let validateRecTransType = (rule, value, callback) => {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
+        callback(new Error("请选择运输方式"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      waresCodeList: [],
+      isPay: false,
+      paramsPost: "",
+      isClick: 0,
+      ruleForm: {
+        dizhi: [],
+        fwzx: "",
+        upgradeMemberCode: "",
+        upgradeMemberName: "",
+        postage: "",
+        recName: "",
+        recPhone: "",
+        recAddress: "",
+        deliveryWay: "",
+        transType: "",
+      },
+      rules: {
+        upgradeMemberCode: [
+          {
+            required: true,
+            validator: this.upgradeMemberCodePass,
+            trigger: "blur",
+          },
+        ],
+        gradeName: [
+          {
+            required: true,
+            message: "请输入申请级别",
+            trigger: "change",
+          },
+        ],
+        upgradeMemberName: [
+          {
+            required: true,
+            message: "请输入会员姓名",
+            trigger: "change",
+          },
+        ],
+        recName: [
+          {
+            required: true,
+            message: "请输入收件人",
+            trigger: "blur",
+          },
+        ],
+        recPhone: [
+          {
+            validator: validateRecPhone,
+            trigger: "blur",
+          },
+        ],
+        recAddress: [
+          {
+            required: true,
+            message: "请输入详细地址",
+            trigger: "blur",
+          },
+        ],
+        deliveryWay: [
+          {
+            required: true,
+            message: "请选择发货方式",
+            trigger: "change",
+          },
+        ],
+        // transType: [
+        //   {
+        //     required: true,
+        //     message: '请选择运输方式',
+        //     trigger: 'change',
+        //   },
+        // ],
+        transType: [
+          {
+            validator: validateRecTransType,
+          },
+        ],
+      },
+      addressList: [],
+      moren: "",
+      allGoodsData: [],
+      allData: [],
+      agreementShow: true,
+      countryList: [],
+      transList: [
+        {
+          value: 1,
+          label: "陆运",
+        },
+        {
+          value: 2,
+          label: "空运",
+        },
+        {
+          value: 3,
+          label: "海运",
+        },
+      ],
+      deliList: [],
+      bankLists: [],
+      areaData: [],
+      regionParams: {
+        label: "name",
+        value: "id",
+        children: "children",
+        expandTrigger: "hover",
+      },
+      totalPrice: 0,
+      totalAchive: 0,
+      isLoading: "",
+      isDeliveryWay: true,
+      shoppingArr: "",
+      totalAmont: 0,
+      pkCountry: "",
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
+  mounted() {
+    // // 数据源
+    // this.allGoodsData = JSON.parse(localStorage.getItem('allGoods'))
+    // this.allGoodsData[0].orderItemsParams.forEach((item) => {
+    //   item.goodsPrice = 0
+    //   item.goodsAchive = 0
+    //   item.waresItemsParamList.forEach((ctem) => {
+    //     item.goodsPrice += parseFloat(ctem.priceTotal)
+    //     item.goodsAchive += parseFloat(ctem.achieveTotal)
+    //   })
+    // })
+    // let totalPrice = 0
+    // let totalAchive = 0
+    // this.allGoodsData[0].orderItemsParams.forEach((item) => {
+    //   totalPrice += parseFloat(item.goodsPrice * item.quantity)
+    //   totalAchive += parseFloat(item.goodsAchive * item.quantity)
+    // })
+    // this.totalPrice = totalPrice
+    // this.totalAchive = totalAchive
+    // this.allData = this.allGoodsData[0].orderItemsParams
+    // // 服务中心赋值
+    this.ruleForm.upgradeMemberCode = this.userInfo.memberCode;
+    this.getUserName();
+    this.pkCountry = parseInt(localStorage.getItem("pkCountry"));
+    // // 获取地址
+    // this.getAddressList()
+    // // 获取运输方式
+    // this.getTransList()
+    // // 获取发货方式
+    // this.getDeliveryList()
+    // this.getAllArea()
+    // // 获取会员等级
+    // // this.getMember()
+    // 数据源
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
+    // 获取购物车详情
+    this.getCatDetail();
+    // 幂等性
+    api.generate().then((res) => {
+      setTokenMi(res.msg);
+    });
+    if (this.userInfo.pkSettleCountry == 1) {
+      this.ruleForm.transType = 1;
+      this.ruleForm.deliveryWay = 1;
+    }
+  },
+  methods: {
+    // 升级编号获取name
+    upgradeMemberCodePass(rule, value, callback) {
+      if (!value) {
+        callback(new Error("请输入会员编号"));
+      } else {
+        api
+          .upgRel({
+            upgradeMemberCode: value,
+          })
+          .then((res) => {
+            if (res.code == 200) {
+              this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
+              // this.getMember()
+              this.$forceUpdate();
+              callback();
+            }
+          })
+          .catch((err) => {
+            callback(new Error(err));
+          });
+      }
+    },
+    setDizhi(e, val) {
+      let arr = this.flatten(this.areaData);
+      let nameList = "";
+      arr.forEach((item) => {
+        this.ruleForm.dizhi.forEach((ctem) => {
+          if (ctem == item.id) {
+            nameList += item.name;
+          }
+        });
+      });
+      this.ruleForm.nameList = nameList;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2] || "";
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.getPostAge();
+    },
+    getCatDetail() {
+      api
+        .shoppingWaresDetail({
+          shoppingIds: this.shoppingArr,
+          specialArea: 10,
+        })
+        .then((res) => {
+          this.allGoodsData = res.data;
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
+            return item.waresCode;
+          });
+          this.allGoodsData.specialArea = 10;
+          this.allData = this.allGoodsData.orderItemsParams;
+          this.totalAmont = this.allGoodsData.priceAmount;
+          // 服务中心赋值
+          // this.ruleForm.fwzx = this.userInfo.memberCode
 
-						// 获取地址
-						this.getAddressList()
-						// 获取运输方式
-						this.getTransList()
-						// 获取发货方式
-						this.getDeliveryList()
-						// 获取省市县
-						this.getAllArea()
-						// 获取会员等级
-						// this.getMember()
-					})
-			},
-			selDelivery(e) {
-				if (e == 2 || e == 3) {
-					this.isDeliveryWay = false
-				} else {
-					this.isDeliveryWay = true
-				}
-			},
-			openLoading() {
-				this.isLoading = this.$loading({
-					lock: true,
-					text: 'Loading',
-					spinner: 'el-icon-loading',
-					background: 'rgba(0, 0, 0, 0.7)',
-				})
-			},
-			resetAll() {
-				this.ruleForm.parent = ''
-				this.ruleForm.deliveryWay = ''
-				this.ruleForm.transType = ''
-				this.$nextTick(() => {
-					this.$refs.ruleForm.clearValidate()
-				})
-			},
-			getUserName() {
-				api
-					.upgRel({
-						upgradeMemberCode: this.ruleForm.upgradeMemberCode,
-					})
-					.then((res) => {
-						if (res.code == 200) {
-							this.ruleForm.upgradeMemberName = res.data.upgradeMemberName
-							this.$forceUpdate()
-						}
-					})
-			},
-			closePay(val) {
-				if (val) {
-					this.isPay = false
-					this.$router.push({
-						path: '/vipCenter',
-						query: {
-							id: 1
-						},
-					})
-				} else {
-					this.$confirm('确认取消支付' + '?')
-						.then((_) => {
-							this.isPay = false
-							this.$router.push({
-								path: '/vipCenter',
-								query: {
-									id: 1
-								},
-							})
-						})
-						.catch((_) => {})
-				}
-			},
-			// 注册
-			submitRegister(formName) {
-				let deleteList = []
-				this.shoppingArr.forEach((item) => {
-					deleteList.push({
-						shoppingId: item,
-					})
-				})
-				if (!this.agreementShow) {
-					this.$message({
-						message: '请阅读并同意购买协议',
-						type: 'warning',
-					})
-					return
-				}
-				if (this.isDeliveryWay && !this.ruleForm.recPhone) {
-					this.$message({
-						message: '请选择收货人信息',
-						type: 'warning',
-					})
-					return
-				}
-				this.$refs[formName].validate((valid) => {
-					if (valid) {
-						this.openLoading()
-						let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-							deleteList: deleteList,
-						})
+          // 获取地址
+          this.getAddressList();
+          // 获取运输方式
+          this.getTransList();
+          // 获取发货方式
+          this.getDeliveryList();
+          // 获取省市县
+          this.getAllArea();
+          // 获取会员等级
+          // this.getMember()
+        });
+    },
+    selDelivery(e) {
+      if (e == 2 || e == 3) {
+        this.isDeliveryWay = false;
+      } else {
+        this.isDeliveryWay = true;
+      }
+    },
+    openLoading() {
+      this.isLoading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    resetAll() {
+      this.ruleForm.parent = "";
+      this.ruleForm.deliveryWay = "";
+      this.ruleForm.transType = "";
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate();
+      });
+    },
+    getUserName() {
+      api
+        .upgRel({
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
+            this.$forceUpdate();
+          }
+        });
+    },
+    closePay(val) {
+      if (val) {
+        this.isPay = false;
+        this.$router.push({
+          path: "/vipCenter",
+          query: {
+            id: 1,
+          },
+        });
+      } else {
+        this.$confirm("确认取消支付" + "?")
+          .then((_) => {
+            this.isPay = false;
+            this.$router.push({
+              path: "/vipCenter",
+              query: {
+                id: 1,
+              },
+            });
+          })
+          .catch((_) => {});
+      }
+    },
+    // 注册
+    submitRegister(formName) {
+      let deleteList = [];
+      this.shoppingArr.forEach((item) => {
+        deleteList.push({
+          shoppingId: item,
+        });
+      });
+      if (!this.agreementShow) {
+        this.$message({
+          message: "请阅读并同意购买协议",
+          type: "warning",
+        });
+        return;
+      }
+      if (this.isDeliveryWay && !this.ruleForm.recPhone) {
+        this.$message({
+          message: "请选择收货人信息",
+          type: "warning",
+        });
+        return;
+      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.openLoading();
+          let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
+            deleteList: deleteList,
+          });
 
-						api
-							.confirmOthOrder(obj)
-							.then((res) => {
-								this.isLoading.close()
-								if (res.code == 200) {
-									this.isPay = true
-									this.paramsPost = res.data
-								}
-							})
-							.catch((err) => {
-								this.isLoading.close()
-							})
-					} else {
-						return false
-					}
-				})
-				// let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
-				// console.log(
-				//   '%c [ obj ]-498',
-				//   'font-size:13px; background:#88187e; color:#cc5cc2;',
-				//   obj
-				// )
-			},
-			flatten(arr) {
-				return arr.reduce((result, item) => {
-					return result.concat(
-						item,
-						Array.isArray(item.children) ? this.flatten(item.children) : []
-					)
-				}, [])
-			},
-			checkRadio() {
-				this.$set(this.ruleForm, 'dizhi', [])
-				let arr = []
-				this.addressList.forEach((item) => {
-					if (item.pkId == this.moren) {
-						this.ruleForm.recName = item.recName
-						this.ruleForm.nameList = item.recArea
-						this.ruleForm.recPhone = item.recPhone
-						this.ruleForm.recAddress = item.recAddress
-						arr = [
-							item.recProvince + '',
-							item.recCity + '',
-							(item.recCounty || '') + '',
-						]
-					}
-				})
-				arr = arr.filter((s) => {
-					return s && s.trim()
-				})
+          api
+            .confirmOthOrder(obj)
+            .then((res) => {
+              this.isLoading.close();
+              if (res.code == 200) {
+                this.isPay = true;
+                this.paramsPost = res.data;
+              }
+            })
+            .catch((err) => {
+              this.isLoading.close();
+            });
+        } else {
+          return false;
+        }
+      });
+      // let obj = Object.assign({}, this.allGoodsData[0], this.ruleForm)
+      // console.log(
+      //   '%c [ obj ]-498',
+      //   'font-size:13px; background:#88187e; color:#cc5cc2;',
+      //   obj
+      // )
+    },
+    flatten(arr) {
+      return arr.reduce((result, item) => {
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
+      }, []);
+    },
+    checkRadio() {
+      this.$set(this.ruleForm, "dizhi", []);
+      let arr = [];
+      this.addressList.forEach((item) => {
+        if (item.pkId == this.moren) {
+          this.ruleForm.recName = item.recName;
+          this.ruleForm.nameList = item.recArea;
+          this.ruleForm.recPhone = item.recPhone;
+          this.ruleForm.recAddress = item.recAddress;
+          arr = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
+        }
+      });
+      arr = arr.filter((s) => {
+        return s && s.trim();
+      });
 
-				this.$set(this.ruleForm, 'dizhi', arr)
-				this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay
-				this.allGoodsData.transType = this.ruleForm.transType
-				this.allGoodsData.recProvince = this.ruleForm.dizhi[0]
-				this.allGoodsData.recCity = this.ruleForm.dizhi[1]
-				this.allGoodsData.recCounty = this.ruleForm.dizhi[2]
+      this.$set(this.ruleForm, "dizhi", arr);
+      this.allGoodsData.deliveryWay = this.ruleForm.deliveryWay;
+      this.allGoodsData.transType = this.ruleForm.transType;
+      this.allGoodsData.recProvince = this.ruleForm.dizhi[0];
+      this.allGoodsData.recCity = this.ruleForm.dizhi[1];
+      this.allGoodsData.recCounty = this.ruleForm.dizhi[2];
 
-				this.allGoodsData.recName = this.ruleForm.recName
-				this.allGoodsData.recPhone = this.ruleForm.recPhone
-				this.allGoodsData.recAddress = this.ruleForm.recAddress
-				this.getPostAge()
-				this.$forceUpdate()
-			},
-			getPostAge() {
-				let deleteList = []
-				this.shoppingArr.forEach((item) => {
-					deleteList.push({
-						shoppingId: item,
-					})
-				})
-				this.allGoodsData.deleteList = deleteList
-				api.queryPostage(this.allGoodsData).then((res) => {
-					this.ruleForm.postage = Number(res.data.postage).toFixed(2)
-					this.totalAmont =
-						parseFloat(this.allGoodsData.priceAmount) +
-						parseFloat(res.data.postage)
-				})
-			},
-			// getMember() {
-			//   this.allGoodsData.upgradeMemberCode = this.ruleForm.upgradeMemberCode
-			//   api.memLevel(this.allGoodsData).then((res) => {
-			//     if (res.data.isEnough) {
-			//       this.ruleForm.gradeName = res.data.gradeName
-			//     } else {
-			//       this.isLoading.close()
-			//     }
-			//   })
-			// },
-			getTransList() {
-				api.transportList().then((res) => {
-					this.transList = res.data
-				})
-			},
-			getDeliveryList() {
-				api.deliveryList().then((res) => {
-					this.deliList = res.data
-				})
-			},
-			delAds(id) {
-				this.$confirm('确定要删除该收货地址吗' + '?', '', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-				}).then(() => {
-					api.delAddress(id).then((res) => {
-						this.$message({
-							type: 'success',
-							message: '删除成功' + '!',
-						})
-						this.getAddressList()
-					})
-				})
-			},
-			getAllArea() {
-				api.allArea().then((res) => {
-					this.areaData = res.data
-				})
-			},
-			changeAds(id) {
-				this.$refs.addAddress.isShowAddress(true, this.areaData, id)
-			},
-			setDefaultAds(id) {
-				api.addressDefault(id).then((res) => {
-					this.getAddressList()
-				})
-			},
-			// 同意协议
-			agree(val) {
-				this.agreementShow = val
-			},
-			openAddress() {
-				this.$refs.addAddress.isShowAddress(true, this.areaData)
-			},
-			getAddressList() {
-				api.addressList({}).then((res) => {
-					this.addressList = res.data
-					this.addressList.forEach((item) => {
-						if (item.isDefault == 1) {
-							this.moren = item.pkId
-							this.checkRadio()
-						}
-					})
-					// this.moren = this.addressList[0].pkId
-				})
-			},
-			// 斑马线
-			tableRowClassName({
-				row,
-				rowIndex
-			}) {
-				if (rowIndex % 2 == 0) {
-					return 'warning-row'
-				} else if (rowIndex % 2 == 1) {
-					return 'success-row'
-				}
-				return ''
-			},
-		},
-	}
+      this.allGoodsData.recName = this.ruleForm.recName;
+      this.allGoodsData.recPhone = this.ruleForm.recPhone;
+      this.allGoodsData.recAddress = this.ruleForm.recAddress;
+      this.getPostAge();
+      this.$forceUpdate();
+    },
+    getPostAge() {
+      let deleteList = [];
+      this.shoppingArr.forEach((item) => {
+        deleteList.push({
+          shoppingId: item,
+        });
+      });
+      this.allGoodsData.deleteList = deleteList;
+      api.queryPostage(this.allGoodsData).then((res) => {
+        this.ruleForm.postage = Number(res.data.postage).toFixed(2);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
+      });
+    },
+    // getMember() {
+    //   this.allGoodsData.upgradeMemberCode = this.ruleForm.upgradeMemberCode
+    //   api.memLevel(this.allGoodsData).then((res) => {
+    //     if (res.data.isEnough) {
+    //       this.ruleForm.gradeName = res.data.gradeName
+    //     } else {
+    //       this.isLoading.close()
+    //     }
+    //   })
+    // },
+    getTransList() {
+      api.transportList().then((res) => {
+        this.transList = res.data;
+      });
+    },
+    getDeliveryList() {
+      api.deliveryList().then((res) => {
+        this.deliList = res.data;
+      });
+    },
+    delAds(id) {
+      this.$confirm("确定要删除该收货地址吗" + "?", "", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        api.delAddress(id).then((res) => {
+          this.$message({
+            type: "success",
+            message: "删除成功" + "!",
+          });
+          this.getAddressList();
+        });
+      });
+    },
+    getAllArea() {
+      api.allArea().then((res) => {
+        this.areaData = res.data;
+      });
+    },
+    changeAds(id) {
+      this.$refs.addAddress.isShowAddress(true, this.areaData, id);
+    },
+    setDefaultAds(id) {
+      api.addressDefault(id).then((res) => {
+        this.getAddressList();
+      });
+    },
+    // 同意协议
+    agree(val) {
+      this.agreementShow = val;
+    },
+    openAddress() {
+      this.$refs.addAddress.isShowAddress(true, this.areaData);
+    },
+    getAddressList() {
+      api.addressList({}).then((res) => {
+        this.addressList = res.data;
+        this.addressList.forEach((item) => {
+          if (item.isDefault == 1) {
+            this.moren = item.pkId;
+            this.checkRadio();
+          }
+        });
+        // this.moren = this.addressList[0].pkId
+      });
+    },
+    // 斑马线
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "warning-row";
+      } else if (rowIndex % 2 == 1) {
+        return "success-row";
+      }
+      return "";
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.dis_flex {
-		display: flex;
-		align-items: center;
-	}
+.dis_flex {
+  display: flex;
+  align-items: center;
+}
 
-	.rt {
-		border-bottom: 5px solid rgba(7, 7, 7, 0.05);
-		padding: 45px 60px 15px 60px;
+.rt {
+  border-bottom: 5px solid rgba(7, 7, 7, 0.05);
+  padding: 45px 60px 15px 60px;
 
-		.rti {
-			margin-right: 80px;
-		}
+  .rti {
+    margin-right: 80px;
+  }
 
-		.zc {
-			font-size: 18px;
-			font-weight: bold;
-			color: #333333;
-			margin-right: 20px;
-		}
+  .zc {
+    font-size: 18px;
+    font-weight: bold;
+    color: #333333;
+    margin-right: 20px;
+  }
 
-		.zca {
-			font-size: 18px;
-			font-weight: bold;
-			color: #00417C;
-		}
-	}
+  .zca {
+    font-size: 18px;
+    font-weight: bold;
+    color: #00417c;
+  }
+}
 
-	.demo-ruleForm {
-		margin-top: 20px;
-		overflow: hidden;
-	}
+.demo-ruleForm {
+  margin-top: 20px;
+  overflow: hidden;
+}
 
-	.padRow {
-		padding: 0 60px;
-	}
+.padRow {
+  padding: 0 60px;
+}
 
-	::v-deep .el-input__suffix {
-		right: auto;
+::v-deep .el-input__suffix {
+  right: auto;
 
-		.el-input__validateIcon {
-			position: absolute;
-		}
-	}
+  .el-input__validateIcon {
+    position: absolute;
+  }
+}
 
-	::v-deep .el-select {
-		width: 100%;
-	}
+::v-deep .el-select {
+  width: 100%;
+}
 
-	::v-deep .el-select .el-input__suffix {
-		right: 0;
-	}
+::v-deep .el-select .el-input__suffix {
+  right: 0;
+}
 
-	::v-deep .el-icon-circle-check {
-		color: #009900;
-	}
+::v-deep .el-icon-circle-check {
+  color: #009900;
+}
 
-	::v-deep .el-form-item__label {
-		font-size: 14px;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #333333;
-		line-height: 28px;
-	}
+::v-deep .el-form-item__label {
+  font-size: 14px;
+  font-family: PingFang SC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 28px;
+}
 
-	.xian {
-		padding: 10px 60px;
-		border-bottom: 5px solid rgba(7, 7, 7, 0.05);
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 20px;
-	}
+.xian {
+  padding: 10px 60px;
+  border-bottom: 5px solid rgba(7, 7, 7, 0.05);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20px;
+}
 
-	.nox {
-		padding: 10px 60px;
-	}
+.nox {
+  padding: 10px 60px;
+}
 
-	.title {
-		font-size: 18px;
-		font-weight: 600;
-		color: #333333;
-	}
+.title {
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
+}
 
-	.lan {
-		font-size: 18px;
-		font-weight: 400;
-		color: #3499ff;
-		cursor: pointer;
-	}
+.lan {
+  font-size: 18px;
+  font-weight: 400;
+  color: #3499ff;
+  cursor: pointer;
+}
 
-	.local {
-		padding: 0px 60px;
+.local {
+  padding: 0px 60px;
 
-		.local_i {
-			display: flex;
-			align-items: center;
-			padding: 30px 90px;
-		}
+  .local_i {
+    display: flex;
+    align-items: center;
+    padding: 30px 90px;
+  }
 
-		.local_a {
-			background: #eeeeee;
-			border-radius: 8px 8px 8px 8px;
-		}
+  .local_a {
+    background: #eeeeee;
+    border-radius: 8px 8px 8px 8px;
+  }
 
-		.local1 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #333333;
-			margin-right: 50px;
-		}
+  .local1 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #333333;
+    margin-right: 50px;
+  }
 
-		.local2 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #666666;
-			margin-right: 70px;
-			cursor: pointer;
-		}
+  .local2 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    margin-right: 70px;
+    cursor: pointer;
+  }
 
-		.local3 {
-			font-size: 14px;
-			font-weight: 400;
-			color: #f92a28;
-			cursor: pointer;
-		}
-	}
+  .local3 {
+    font-size: 14px;
+    font-weight: 400;
+    color: #f92a28;
+    cursor: pointer;
+  }
+}
 
-	::v-deep .el-radio {
-		margin-right: 0;
-	}
+::v-deep .el-radio {
+  margin-right: 0;
+}
 
-	.guoqi {
-		.el-select-dropdown__item {
-			height: 26px;
-			// text-align: center;
-			margin-bottom: 10px;
-			display: flex;
-			align-items: center;
-		}
+.guoqi {
+  .el-select-dropdown__item {
+    height: 26px;
+    // text-align: center;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+  }
 
-		.shortName {
-			margin-left: 10px;
-		}
-	}
+  .shortName {
+    margin-left: 10px;
+  }
+}
 
-	.guoqikang {
-		::v-deep input {
-			// height: 100px;
-		}
-	}
+.guoqikang {
+  ::v-deep input {
+    // height: 100px;
+  }
+}
 
-	.imgSize {
-		height: 20px;
-	}
+.imgSize {
+  height: 20px;
+}
 
-	.dizhi {
-		::v-deep .el-cascader {
-			width: 100%;
-		}
-	}
+.dizhi {
+  ::v-deep .el-cascader {
+    width: 100%;
+  }
+}
 
-	::v-deep .el-cascader .el-input__suffix {
-		right: 0;
-	}
+::v-deep .el-cascader .el-input__suffix {
+  right: 0;
+}
 
-	.zhan {
-		height: 250px;
-	}
+.zhan {
+  height: 250px;
+}
 
-	.tfooter {
-		position: fixed;
-		width: 100%;
-		bottom: 0;
-		z-index: 10;
+.tfooter {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  z-index: 10;
 
-		.footer_t {
-			padding: 5px 60px 15px 60px;
-			background: #ededed;
+  .footer_t {
+    padding: 5px 60px 15px 60px;
+    background: #ededed;
 
-			.footer_tt {
-				justify-content: right;
-				display: flex;
-				margin-top: 10px;
-			}
-		}
+    .footer_tt {
+      justify-content: right;
+      display: flex;
+      margin-top: 10px;
+    }
+  }
 
-		.footer_b {
-			text-align: right;
-			padding: 10px 60px 10px 60px;
-			background: #fff;
-		}
-	}
+  .footer_b {
+    text-align: right;
+    padding: 10px 60px 10px 60px;
+    background: #fff;
+  }
+}
 
-	.f1 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #333333;
-	}
+.f1 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #333333;
+}
 
-	.f2 {
-		font-size: 18px;
-		font-weight: 500;
-		color: #f43c3a;
-		margin-right: 40px;
-	}
+.f2 {
+  font-size: 18px;
+  font-weight: 500;
+  color: #f43c3a;
+  margin-right: 40px;
+}
 
-	.f3 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #384a8a;
-	}
+.f3 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #384a8a;
+}
 
-	.f4 {
-		font-size: 14px;
-		font-weight: 400;
-		color: #666;
-	}
+.f4 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #666;
+}
 
-	.btn {
-		background: var(--primary-color);
-		border-radius: 8px 8px 8px 8px;
-		padding: 12px 40px;
-		display: inline-block;
-		color: #fff;
-		font-size: 18px;
-		margin-top: 10px;
-		cursor: pointer;
-	}
+.btn {
+  background: var(--primary-color);
+  border-radius: 8px 8px 8px 8px;
+  padding: 12px 40px;
+  display: inline-block;
+  color: #fff;
+  font-size: 18px;
+  margin-top: 10px;
+  cursor: pointer;
+}
 
-	.goods {
-		text-align: left;
-		padding-top: 20px;
-		padding-left: 50px;
-	}
+.goods {
+  text-align: left;
+  padding-top: 20px;
+  padding-left: 50px;
+}
 
-	.goods_t {
-		display: flex;
-		font-size: 14px;
-		font-weight: 400;
-		color: #333333;
+.goods_t {
+  display: flex;
+  font-size: 14px;
+  font-weight: 400;
+  color: #333333;
 
-		// justify-content: center;
-		img {
-			width: 88px;
-			height: 88px;
-			margin-right: 10px;
-		}
-	}
+  // justify-content: center;
+  img {
+    width: 88px;
+    height: 88px;
+    margin-right: 10px;
+  }
+}
 
-	.goods_tit {
-		font-size: 12px;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #666666;
-		margin-top: 10px;
-		display: flex;
+.goods_tit {
+  font-size: 12px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  margin-top: 10px;
+  display: flex;
 
-		img {
-			width: 35px;
-			height: 35px;
-			margin-right: 10px;
-		}
+  img {
+    width: 35px;
+    height: 35px;
+    margin-right: 10px;
+  }
 
-		.goods_tit_l {
-			flex: 1;
-			display: flex;
-			align-items: center;
-		}
+  .goods_tit_l {
+    flex: 1;
+    display: flex;
+    align-items: center;
+  }
 
-		.goods_tit_r {
-			// width: 150px;
-		}
-	}
+  .goods_tit_r {
+    // width: 150px;
+  }
+}
 
-	.tab_b {
-		text-align: right;
-		font-size: 12px;
-		font-family: PingFang SC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #666666;
-		padding: 20px 60px 0 0;
-	}
-</style>
\ No newline at end of file
+.tab_b {
+  text-align: right;
+  font-size: 12px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  padding: 20px 60px 0 0;
+}
+</style>
diff --git a/src/views/shareConfirm/index.vue b/src/views/shareConfirm/index.vue
index 11e261c..954692a 100644
--- a/src/views/shareConfirm/index.vue
+++ b/src/views/shareConfirm/index.vue
@@ -362,7 +362,7 @@ export default {
       moren: '',
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/shareFansConfirm/index.vue b/src/views/shareFansConfirm/index.vue
index 88cf5d0..21c6b9d 100644
--- a/src/views/shareFansConfirm/index.vue
+++ b/src/views/shareFansConfirm/index.vue
@@ -333,7 +333,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/shoppingMall/index.vue b/src/views/shoppingMall/index.vue
index 09372a5..8f8737b 100644
--- a/src/views/shoppingMall/index.vue
+++ b/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: [],
diff --git a/src/views/tvIng/index.vue b/src/views/tvIng/index.vue
index f3ea4cc..bac3f2c 100644
--- a/src/views/tvIng/index.vue
+++ b/src/views/tvIng/index.vue
@@ -395,7 +395,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/upgrade/index.vue b/src/views/upgrade/index.vue
index ce848d8..ed46d37 100644
--- a/src/views/upgrade/index.vue
+++ b/src/views/upgrade/index.vue
@@ -504,7 +504,7 @@ export default {
       moren: "",
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
diff --git a/src/views/welfare/index.vue b/src/views/welfare/index.vue
index 47dc301..ebf8352 100644
--- a/src/views/welfare/index.vue
+++ b/src/views/welfare/index.vue
@@ -377,7 +377,7 @@ export default {
       moren: '',
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {