feat(index.html): update tab icon

.env.development

@@ -1,7 +1,7 @@
 # just a flag
 ENV = 'development'
 # base api
-VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api/'
+VUE_APP_BASE_API = '/prod-api'
 
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/online/language'
+VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
-VUE_APP_BASE_INTERAPI2 = 'http://f.hzs413.com/language'
+VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'

.env.production

@@ -2,8 +2,8 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/inter-api'
+VUE_APP_BASE_API = '/prod-api'
 VUE_APP_BASE_API1 = 'http://index.hzs413.com'
 
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI = 'https://agl413-test.s3.af-south-1.amazonaws.com/test'
-VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI2 = 'http://ma.angelo413.com/lang'

.env.test

@@ -2,7 +2,8 @@
 ENV = 'test'
 
 # base api
-VUE_APP_BASE_API = 'http://f.hzs413.com/inter-api/'
+VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_INTERAPI = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_API1 = 'http://index.hzs413.com'
-VUE_APP_BASE_INTERAPI2 = 'https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language'
+VUE_APP_BASE_INTERAPI = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
+VUE_APP_BASE_INTERAPI2 = 'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_africa/language'
 VUE_APP_BASE_AREA = ''

public/index.html

@@ -10,7 +10,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>tab-icon.png">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <!-- <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-africa/language/zh-CN.js"></script> -->
     <!-- <script src="https://dny-test.s3.ap-southeast-1.amazonaws.com/test/language/zh-CN.js"></script> -->

src/App.vue

@@ -17,9 +17,7 @@
 import HeaderTop from "@/components/HeaderTop";
 import enLocale from "element-ui/lib/locale/lang/en";
 import zhLocale from "element-ui/lib/locale/lang/zh-CN";
-import ruLocale from "element-ui/lib/locale/lang/ru-RU";
+
-import frLocale from "element-ui/lib/locale/lang/fr";
-import ptLocale from "element-ui/lib/locale/lang/pt";
 import { env } from "echarts";
 export default {
   components: {
@@ -36,7 +34,6 @@ export default {
     self.loading = false;
     self.addScriptChild("zh-CN");
     self.addScriptChild("en-US");
-    self.addScriptChild("ru-RU");
     self.addScriptChild("fr-FR");
     if (process.env.NODE_ENV != "production") {
       // self.addScriptChild("fr-FR");
@@ -150,14 +147,7 @@ export default {
           ...enLocale,
         });
       }
-      if (name == "ru-RU") {
+
-        if (ruRU) {
-          const localruRU = this.getJS(ruRU, "ruRU");
-          var STlocalruRU = JSON.stringify(localruRU);
-          localStorage.setItem("local-ruRU", STlocalruRU);
-        }
-        this.$i18n.mergeLocaleMessage(name, ruRU);
-      }
       if (name == "fr-FR") {
         if (frFR) {
           const localfrFR = this.getJS(frFR, "frFR");

src/assets/i18n/index.js

@@ -4,43 +4,42 @@
  * @Author: kBank
  * @Date: 2022-07-05 17:57:49
  */
-import Vue from 'vue'
+import Vue from "vue";
-import VueI18n from 'vue-i18n'
+import VueI18n from "vue-i18n";
-import locale from 'element-ui/lib/locale'
+import locale from "element-ui/lib/locale";
 // import zhCn from 'zhCN'
 // import enUS from 'enUS'
 // import ruRU from 'ruRU'
 // import frFR from 'frFR'
 // import ptPT from 'ptPT'
-var localenUS = {}
+var localenUS = {};
-var localzhCN = {}
+var localzhCN = {};
-var localruRU = {}
+var localruRU = {};
-var localfrFR = {}
+var localfrFR = {};
-var localptPT = {}
+var localptPT = {};
-if (localStorage.getItem('local-enUS') != undefined) {
+if (localStorage.getItem("local-enUS") != undefined) {
-  localenUS = JSON.parse(localStorage.getItem('local-enUS'));
+  localenUS = JSON.parse(localStorage.getItem("local-enUS"));
 }
-if (localStorage.getItem('local-zhCN') != undefined) {
+if (localStorage.getItem("local-zhCN") != undefined) {
-  localzhCN = JSON.parse(localStorage.getItem('local-zhCN'));
+  localzhCN = JSON.parse(localStorage.getItem("local-zhCN"));
 }
-if (localStorage.getItem('local-ruRU') != undefined) {
+if (localStorage.getItem("local-ruRU") != undefined) {
-  localruRU = JSON.parse(localStorage.getItem('local-ruRU'));
+  localruRU = JSON.parse(localStorage.getItem("local-ruRU"));
 }
-if (localStorage.getItem('local-frFR') != undefined) {
+if (localStorage.getItem("local-frFR") != undefined) {
-  localfrFR = JSON.parse(localStorage.getItem('local-frFR'));
+  localfrFR = JSON.parse(localStorage.getItem("local-frFR"));
 }
-if (localStorage.getItem('local-ptPT') != undefined) {
+if (localStorage.getItem("local-ptPT") != undefined) {
-  localptPT = JSON.parse(localStorage.getItem('local-ptPT'));
+  localptPT = JSON.parse(localStorage.getItem("local-ptPT"));
 }
-import enLocale from 'element-ui/lib/locale/lang/en'
+import enLocale from "element-ui/lib/locale/lang/en";
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import zhLocale from "element-ui/lib/locale/lang/zh-CN";
-import ruLocale from 'element-ui/lib/locale/lang/ru-RU'
+import frLocale from "element-ui/lib/locale/lang/fr";
-import frLocale from 'element-ui/lib/locale/lang/fr'
+import ptLocale from "element-ui/lib/locale/lang/pt";
-import ptLocale from 'element-ui/lib/locale/lang/pt'
+const lang = localStorage.getItem("lang") || "en-US";
-const lang = localStorage.getItem('lang') || 'en-US'
 
-Vue.use(VueI18n)
+Vue.use(VueI18n);
-console.log('18n')
+console.log("18n");
 
 const i18n = new VueI18n({
   locale: lang,
@@ -51,30 +50,24 @@ const i18n = new VueI18n({
     // 'ru-RU': { ...ruRU },
     // 'fr-FR': { ...frFR },
     // 'pt-PT': { ...ptPT },
-	'zh-CN': {
+    "zh-CN": {
       ...localzhCN,
-	  ...zhLocale
+      ...zhLocale,
     },
-	'en-US': {
+    "en-US": {
       ...localenUS,
-	  ...enLocale
+      ...enLocale,
     },
-	'ru-RU': {
+
-	  ...localruRU,
+    "fr-FR": {
-	  ...ruLocale
-	},
-	'fr-FR': {
       ...localfrFR,
-	  ...frLocale
+      ...frLocale,
     },
-	'pt-PT': {
+    "pt-PT": {
       ...localptPT,
-	  ...ptLocale
+      ...ptLocale,
     },
-  }
+  },
-
+});
-})
+locale.i18n((key, value) => i18n.t(key, value));
-locale.i18n((key, value) => i18n.t(key, value))
+export default i18n;
-export default i18n
-
-

src/components/agreement.vue

@@ -13,20 +13,17 @@
 <template>
   <div class="agreementBox flex_ac" v-if="userInfo.buyAgreementFlag != 1">
     <div class="agreementIcon">
-      <el-checkbox v-model="toShow"
+      <el-checkbox v-model="toShow" @change="toCheck"> </el-checkbox>
-                   @change="toCheck">
-      </el-checkbox>
       <div class="agreementText flex">
         <span>
-          <span>{{ $t('w_0207') }}</span>
+          <span>{{ $t("w_0207") }}</span>
-          <span class="agreementDetail"
+          <span class="agreementDetail" @click="popupShow = true"
-                @click="popupShow = true">《{{ $t('w_0208') }}》</span>
+            >《{{ $t("w_0208") }}》</span
+          >
         </span>
       </div>
     </div>
-    <el-dialog class="pop"
+    <el-dialog class="pop" :append-to-body="true" :visible.sync="popupShow">
-               :append-to-body="true"
-               :visible.sync="popupShow">
       <div class="pop_box" v-if="userInfo.pkCountry == 1">
         <div class="pop_title">会员协议</div>
         <h3>特别提示：</h3>
@@ -74,7 +71,10 @@
           1．会员理解并同意，会员必须为自己注册账号下的一切行为负责，包括会员在购物平台上的操作以及由此产生的任何后果。会员应对服务中的内容自行加以判断，并承担因使用内容而引起的所有风险，包括因对内容的正确性、完整性或实用性的依赖而产生的风险。海之圣无法且不会对因会员个人行为而导致的任何损失或损害承担责任。
         </h4>
         <h4>
-          2．如果会员发现任何人违反本协议约定或以其他不当的方式使用本服务，请立即向海之圣举报或投诉，举报或投诉电话为<span style="color: red">4001112818</span>，海之圣将依本协议约定进行处理。
+          2．如果会员发现任何人违反本协议约定或以其他不当的方式使用本服务，请立即向海之圣举报或投诉，举报或投诉电话为<span
+            style="color: red"
+            >4001112818</span
+          >，海之圣将依本协议约定进行处理。
         </h4>
         <h4>
           3．会员理解并同意，因业务发展需要，海之圣保留单方面对本公司、网站等服务的全部或部分服务内容变更、暂停、终止或撤销的权利，会员不同意即视为退出，需承担因此带来的风险。
@@ -84,7 +84,10 @@
           1．基于网站平台的法定责任，如果海之圣发现或收到他人举报或投诉会员违反本协议约定的，海之圣有权随时对相关会员户籍进行审查、删除，并视情节轻重对违规账号处以包括但不限于警告、账号封禁、功能封禁的处罚，且可能公示处理结果。
         </h4>
         <h4>
-          2．因违反会员协议被封禁的会员，可向海之圣客服热线：<span style="color: red">4001112818</span>相关人员提交申诉，海之圣将对申诉进行审查，并自行合理判断决定是否变更处罚措施。
+          2．因违反会员协议被封禁的会员，可向海之圣客服热线：<span
+            style="color: red"
+            >4001112818</span
+          >相关人员提交申诉，海之圣将对申诉进行审查，并自行合理判断决定是否变更处罚措施。
         </h4>
         <h4>
           3．会员应在会员权益内遵守海之圣公司相关业务及会员管理规定，会员在会员权益外的个人行为需遵守中华人民共和国各项法律法规。会员需理解并同意，海之圣有权依合理判断对违反有关法律法规或本协议规定的行为进行处理，对违法违规的任何会员采取适当的法律行动，并依据法律法规保存有关信息向有关部门报告等，会员应承担由此而产生的一切法律责任，如由此给海之圣造成损失，应承担赔偿责任。
@@ -230,29 +233,23 @@
         <h4>
           4．海之圣与会员双方均认可《中华人民共和国电子签名法》，认可依据《中华人民共和国电子签名法》赋予本协议正式的法律效力。一经点击“同意”，本协议即具有了法律赋予的合同效力。
         </h4>
-        <h3 class="bold"
+        <h3 class="bold" style="margin-bottom: 0.1rem; margin-top: 0.4rem">
-            style="margin-bottom: 0.1rem; margin-top: 0.4rem">
           附件一：
         </h3>
         <h4 class="bold">青岛海之圣生物工程有限公司退换货制度</h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">1.0目的</h4>
-            style="text-indent: 0">1.0目的</h4>
         <h4>
           为了规范公司退换货服务标准，保障消费者、经销商利益，特制定本制度。
         </h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">1.0目的</h4>
-            style="text-indent: 0">1.0目的</h4>
         <h4></h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">2.0适用范围</h4>
-            style="text-indent: 0">2.0适用范围</h4>
         <h4>适用于公司所有消费者和经销商正常退换货业务处理。</h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">3.0职责</h4>
-            style="text-indent: 0">3.0职责</h4>
         <h4>3.1总部营运中心负责受理退换货；</h4>
         <h4>3.2总部营运中心负责受理顾客投诉；</h4>
         <h4>3.3总经理直接负责管理监督顾客投诉处理情况。</h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">4.0退换货管理规定</h4>
-            style="text-indent: 0">4.0退换货管理规定</h4>
         <h4>
           4.1总部营运中心为公司指定受理退换货部门，所有退换货受理部门必须按照国家《直销管理条例》相关规定，严格执行公司退换货制度。
         </h4>
@@ -262,19 +259,16 @@
         <h4>
           4.3自提出换货或者退货之日起7个工作日内，按照发票或者售货凭证标明的价款办理换货和退货。
         </h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">5.0退换货受理部门</h4>
-            style="text-indent: 0">5.0退换货受理部门</h4>
         <h4>5.1总部营运中心</h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">6.0退换货程序</h4>
-            style="text-indent: 0">6.0退换货程序</h4>
         <h4>
           6.1换货程序：当消费者、经销商到总部营运中心提出换货要求时，经受理人员确认符合换货条件后，将产品退回，公司予以换货处理。
         </h4>
         <h4>
           6.2退货程序：当消费者、经销商到总部营运中心提出退货要求时，经受理人员确认符合退货条件后，将产品退库，将货款全额返还。
         </h4>
-        <h4 class="bold"
+        <h4 class="bold" style="text-indent: 0">
-            style="text-indent: 0">
           7.0消费者、经销商退货处理流程
         </h4>
         <h4>
@@ -289,8 +283,7 @@
         </h4>
         <h4 class="footer">青岛海之圣生物工程有限公司</h4>
       </div>
-      <div class="pop_box"
+      <div class="pop_box" v-else>
-           v-else>
         <div class="pop_title2 pop_title1">
           KODE ETIK BAGI MITRA USAHA PT HZS INTERNATIONAL INDONESIA (HZS)
         </div>
@@ -1055,9 +1048,9 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from "vuex";
 export default {
-  name: 'Title',
+  name: "Title",
   props: {
     isShow: {
       type: Boolean,
@@ -1066,8 +1059,8 @@ export default {
   },
   watch: {
     isShow(n, o) {
-      console.log('🚀 ~ n', n)
+      console.log("🚀 ~ n", n);
-      this.toShow = n
+      this.toShow = n;
     },
   },
   data() {
@@ -1076,29 +1069,29 @@ export default {
       isqyj: false,
       toShow: this.isShow,
       hasQyj: 0,
-      agreeData: '',
+      agreeData: "",
-      agreementTitle: '',
+      agreementTitle: "",
-    }
+    };
   },
   computed: {
-    ...mapGetters(['userInfo']),
+    ...mapGetters(["userInfo"]),
   },
   methods: {
     openIsqyj(val) {
-      this.agreementTitle = val
+      this.agreementTitle = val;
-      this.isqyj = true
+      this.isqyj = true;
     },
     agreeList(val) {
-      this.agreeData = val
+      this.agreeData = val;
     },
     getHasQyj(val) {
-      this.hasQyj = val
+      this.hasQyj = val;
     },
     toCheck(e) {
-      this.$emit('agree', this.toShow)
+      this.$emit("agree", this.toShow);
     },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/views/integral/index.vue

@@ -10,7 +10,14 @@
     <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-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="$t('ENU_REG_AU_2')"
@@ -22,19 +29,36 @@
         <el-col :span="6">
           <el-form-item :label="$t('N_I_124')" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-						<el-input v-model="ruleForm.upgradeMemberCode" :placeholder="$t('w_0046')"></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :placeholder="$t('w_0046')"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('CK_KS_14')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0060')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0060')"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery" :disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+            <el-select
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -48,57 +72,117 @@
       </el-row>
       <div v-show="isDeliveryWay">
         <div class="xian1">
-					<div class="title">{{ $t('w_0065') }}</div>
+          <div class="title">{{ $t("w_0065") }}</div>
-					<div class="lan" @click="openAddress">{{ $t('w_0066') }}</div>
+          <div class="lan" @click="openAddress">{{ $t("w_0066") }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" :required="isDeliveryWay" prop="recName">
+            <el-form-item
-							<el-input v-model="ruleForm.recName" :placeholder="$t('w_0067')"></el-input>
+              :label="$t('MY_ORD_10')"
+              :required="isDeliveryWay"
+              prop="recName"
+            >
+              <el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" :required="isDeliveryWay" prop="recPhone">
+            <el-form-item
-							<el-input v-model="ruleForm.recPhone" :placeholder="$t('w_0053')"></el-input>
+              :label="$t('w_0052')"
+              :required="isDeliveryWay"
+              prop="recPhone"
+            >
+              <el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0068')" class="dizhi" :required="isDeliveryWay" prop="dizhi">
+            <el-form-item
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData" :props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+              :label="$t('w_0068')"
+              class="dizhi"
+              :required="isDeliveryWay"
+              prop="dizhi"
+            >
+              <el-cascader
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('S_C_27')" :required="isDeliveryWay" prop="recAddress">
+            <el-form-item
-							<el-input v-model="ruleForm.recAddress" maxlength="200" :placeholder="$t('w_0070')"></el-input>
+              :label="$t('S_C_27')"
+              :required="isDeliveryWay"
+              prop="recAddress"
+            >
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
+            <el-form-item :label="$t('w_0071')"
+              ><el-input v-model="ruleForm.postage" disabled></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark" :placeholder="$t('w_0072')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_WAL_22')"
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox">
-			<div class="title">{{ $t('w_0073') }}</div>
+      <div class="title">{{ $t("w_0073") }}</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">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{}}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
-				<div class="local1">{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)</div>
+        v-for="item in addressList"
-				<div class="local2" v-show="item.isDefault == 1">{{ $t('w_0074') }}</div>
+        :key="item.pkId"
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">{{ $t('w_0075') }}</div>
+      >
-				<div class="local2" @click="changeAds(item.pkId)">{{ $t('w_0076') }}</div>
+        <el-radio v-model="moren" @input="checkRadio" :label="item.pkId"
-				<div class="local3" @click="delAds(item.pkId)">{{ $t('ENU_CONTROL_TYPE_3') }}</div>
+          >{{}}</el-radio
+        >
+        <div class="local1">
+          {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
+        </div>
+        <div class="local2" v-show="item.isDefault == 1">
+          {{ $t("w_0074") }}
+        </div>
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ $t("w_0075") }}
+        </div>
+        <div class="local2" @click="changeAds(item.pkId)">
+          {{ $t("w_0076") }}
+        </div>
+        <div class="local3" @click="delAds(item.pkId)">
+          {{ $t("ENU_CONTROL_TYPE_3") }}
+        </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ $t('w_0077') }}</div>
+      <div class="title">{{ $t("w_0077") }}</div>
     </div>
     <el-table
       :data="allData"
@@ -109,11 +193,16 @@
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
-				fontSize: '15px'
+        fontSize: '15px',
       }"
       :row-class-name="tableRowClassName"
     >
-			<el-table-column align="center" prop="waresName" width="400" :label="$t('w_0078')">
+      <el-table-column
+        align="center"
+        prop="waresName"
+        width="400"
+        :label="$t('w_0078')"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
@@ -121,7 +210,11 @@
               <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="" />
                 <div class="goods_tit_lr">
@@ -134,18 +227,34 @@
           </div>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="$t('w_0079') + '(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="$t('w_0079') + '(¥)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -157,8 +266,14 @@
       </el-table-column>
     </el-table>
     <div class="tab_b">
-			<div>{{ $t('w_0083') }}:{{ userInfo.currencyIcon }}{{ allGoodsData.priceAmount | numberToCurrency }}</div>
+      <div>
-			<div>{{ $t('w_0071') }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}</div>
+        {{ $t("w_0083") }}:{{ userInfo.currencyIcon
+        }}{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>
+        {{ $t("w_0071") }}:{{ userInfo.currencyIcon
+        }}{{ ruleForm.postage | numberToCurrency }}
+      </div>
     </div>
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
@@ -167,23 +282,46 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ $t('w_0325') }}:</div>
+            <div class="f1">{{ $t("w_0325") }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
-						<div class="f1">{{ $t('ENU_TOTAL_V_1') }}:</div>
+            <div class="f1">{{ $t("ENU_TOTAL_V_1") }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
             </div>
           </div>
-				<div class="footer_tt" v-show="ruleForm.recAddress && ruleForm.recName && ruleForm.recPhone && ruleForm.nameList">
+        </div>
-					<div class="f2 f4">{{ $t('w_0084') }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}</div>
+        <div
-					<div class="f4">{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement
-				<div class="btn" @click="submitRegister('ruleForm')">{{ $t('w_0085') }}</div>
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ $t("w_0085") }}
+        </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
@@ -193,14 +331,14 @@
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue';
+import personInfo from "@/components/personInfo.vue";
-import AddAddress from '@/components/AddAddress.vue';
+import AddAddress from "@/components/AddAddress.vue";
-import agreement from '@/components/agreement.vue';
+import agreement from "@/components/agreement.vue";
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import * as api from '@/api/register.js';
+import * as api from "@/api/register.js";
-import { setTokenMi } from '@/util/auth';
+import { setTokenMi } from "@/util/auth";
-import Pay from '@/components/Pay.vue';
+import Pay from "@/components/Pay.vue";
-import mustAgreeMent from '@/components/mustAgreeMent.vue';
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 
 export default {
   components: {
@@ -208,12 +346,12 @@ export default {
     AddAddress,
     agreement,
     Pay,
-		mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-			if (this.ruleForm.transType == '' && this.isDeliveryWay) {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-				callback(new Error(this.$t('w_0064')));
+        callback(new Error(this.$t("w_0064")));
       } else {
         callback();
       }
@@ -221,39 +359,49 @@ export default {
     return {
       waresCodeList: [],
       isPay: false,
-			paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
         dizhi: [],
-				fwzx: '',
+        fwzx: "",
-				upgradeMemberCode: '',
+        upgradeMemberCode: "",
-				upgradeMemberName: '',
+        upgradeMemberName: "",
-				postage: '',
+        postage: "",
-				recName: '',
+        recName: "",
-				recPhone: '',
+        recPhone: "",
-				recAddress: '',
+        recAddress: "",
-				deliveryWay: '',
+        deliveryWay: "",
-				transType: ''
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-						trigger: 'blur'
+            trigger: "blur",
-					}
+          },
+        ],
+        gradeName: [
+          { required: true, message: this.$t("w_0086"), trigger: "change" },
+        ],
+        upgradeMemberName: [
+          { required: true, message: this.$t("w_0060"), trigger: "change" },
+        ],
+        recName: [
+          { required: true, message: this.$t("w_0087"), trigger: "blur" },
+        ],
+        recPhone: [
+          { required: true, message: this.$t("w_0053"), trigger: "blur" },
+        ],
+        recAddress: [
+          { required: true, message: this.$t("w_0070"), trigger: "blur" },
         ],
-				gradeName: [{ required: true, message: this.$t('w_0086'), trigger: 'change' }],
-				upgradeMemberName: [{ required: true, message: this.$t('w_0060'), trigger: 'change' }],
-				recName: [{ required: true, message: this.$t('w_0087'), trigger: 'blur' }],
-				recPhone: [{ required: true, message: this.$t('w_0053'), trigger: 'blur' }],
-				recAddress: [{ required: true, message: this.$t('w_0070'), trigger: 'blur' }],
         deliveryWay: [
           {
             required: true,
-						message: this.$t('w_0062'),
+            message: this.$t("w_0062"),
-						trigger: 'change'
+            trigger: "change",
-					}
+          },
         ],
         // transType: [
         //   {
@@ -262,47 +410,47 @@ export default {
         //     trigger: 'change',
         //   },
         // ],
-				transType: [{ validator: validateRecTransType }]
+        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',
+        label: "name",
-				value: 'id',
+        value: "id",
-				children: 'children',
+        children: "children",
-				expandTrigger: 'hover'
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-			isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-			shoppingArr: '',
+      shoppingArr: "",
-			totalAmont: 0
+      totalAmont: 0,
     };
   },
   computed: {
-		...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     // // 数据源
@@ -338,11 +486,11 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-		this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'));
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
     this.getCatDetail();
     // 幂等性
-		api.generate().then(res => {
+    api.generate().then((res) => {
       setTokenMi(res.msg);
     });
     if (this.userInfo.pkSettleCountry == 1) {
@@ -354,12 +502,13 @@ export default {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-				callback(new Error(this.$t('w_0046')));
+        callback(new Error(this.$t("w_0046")));
       } else {
-				api.upgRel({
+        api
-					upgradeMemberCode: value
+          .upgRel({
+            upgradeMemberCode: value,
           })
-					.then(res => {
+          .then((res) => {
             if (res.code == 200) {
               this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
@@ -367,18 +516,20 @@ export default {
               callback();
             }
           })
-					.catch(err => {
+          .catch((err) => {
             callback(new Error(err));
           });
       }
     },
     getCatDetail() {
-			api.shoppingWaresDetail({
+      api
+        .shoppingWaresDetail({
           shoppingIds: this.shoppingArr,
-				specialArea: 11
+          specialArea: 11,
-			}).then(res => {
+        })
+        .then((res) => {
           this.allGoodsData = res.data;
-				this.waresCodeList = res.data.orderItemsParams.map(item => {
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
             return item.waresCode;
           });
           this.allGoodsData.specialArea = 11;
@@ -409,23 +560,25 @@ export default {
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-				text: 'Loading',
+        text: "Loading",
-				spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-				background: 'rgba(0, 0, 0, 0.7)'
+        background: "rgba(0, 0, 0, 0.7)",
       });
     },
     resetAll() {
-			this.ruleForm.parent = '';
+      this.ruleForm.parent = "";
-			this.ruleForm.deliveryWay = '';
+      this.ruleForm.deliveryWay = "";
-			this.ruleForm.transType = '';
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
     },
     getUserName() {
-			api.upgRel({
+      api
-				upgradeMemberCode: this.ruleForm.upgradeMemberCode
+        .upgRel({
-			}).then(res => {
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
           if (res.code == 200) {
             this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
             this.$forceUpdate();
@@ -436,8 +589,8 @@ export default {
       if (val) {
         this.isPay = false;
         this.$router.push({
-					path: '/vipCenter',
+          path: "/vipCenter",
-					query: { id: 1 }
+          query: { id: 1 },
         });
       } else {
         this.$confirm(this.$t("w_0090"), "", {
@@ -445,54 +598,55 @@ export default {
           cancelButtonText: this.$t("ENU_P_TYPE0"),
           type: "warning",
         })
-					.then(_ => {
+          .then((_) => {
             this.isPay = false;
             this.$router.push({
-							path: '/vipCenter',
+              path: "/vipCenter",
-							query: { id: 1 }
+              query: { id: 1 },
             });
           })
-					.catch(_ => {});
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
-			if (!this.agreementShow) {
+      // if (!this.agreementShow) {
-				this.$message({
+      //   this.$message({
-					message: this.$t('w_0091'),
+      //     message: this.$t("w_0091"),
-					type: 'warning'
+      //     type: "warning",
-				});
+      //   });
-				return;
+      //   return;
-			}
+      // }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-					message: this.$t('w_0092'),
+          message: this.$t("w_0092"),
-					type: 'warning'
+          type: "warning",
         });
         return;
       }
-			this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-						deleteList: deleteList
+            deleteList: deleteList,
           });
 
-					api.confirmOthOrder(obj)
+          api
-						.then(res => {
+            .confirmOthOrder(obj)
+            .then((res) => {
               this.isLoading.close();
               if (res.code == 200) {
                 this.isPay = true;
                 this.paramsPost = res.data;
               }
             })
-						.catch(err => {
+            .catch((err) => {
               this.isLoading.close();
             });
         } else {
@@ -508,14 +662,17 @@ export default {
     },
     flatten(arr) {
       return arr.reduce((result, item) => {
-				return result.concat(item, Array.isArray(item.children) ? this.flatten(item.children) : []);
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
       }, []);
     },
     setDizhi(e, val) {
       let arr = this.flatten(this.areaData);
-			let nameList = '';
+      let nameList = "";
-			arr.forEach(item => {
+      arr.forEach((item) => {
-				this.ruleForm.dizhi.forEach(ctem => {
+        this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
             nameList += item.name;
           }
@@ -524,26 +681,30 @@ export default {
       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.recCounty = this.ruleForm.dizhi[2] || "";
       this.getPostAge();
     },
     checkRadio() {
-			this.$set(this.ruleForm, 'dizhi', []);
+      this.$set(this.ruleForm, "dizhi", []);
       let arr = [];
-			this.addressList.forEach(item => {
+      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 = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
       });
-			arr = arr.filter(s => {
+      arr = arr.filter((s) => {
         return s && s.trim();
       });
 
-			this.$set(this.ruleForm, 'dizhi', arr);
+      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];
@@ -554,15 +715,17 @@ export default {
     },
     getPostAge() {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
       this.allGoodsData.deleteList = deleteList;
-			api.queryPostage(this.allGoodsData).then(res => {
+      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);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
       });
     },
     // getMember() {
@@ -576,32 +739,32 @@ export default {
     //   })
     // },
     getTransList() {
-			api.transportList().then(res => {
+      api.transportList().then((res) => {
         this.transList = res.data;
       });
     },
     getDeliveryList() {
-			api.deliveryList().then(res => {
+      api.deliveryList().then((res) => {
         this.deliList = res.data;
       });
     },
     delAds(id) {
-			this.$confirm(this.$t('w_0088') + '?', '', {
+      this.$confirm(this.$t("w_0088") + "?", "", {
-				confirmButtonText: this.$t('w_0035'),
+        confirmButtonText: this.$t("w_0035"),
-				cancelButtonText: this.$t('ENU_P_TYPE0'),
+        cancelButtonText: this.$t("ENU_P_TYPE0"),
-				type: 'warning'
+        type: "warning",
       }).then(() => {
-				api.delAddress(id).then(res => {
+        api.delAddress(id).then((res) => {
           this.$message({
-						type: 'success',
+            type: "success",
-						message: this.$t('w_0089') + '!'
+            message: this.$t("w_0089") + "!",
           });
           this.getAddressList();
         });
       });
     },
     getAllArea() {
-			api.allArea().then(res => {
+      api.allArea().then((res) => {
         this.areaData = res.data;
       });
     },
@@ -609,7 +772,7 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
-			api.addressDefault(id).then(res => {
+      api.addressDefault(id).then((res) => {
         this.getAddressList();
       });
     },
@@ -621,9 +784,9 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
-			api.addressList({}).then(res => {
+      api.addressList({}).then((res) => {
         this.addressList = res.data;
-				this.addressList.forEach(item => {
+        this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
             this.moren = item.pkId;
             this.checkRadio();
@@ -635,13 +798,13 @@ export default {
     // 斑马线
     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>
 

src/views/personal/index.vue

@@ -395,7 +395,7 @@
                 <div @click="loginPwd = 0">{{ $t("PER_DA_32") }}</div>
               </el-col>
             </el-row>
-            <el-row>
+            <!-- <el-row>
               <el-col :span="14">
                 <el-form-item :label="$t('PER_DA_33')"
                   ><el-input v-model="safty.email" disabled></el-input
@@ -404,7 +404,7 @@
               <el-col :span="10" class="righTxt">
                 <div @click="loginPwd = 3">{{ $t("PER_DA_34") }}</div>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row>
               <el-col :span="14">
                 <el-form-item :label="$t('MN_F_23')"
@@ -585,7 +585,7 @@
       </div>
     </div>
     <!-- 修改邮箱 -->
-    <div class="main_r" v-show="isClick == 2 && loginPwd == 3">
+    <!-- <div class="main_r" v-show="isClick == 2 && loginPwd == 3">
       <div class="main_rt">
         <div class="tit">{{ $t("PER_DA_43") }}</div>
         <div class="safty1">
@@ -623,7 +623,7 @@
           <div class="pwdBtn" @click="upEmailObj">{{ $t("MY_WAL_23") }}</div>
         </div>
       </div>
-    </div>
+    </div> -->
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <giftAddress ref="addAddress1" @getAdList1="getAddressList1"></giftAddress>
   </div>

src/views/register/index.vue

@@ -732,11 +732,11 @@
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-        <agreement
+        <!-- <agreement
           :isShow="agreementShow"
           ref="agree"
           @agree="agree"
-        ></agreement>
+        ></agreement> -->
         <div class="btn" @click="submitRegister('ruleForm')">
           {{ $t("w_0085") }}
         </div>
@@ -1036,7 +1036,7 @@ export default {
       ],
       allGoodsData: {},
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         // {
@@ -1121,9 +1121,7 @@ export default {
       //获取仓库
       this.getStorehouseList();
     }
-    if (this.userInfo.buyAgreementFlag == 1) {
+
-      this.agreementShow = true;
-    }
     // this.howRegiest = localStorage.getItem('howRegiest') || 0
     // 幂等性
     api.generate().then((res) => {
@@ -1400,13 +1398,6 @@ export default {
         });
       });
       this.$refs[formName].validate((valid) => {
-        if (!this.agreementShow) {
-          this.$message({
-            message: this.$t("w_0091"),
-            type: "warning",
-          });
-          return;
-        }
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {

src/views/repurchase/index.vue

@@ -10,11 +10,20 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex" v-if="specialArea==33">{{ $t("APP_ADD_28") }}</div>
+      <div class="rti dis_flex" v-if="specialArea == 33">
+        {{ $t("APP_ADD_28") }}
+      </div>
       <div class="rti dis_flex" v-else>{{ $t("w_0244") }}</div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <!-- <el-col :span="6">
           <el-form-item :label="$t('ENU_REG_AU_2')"
@@ -24,31 +33,59 @@
           </el-form-item>
         </el-col> -->
         <el-col :span="6">
-					<el-form-item v-if="specialArea == 33" :label="$t('APP_ADD_29')" prop="upgradeMemberCode">
+          <el-form-item
-						<el-input v-model="ruleForm.upgradeMemberCode" :disabled="toShow"
+            v-if="specialArea == 33"
-							:placeholder="$t('APP_ADD_29')"></el-input>
+            :label="$t('APP_ADD_29')"
+            prop="upgradeMemberCode"
+          >
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :disabled="toShow"
+              :placeholder="$t('APP_ADD_29')"
+            ></el-input>
           </el-form-item>
           <el-form-item v-else :label="$t('w_0245')" prop="upgradeMemberCode">
-						<el-input v-model="ruleForm.upgradeMemberCode" :disabled="toShow"
+            <el-input
-							:placeholder="$t('w_0280')"></el-input>
+              v-model="ruleForm.upgradeMemberCode"
+              :disabled="toShow"
+              :placeholder="$t('w_0280')"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-					<el-form-item v-if="specialArea == 33" :label="$t('APP_ADD_30')" prop="upgradeMemberName">
+          <el-form-item
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('APP_ADD_30')"
+            v-if="specialArea == 33"
-							disabled></el-input>
+            :label="$t('APP_ADD_30')"
+            prop="upgradeMemberName"
+          >
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('APP_ADD_30')"
+              disabled
+            ></el-input>
           </el-form-item>
           <el-form-item v-else :label="$t('w_0246')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0281')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0281')"
+              disabled
+            ></el-input>
           </el-form-item>
-
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery"
+            <el-select
-							:disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+              v-model="ruleForm.deliveryWay"
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label"
+              @change="selDelivery"
-								:value="item.value"></el-option>
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -59,7 +96,10 @@
 						</el-select>
 					</el-form-item>
 				</el-col> -->
-				<el-col :span="6" v-if="userInfo.pkSettleCountry != 1 && ruleForm.deliveryWay != 2">
+        <el-col
+          :span="6"
+          v-if="userInfo.pkSettleCountry != 1 && ruleForm.deliveryWay != 2"
+        >
           <!-- <el-form-item :label="$t('w_0100')" prop="pkMemberStore">
             <el-select
               filterable
@@ -76,11 +116,19 @@
           </el-form-item> -->
           <div @click="handleInputClick">
             <el-form-item :label="$t('w_0100')" prop="selectedStoreName">
-							<el-input v-model="ruleForm.selectedStoreName" :placeholder="$t('w_0101')"
+              <el-input
-								readonly></el-input>
+                v-model="ruleForm.selectedStoreName"
+                :placeholder="$t('w_0101')"
+                readonly
+              ></el-input>
             </el-form-item>
           </div>
-					<el-dialog :title="$t('w_0100')" :visible.sync="dialogVisible" width="80%" class="titles-dialog">
+          <el-dialog
+            :title="$t('w_0100')"
+            :visible.sync="dialogVisible"
+            width="80%"
+            class="titles-dialog"
+          >
             <div class="topbox">
               <el-form label-width="80px" :model="queryParams" inline>
                 <el-row>
@@ -91,13 +139,20 @@
                   </el-col>
                   <el-col :span="6">
                     <el-form-item :label="$t('S_C_27')" class="dizhi">
-											<el-cascader clearable v-model="queryParams.address" :options="areaData"
+                      <el-cascader
-												:props="regionParams" @change="handleChange1"></el-cascader>
+                        clearable
+                        v-model="queryParams.address"
+                        :options="areaData"
+                        :props="regionParams"
+                        @change="handleChange1"
+                      ></el-cascader>
                     </el-form-item>
                   </el-col>
                   <el-col :span="4">
-										<div class="searchbox"
+                    <div
-											:style="userInfo.pkCountry == 1 ? 'margin-left:10px' : ''">
+                      class="searchbox"
+                      :style="userInfo.pkCountry == 1 ? 'margin-left:10px' : ''"
+                    >
                       <el-button class="btn2" @click="research">{{
                         $t("N_I_183")
                       }}</el-button>
@@ -110,17 +165,41 @@
               </el-form>
             </div>
             <div>
-							<el-table :data="storeLists" @row-click="handleRowClick" highlight-current-row
+              <el-table
-								style="width: 100%">
+                :data="storeLists"
-								<el-table-column prop="storeName" :label="$t('MN_F_T_1207')"></el-table-column>
+                @row-click="handleRowClick"
-								<el-table-column prop="storeCode" :label="$t('MN_F_T_1206')"></el-table-column>
+                highlight-current-row
-								<el-table-column prop="storePerson" :label="$t('S_C_86')"></el-table-column>
+                style="width: 100%"
-								<el-table-column prop="storePhone" :label="$t('w_0052')"></el-table-column>
+              >
-								<el-table-column prop="address" :label="$t('S_C_27')"></el-table-column>
+                <el-table-column
+                  prop="storeName"
+                  :label="$t('MN_F_T_1207')"
+                ></el-table-column>
+                <el-table-column
+                  prop="storeCode"
+                  :label="$t('MN_F_T_1206')"
+                ></el-table-column>
+                <el-table-column
+                  prop="storePerson"
+                  :label="$t('S_C_86')"
+                ></el-table-column>
+                <el-table-column
+                  prop="storePhone"
+                  :label="$t('w_0052')"
+                ></el-table-column>
+                <el-table-column
+                  prop="address"
+                  :label="$t('S_C_27')"
+                ></el-table-column>
               </el-table>
             </div>
-						<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            <pagination
-							:limit.sync="queryParams.pageSize" @pagination="getStoreLists" />
+              v-show="total > 0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getStoreLists"
+            />
             <div slot="footer">
               <el-button @click="dialogVisible = false">{{
                 $t("MY_ORD_24")
@@ -174,23 +253,39 @@
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" prop="recName"><el-input v-model="ruleForm.recName"
+            <el-form-item :label="$t('MY_ORD_10')" prop="recName"
-								:placeholder="$t('w_0067')"></el-input></el-form-item>
+              ><el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" prop="recPhone"><el-input v-model="ruleForm.recPhone"
+            <el-form-item :label="$t('w_0052')" prop="recPhone"
-								:placeholder="$t('w_0053')"></el-input></el-form-item>
+              ><el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('w_0068')" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData"
+              <el-cascader
-								:props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('S_C_27')" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200"
+              <el-input
-								:placeholder="$t('w_0070')"></el-input>
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -199,8 +294,12 @@
 						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
 					</el-col> -->
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark"
+            <el-form-item :label="$t('MY_WAL_22')"
-								:placeholder="$t('w_0072')"></el-input></el-form-item>
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
@@ -209,15 +308,28 @@
       <div class="title">{{ $t("w_0073") }}</div>
     </div>
     <div class="local" v-if="isDeliveryWay">
-			<div :class="['local_i', item.pkId == moren ? 'local_a' : '']" v-for="item in addressList" :key="item.pkId">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{ }}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
+        v-for="item in addressList"
+        :key="item.pkId"
+      >
+        <el-radio
+          v-model="moren"
+          @input="checkRadio"
+          :label="item.pkId"
+          >{{
+        }}</el-radio>
         <div class="local1">
           {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
         </div>
         <div class="local2" v-show="item.isDefault == 1">
           {{ $t("w_0074") }}
         </div>
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
           {{ $t("w_0075") }}
         </div>
         <div class="local2" @click="changeAds(item.pkId)">
@@ -232,14 +344,25 @@
     <div class="nox">
       <div class="title">{{ $t("w_0077") }}</div>
     </div>
-		<el-table :data="allData" :row-style="{ height: '60px', fontSize: '15px', color: '#333333' }"
+    <el-table
-			:cell-style="{ padding: '0' }" :fit="true" :header-cell-style="{
+      :data="allData"
+      :row-style="{ height: '60px', fontSize: '15px', color: '#333333' }"
+      :cell-style="{ padding: '0' }"
+      :fit="true"
+      :header-cell-style="{
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
         fontSize: '15px',
-      }" :row-class-name="tableRowClassName">
+      }"
-			<el-table-column align="center" prop="waresName" width="400" :label="$t('w_0078')">
+      :row-class-name="tableRowClassName"
+    >
+      <el-table-column
+        align="center"
+        prop="waresName"
+        width="400"
+        :label="$t('w_0078')"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
@@ -247,8 +370,11 @@
               <img :src="scope.row.cover1" alt="" />
               <div>{{ scope.row.waresName }}</div>
             </div>
-						<div class="goods_tit" v-for="item in scope.row.waresItemsParamList"
+            <div
-							:key="item.pkWaresSpecsSku">
+              class="goods_tit"
+              v-for="item in scope.row.waresItemsParamList"
+              :key="item.pkWaresSpecsSku"
+            >
               <div class="goods_tit_l">
                 <img :src="item.specCover" alt="" />
                 <div class="goods_tit_lr">
@@ -266,13 +392,27 @@
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'" v-if="specialArea !=30">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+        v-if="specialArea != 30"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'" v-if="specialArea !=30">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+        v-if="specialArea != 30"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -312,12 +452,15 @@
             </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">
             {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
           </div>
@@ -329,7 +472,7 @@
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement> -->
         <div class="btn" @click="submitRegister('ruleForm')">
           {{ $t("w_0085") }}
         </div>
@@ -345,17 +488,11 @@
 import personInfo from "@/components/personInfo.vue";
 import AddAddress from "@/components/AddAddress.vue";
 import agreement from "@/components/agreement.vue";
-	import {
+import { mapGetters } from "vuex";
-		mapGetters
-	} from "vuex";
 import * as api from "@/api/register.js";
-	import {
+import { setTokenMi } from "@/util/auth";
-		setTokenMi
-	} from "@/util/auth";
 import Pay from "@/components/Pay.vue";
-	import {
+import { Loading } from "element-ui";
-		Loading
-	} from 'element-ui';
 import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
   components: {
@@ -405,56 +542,76 @@
         selectedStoreName: "",
       },
       rules: {
-					upgradeMemberCode: [{
+        upgradeMemberCode: [
+          {
             required: true,
             validator: this.upgradeMemberCodePass,
             trigger: "blur",
-					}, ],
+          },
-					fwzx: [{
+        ],
+        fwzx: [
+          {
             required: true,
             message: "请输入活动名称",
             trigger: "change",
-					}, ],
+          },
-					gradeName: [{
+        ],
+        gradeName: [
+          {
             required: true,
             message: this.$t("w_0086"),
             trigger: "change",
-					}, ],
+          },
-					upgradeMemberName: [{
+        ],
+        upgradeMemberName: [
+          {
             required: true,
             message: this.$t("w_0097"),
             trigger: "blur",
-					}, ],
+          },
-					recName: [{
+        ],
+        recName: [
+          {
             required: true,
             message: this.$t("w_0087"),
             trigger: "blur",
-					}, ],
+          },
-					recPhone: [{
+        ],
+        recPhone: [
+          {
             required: true,
             message: this.$t("w_0053"),
             trigger: "blur",
-					}, ],
+          },
-					recAddress: [{
+        ],
+        recAddress: [
+          {
             required: true,
             message: this.$t("w_0070"),
             trigger: "blur",
-					}, ],
+          },
-					deliveryWay: [{
+        ],
+        deliveryWay: [
+          {
             required: true,
             message: this.$t("w_0062"),
             trigger: "change",
-					}, ],
+          },
-					pkMemberStore: [{
+        ],
+        pkMemberStore: [
+          {
             required: true,
             message: this.$t("w_0101"),
             trigger: "change",
-					}, ],
+          },
-					selectedStoreName: [{
+        ],
+        selectedStoreName: [
+          {
             required: true,
             message: this.$t("w_0101"),
             trigger: "change",
-					}, ],
+          },
+        ],
         // transType: [
         //   {
         //     required: true,
@@ -462,17 +619,20 @@
         //     trigger: 'change',
         //   },
         // ],
-					transType: [{
+        transType: [
+          {
             validator: validateRecTransType,
-					}, ],
+          },
+        ],
       },
       addressList: [],
       moren: "",
       allGoodsData: [],
       allData: [],
-				agreementShow: false,
+      agreementShow: true,
       countryList: [],
-				transList: [{
+      transList: [
+        {
           value: 1,
           label: "陆运",
         },
@@ -578,9 +738,6 @@
       this.ruleForm.transType = 1;
       this.ruleForm.deliveryWay = 1;
     }
-			if (this.userInfo.buyAgreementFlag == 1) {
-				this.agreementShow = true
-			}
   },
   methods: {
     handleSizeChange(val) {
@@ -601,11 +758,13 @@
     },
     handleRowClick(row) {
       if (row.address && row.storeCode) {
-					this.ruleForm.selectedStoreName = row.storeName + '(' + row.storeCode + ')';
+        this.ruleForm.selectedStoreName =
+          row.storeName + "(" + row.storeCode + ")";
         this.ruleForm.pkMemberStore = row.pkId;
       } else {
-					row.storeCode == null ? this.$message.warning(this.$t("该店铺未设置编号")) : this.$message.warning(this.$t(
+        row.storeCode == null
-						"该店铺未设置地址"));
+          ? this.$message.warning(this.$t("该店铺未设置编号"))
+          : this.$message.warning(this.$t("该店铺未设置地址"));
       }
       this.selectedStoreId = row.pkId;
     },
@@ -620,33 +779,30 @@
     research() {
       const loading = Loading.service({
         lock: true,
-					text: 'Loading',
+        text: "Loading",
-					background: 'rgba(0, 0, 0, 0.7)',
+        background: "rgba(0, 0, 0, 0.7)",
-				})
+      });
       setTimeout(() => {
-					loading.close()
+        loading.close();
-					this.getStoreLists()
+        this.getStoreLists();
-				}, 1000)
+      }, 1000);
     },
     reChongzhi() {
       this.queryParams = {
         pageNum: 1,
         pageSize: 50,
-
       };
       this.queryParams.province = "";
       this.queryParams.city = "";
       this.queryParams.address = "";
-				this.getStoreLists()
+      this.getStoreLists();
     },
     getStoreLists() {
       this.queryParams.pkCountry = this.pkCountry;
       // this.queryParams.province = this.areaData.address[0];
       // this.queryParams.city = this.areaData.address[1];
       // delete this.queryParams.address;
-				api
+      api.storeLists(this.queryParams).then((res) => {
-					.storeLists(this.queryParams)
-					.then((res) => {
         this.storeLists = res.rows;
         this.total = res.total;
       });
@@ -799,13 +955,7 @@
           shoppingId: item,
         });
       });
-				if (!this.agreementShow) {
+
-					this.$message({
-						message: this.$t("w_0091"),
-						type: "warning",
-					});
-					return;
-				}
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
           message: this.$t("w_0092"),
@@ -977,10 +1127,7 @@
       });
     },
     // 斑马线
-			tableRowClassName({
+    tableRowClassName({ row, rowIndex }) {
-				row,
-				rowIndex
-			}) {
       if (rowIndex % 2 == 0) {
         return "warning-row";
       } else if (rowIndex % 2 == 1) {

src/views/rescission/index.vue

@@ -9,10 +9,17 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex">{{ $t('w_0282') }}</div>
+      <div class="rti dis_flex">{{ $t("w_0282") }}</div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <!-- <el-col :span="6">
           <el-form-item :label="$t('ENU_REG_AU_2')"
@@ -24,19 +31,37 @@
         <el-col :span="6">
           <el-form-item :label="$t('N_I_124')" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-						<el-input v-model="ruleForm.upgradeMemberCode" disabled :placeholder="$t('w_0046')"></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              disabled
+              :placeholder="$t('w_0046')"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('CK_KS_14')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0060')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0060')"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery" :disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+            <el-select
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -51,53 +76,100 @@
       <!-- 收货人信息 -->
       <div v-show="isDeliveryWay">
         <div class="xian">
-					<div class="title">{{ $t('w_0065') }}</div>
+          <div class="title">{{ $t("w_0065") }}</div>
-					<div class="lan" @click="openAddress">{{ $t('w_0066') }}</div>
+          <div class="lan" @click="openAddress">{{ $t("w_0066") }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" prop="recName"><el-input v-model="ruleForm.recName" :placeholder="$t('w_0067')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_ORD_10')" prop="recName"
+              ><el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" prop="recPhone"><el-input v-model="ruleForm.recPhone" :placeholder="$t('w_0053')"></el-input></el-form-item>
+            <el-form-item :label="$t('w_0052')" prop="recPhone"
+              ><el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('w_0068')" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData" :props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+              <el-cascader
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('S_C_27')" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200" :placeholder="$t('w_0070')"></el-input>
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
+            <el-form-item :label="$t('w_0071')"
+              ><el-input v-model="ruleForm.postage" disabled></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark" :placeholder="$t('w_0072')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_WAL_22')"
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox">
-			<div class="title">{{ $t('w_0073') }}</div>
+      <div class="title">{{ $t("w_0073") }}</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">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{}}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
-				<div class="local1">{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)</div>
+        v-for="item in addressList"
-				<div class="local2" v-show="item.isDefault == 1">{{ $t('w_0074') }}</div>
+        :key="item.pkId"
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">{{ $t('w_0075') }}</div>
+      >
-				<div class="local2" @click="changeAds(item.pkId)">{{ $t('w_0076') }}</div>
+        <el-radio v-model="moren" @input="checkRadio" :label="item.pkId"
-				<div class="local3" @click="delAds(item.pkId)">{{ $t('ENU_CONTROL_TYPE_3') }}</div>
+          >{{}}</el-radio
+        >
+        <div class="local1">
+          {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
+        </div>
+        <div class="local2" v-show="item.isDefault == 1">
+          {{ $t("w_0074") }}
+        </div>
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ $t("w_0075") }}
+        </div>
+        <div class="local2" @click="changeAds(item.pkId)">
+          {{ $t("w_0076") }}
+        </div>
+        <div class="local3" @click="delAds(item.pkId)">
+          {{ $t("ENU_CONTROL_TYPE_3") }}
+        </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ $t('w_0077') }}</div>
+      <div class="title">{{ $t("w_0077") }}</div>
     </div>
     <el-table
       :data="allData"
@@ -108,7 +180,7 @@
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
-				fontSize: '15px'
+        fontSize: '15px',
       }"
       :row-class-name="tableRowClassName"
     >
@@ -120,7 +192,11 @@
               <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="" />
                 <div class="goods_tit_lr">
@@ -133,18 +209,34 @@
           </div>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="$t('w_0079') + '(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="$t('w_0079') + '(¥)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -156,8 +248,10 @@
       </el-table-column>
     </el-table>
     <div class="tab_b">
-			<div>{{ $t('w_0083') }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}</div>
+      <div>
-			<div>{{ $t('w_0071') }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
+        {{ $t("w_0083") }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>{{ $t("w_0071") }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
     </div>
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
@@ -166,23 +260,46 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ $t('w_0325') }}:</div>
+            <div class="f1">{{ $t("w_0325") }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
-						<div class="f1">{{ $t('ENU_TOTAL_V_1') }}:</div>
+            <div class="f1">{{ $t("ENU_TOTAL_V_1") }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
             </div>
           </div>
-				<div class="footer_tt" v-show="ruleForm.recAddress && ruleForm.recName && ruleForm.recPhone && ruleForm.nameList">
+        </div>
-					<div class="f2 f4">{{ $t('w_0084') }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}</div>
+        <div
-					<div class="f4">{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement
-				<div class="btn" @click="submitRegister('ruleForm')">{{ $t('w_0085') }}</div>
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ $t("w_0085") }}
+        </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
@@ -192,26 +309,26 @@
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue';
+import personInfo from "@/components/personInfo.vue";
-import AddAddress from '@/components/AddAddress.vue';
+import AddAddress from "@/components/AddAddress.vue";
-import agreement from '@/components/agreement.vue';
+import agreement from "@/components/agreement.vue";
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import * as api from '@/api/register.js';
+import * as api from "@/api/register.js";
-import { setTokenMi } from '@/util/auth';
+import { setTokenMi } from "@/util/auth";
-import Pay from '@/components/Pay.vue';
+import Pay from "@/components/Pay.vue";
-import mustAgreeMent from '@/components/mustAgreeMent.vue';
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
   components: {
     personInfo,
     AddAddress,
     agreement,
     Pay,
-		mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-			if (this.ruleForm.transType == '' && this.isDeliveryWay) {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-				callback(new Error(this.$t('w_0064')));
+        callback(new Error(this.$t("w_0064")));
       } else {
         callback();
       }
@@ -219,39 +336,49 @@ export default {
     return {
       waresCodeList: [],
       isPay: false,
-			paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
         dizhi: [],
-				fwzx: '',
+        fwzx: "",
-				upgradeMemberCode: '',
+        upgradeMemberCode: "",
-				upgradeMemberName: '',
+        upgradeMemberName: "",
-				postage: '',
+        postage: "",
-				recName: '',
+        recName: "",
-				recPhone: '',
+        recPhone: "",
-				recAddress: '',
+        recAddress: "",
-				deliveryWay: '',
+        deliveryWay: "",
-				transType: ''
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-						trigger: 'blur'
+            trigger: "blur",
-					}
+          },
+        ],
+        gradeName: [
+          { required: true, message: this.$t("w_0086"), trigger: "change" },
+        ],
+        upgradeMemberName: [
+          { required: true, message: this.$t("w_0060"), trigger: "change" },
+        ],
+        recName: [
+          { required: true, message: this.$t("w_0087"), trigger: "blur" },
+        ],
+        recPhone: [
+          { required: true, message: this.$t("w_0053"), trigger: "blur" },
+        ],
+        recAddress: [
+          { required: true, message: this.$t("w_0070"), trigger: "blur" },
         ],
-				gradeName: [{ required: true, message: this.$t('w_0086'), trigger: 'change' }],
-				upgradeMemberName: [{ required: true, message: this.$t('w_0060'), trigger: 'change' }],
-				recName: [{ required: true, message: this.$t('w_0087'), trigger: 'blur' }],
-				recPhone: [{ required: true, message: this.$t('w_0053'), trigger: 'blur' }],
-				recAddress: [{ required: true, message: this.$t('w_0070'), trigger: 'blur' }],
         deliveryWay: [
           {
             required: true,
-						message: this.$t('w_0062'),
+            message: this.$t("w_0062"),
-						trigger: 'change'
+            trigger: "change",
-					}
+          },
         ],
         // transType: [
         //   {
@@ -260,47 +387,47 @@ export default {
         //     trigger: 'change',
         //   },
         // ],
-				transType: [{ validator: validateRecTransType }]
+        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',
+        label: "name",
-				value: 'id',
+        value: "id",
-				children: 'children',
+        children: "children",
-				expandTrigger: 'hover'
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-			isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-			shoppingArr: '',
+      shoppingArr: "",
-			totalAmont: 0
+      totalAmont: 0,
     };
   },
   computed: {
-		...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     // // 数据源
@@ -336,11 +463,11 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-		this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'));
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
     this.getCatDetail();
     // 幂等性
-		api.generate().then(res => {
+    api.generate().then((res) => {
       setTokenMi(res.msg);
     });
     if (this.userInfo.pkSettleCountry == 1) {
@@ -352,12 +479,13 @@ export default {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-				callback(new Error(this.$t('w_0046')));
+        callback(new Error(this.$t("w_0046")));
       } else {
-				api.upgRel({
+        api
-					upgradeMemberCode: value
+          .upgRel({
+            upgradeMemberCode: value,
           })
-					.then(res => {
+          .then((res) => {
             if (res.code == 200) {
               this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
@@ -365,16 +493,16 @@ export default {
               callback();
             }
           })
-					.catch(err => {
+          .catch((err) => {
             callback(new Error(err));
           });
       }
     },
     setDizhi(e, val) {
       let arr = this.flatten(this.areaData);
-			let nameList = '';
+      let nameList = "";
-			arr.forEach(item => {
+      arr.forEach((item) => {
-				this.ruleForm.dizhi.forEach(ctem => {
+        this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
             nameList += item.name;
           }
@@ -383,16 +511,18 @@ export default {
       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.recCounty = this.ruleForm.dizhi[2] || "";
       this.getPostAge();
     },
     getCatDetail() {
-			api.shoppingWaresDetail({
+      api
+        .shoppingWaresDetail({
           shoppingIds: this.shoppingArr,
-				specialArea: 10
+          specialArea: 10,
-			}).then(res => {
+        })
+        .then((res) => {
           this.allGoodsData = res.data;
-				this.waresCodeList = res.data.orderItemsParams.map(item => {
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
             return item.waresCode;
           });
           this.allGoodsData.specialArea = 10;
@@ -423,23 +553,25 @@ export default {
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-				text: 'Loading',
+        text: "Loading",
-				spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-				background: 'rgba(0, 0, 0, 0.7)'
+        background: "rgba(0, 0, 0, 0.7)",
       });
     },
     resetAll() {
-			this.ruleForm.parent = '';
+      this.ruleForm.parent = "";
-			this.ruleForm.deliveryWay = '';
+      this.ruleForm.deliveryWay = "";
-			this.ruleForm.transType = '';
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
     },
     getUserName() {
-			api.upgRel({
+      api
-				upgradeMemberCode: this.ruleForm.upgradeMemberCode
+        .upgRel({
-			}).then(res => {
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
           if (res.code == 200) {
             this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
             this.$forceUpdate();
@@ -450,8 +582,8 @@ export default {
       if (val) {
         this.isPay = false;
         this.$router.push({
-					path: '/vipCenter',
+          path: "/vipCenter",
-					query: { id: 1 }
+          query: { id: 1 },
         });
       } else {
         this.$confirm(this.$t("w_0090"), "", {
@@ -459,54 +591,49 @@ export default {
           cancelButtonText: this.$t("ENU_P_TYPE0"),
           type: "warning",
         })
-					.then(_ => {
+          .then((_) => {
             this.isPay = false;
             this.$router.push({
-							path: '/vipCenter',
+              path: "/vipCenter",
-							query: { id: 1 }
+              query: { id: 1 },
             });
           })
-					.catch(_ => {});
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
-			if (!this.agreementShow) {
+
-				this.$message({
-					message: this.$t('w_0091'),
-					type: 'warning'
-				});
-				return;
-			}
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-					message: this.$t('w_0092'),
+          message: this.$t("w_0092"),
-					type: 'warning'
+          type: "warning",
         });
         return;
       }
-			this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-						deleteList: deleteList
+            deleteList: deleteList,
           });
 
-					api.confirmOthOrder(obj)
+          api
-						.then(res => {
+            .confirmOthOrder(obj)
+            .then((res) => {
               this.isLoading.close();
               if (res.code == 200) {
                 this.isPay = true;
                 this.paramsPost = res.data;
               }
             })
-						.catch(err => {
+            .catch((err) => {
               this.isLoading.close();
             });
         } else {
@@ -522,26 +649,33 @@ export default {
     },
     flatten(arr) {
       return arr.reduce((result, item) => {
-				return result.concat(item, Array.isArray(item.children) ? this.flatten(item.children) : []);
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
       }, []);
     },
     checkRadio() {
-			this.$set(this.ruleForm, 'dizhi', []);
+      this.$set(this.ruleForm, "dizhi", []);
       let arr = [];
-			this.addressList.forEach(item => {
+      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 = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
       });
-			arr = arr.filter(s => {
+      arr = arr.filter((s) => {
         return s && s.trim();
       });
 
-			this.$set(this.ruleForm, 'dizhi', arr);
+      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];
@@ -552,15 +686,17 @@ export default {
     },
     getPostAge() {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
       this.allGoodsData.deleteList = deleteList;
-			api.queryPostage(this.allGoodsData).then(res => {
+      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);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
       });
     },
     // getMember() {
@@ -574,32 +710,32 @@ export default {
     //   })
     // },
     getTransList() {
-			api.transportList().then(res => {
+      api.transportList().then((res) => {
         this.transList = res.data;
       });
     },
     getDeliveryList() {
-			api.deliveryList().then(res => {
+      api.deliveryList().then((res) => {
         this.deliList = res.data;
       });
     },
     delAds(id) {
-			this.$confirm(this.$t('w_0088') + '?', '', {
+      this.$confirm(this.$t("w_0088") + "?", "", {
-				confirmButtonText: this.$t('w_0035'),
+        confirmButtonText: this.$t("w_0035"),
-				cancelButtonText: this.$t('ENU_P_TYPE0'),
+        cancelButtonText: this.$t("ENU_P_TYPE0"),
-				type: 'warning'
+        type: "warning",
       }).then(() => {
-				api.delAddress(id).then(res => {
+        api.delAddress(id).then((res) => {
           this.$message({
-						type: 'success',
+            type: "success",
-						message: this.$t('w_0089') + '!'
+            message: this.$t("w_0089") + "!",
           });
           this.getAddressList();
         });
       });
     },
     getAllArea() {
-			api.allArea().then(res => {
+      api.allArea().then((res) => {
         this.areaData = res.data;
       });
     },
@@ -607,7 +743,7 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
-			api.addressDefault(id).then(res => {
+      api.addressDefault(id).then((res) => {
         this.getAddressList();
       });
     },
@@ -619,9 +755,9 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
-			api.addressList({}).then(res => {
+      api.addressList({}).then((res) => {
         this.addressList = res.data;
-				this.addressList.forEach(item => {
+        this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
             this.moren = item.pkId;
             this.checkRadio();
@@ -633,13 +769,13 @@ export default {
     // 斑马线
     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>
 

src/views/spaceRegister/index.vue

@@ -9,10 +9,17 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex">{{ $t('MN_F_T_8') }}</div>
+      <div class="rti dis_flex">{{ $t("MN_F_T_8") }}</div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <!-- <el-col :span="6">
           <el-form-item :label="$t('ENU_REG_AU_2')"
@@ -24,19 +31,37 @@
         <el-col :span="6">
           <el-form-item :label="$t('N_I_124')" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-						<el-input :disabled="true" v-model="ruleForm.upgradeMemberCode" :placeholder="$t('w_0046')"></el-input>
+            <el-input
+              :disabled="true"
+              v-model="ruleForm.upgradeMemberCode"
+              :placeholder="$t('w_0046')"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('CK_KS_14')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0060')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0060')"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery" :disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+            <el-select
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -51,53 +76,100 @@
       <!-- 收货人信息 -->
       <div v-show="isDeliveryWay">
         <div class="xian">
-					<div class="title">{{ $t('w_0065') }}</div>
+          <div class="title">{{ $t("w_0065") }}</div>
-					<div class="lan" @click="openAddress">{{ $t('w_0066') }}</div>
+          <div class="lan" @click="openAddress">{{ $t("w_0066") }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" prop="recName"><el-input v-model="ruleForm.recName" :placeholder="$t('w_0067')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_ORD_10')" prop="recName"
+              ><el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" prop="recPhone"><el-input v-model="ruleForm.recPhone" :placeholder="$t('w_0053')"></el-input></el-form-item>
+            <el-form-item :label="$t('w_0052')" prop="recPhone"
+              ><el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('w_0068')" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData" :props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+              <el-cascader
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('S_C_27')" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200" :placeholder="$t('w_0070')"></el-input>
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
+            <el-form-item :label="$t('w_0071')"
+              ><el-input v-model="ruleForm.postage" disabled></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark" :placeholder="$t('w_0072')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_WAL_22')"
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox">
-			<div class="title">{{ $t('w_0073') }}</div>
+      <div class="title">{{ $t("w_0073") }}</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">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{}}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
-				<div class="local1">{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)</div>
+        v-for="item in addressList"
-				<div class="local2" v-show="item.isDefault == 1">{{ $t('w_0074') }}</div>
+        :key="item.pkId"
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">{{ $t('w_0075') }}</div>
+      >
-				<div class="local2" @click="changeAds(item.pkId)">{{ $t('w_0076') }}</div>
+        <el-radio v-model="moren" @input="checkRadio" :label="item.pkId"
-				<div class="local3" @click="delAds(item.pkId)">{{ $t('ENU_CONTROL_TYPE_3') }}</div>
+          >{{}}</el-radio
+        >
+        <div class="local1">
+          {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
+        </div>
+        <div class="local2" v-show="item.isDefault == 1">
+          {{ $t("w_0074") }}
+        </div>
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ $t("w_0075") }}
+        </div>
+        <div class="local2" @click="changeAds(item.pkId)">
+          {{ $t("w_0076") }}
+        </div>
+        <div class="local3" @click="delAds(item.pkId)">
+          {{ $t("ENU_CONTROL_TYPE_3") }}
+        </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ $t('w_0077') }}</div>
+      <div class="title">{{ $t("w_0077") }}</div>
     </div>
     <el-table
       :data="allData"
@@ -108,7 +180,7 @@
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
-				fontSize: '15px'
+        fontSize: '15px',
       }"
       :row-class-name="tableRowClassName"
     >
@@ -120,7 +192,11 @@
               <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="" />
                 <div class="goods_tit_lr">
@@ -133,18 +209,34 @@
           </div>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="$t('w_0079') + '(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="$t('w_0079') + '(¥)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -156,8 +248,10 @@
       </el-table-column>
     </el-table>
     <div class="tab_b">
-			<div>{{ $t('w_0083') }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}</div>
+      <div>
-			<div>{{ $t('w_0071') }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
+        {{ $t("w_0083") }}:¥{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>{{ $t("w_0071") }}:¥{{ ruleForm.postage | numberToCurrency }}</div>
     </div>
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
@@ -166,23 +260,42 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ $t('w_0325') }}:</div>
+            <div class="f1">{{ $t("w_0325") }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
-						<div class="f1">{{ $t('ENU_TOTAL_V_1') }}:</div>
+            <div class="f1">{{ $t("ENU_TOTAL_V_1") }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
             </div>
           </div>
-				<div class="footer_tt" v-show="ruleForm.recAddress && ruleForm.recName && ruleForm.recPhone && ruleForm.nameList">
+        </div>
-					<div class="f2 f4">{{ $t('w_0084') }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}</div>
+        <div
-					<div class="f4">{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement> -->
-				<div class="btn" @click="submitRegister('ruleForm')">{{ $t('w_0085') }}</div>
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ $t("w_0085") }}
+        </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
@@ -192,26 +305,26 @@
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue';
+import personInfo from "@/components/personInfo.vue";
-import AddAddress from '@/components/AddAddress.vue';
+import AddAddress from "@/components/AddAddress.vue";
-import agreement from '@/components/agreement.vue';
+import agreement from "@/components/agreement.vue";
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import * as api from '@/api/register.js';
+import * as api from "@/api/register.js";
-import { setTokenMi } from '@/util/auth';
+import { setTokenMi } from "@/util/auth";
-import Pay from '@/components/Pay.vue';
+import Pay from "@/components/Pay.vue";
-import mustAgreeMent from '@/components/mustAgreeMent.vue';
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
   components: {
     personInfo,
     AddAddress,
     agreement,
     Pay,
-		mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-			if (this.ruleForm.transType == '' && this.isDeliveryWay) {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-				callback(new Error(this.$t('w_0064')));
+        callback(new Error(this.$t("w_0064")));
       } else {
         callback();
       }
@@ -219,40 +332,52 @@ export default {
     return {
       waresCodeList: [],
       isPay: false,
-			paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
-				upgradeMemberCode: '',
+        upgradeMemberCode: "",
         dizhi: [],
-				fwzx: '',
+        fwzx: "",
-				upgradeMemberName: '',
+        upgradeMemberName: "",
-				postage: '',
+        postage: "",
-				recName: '',
+        recName: "",
-				recPhone: '',
+        recPhone: "",
-				recAddress: '',
+        recAddress: "",
-				deliveryWay: '',
+        deliveryWay: "",
-				transType: ''
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-						trigger: 'blur'
+            trigger: "blur",
-					}
+          },
+        ],
+        fwzx: [
+          { required: true, message: "请输入活动名称", trigger: "change" },
+        ],
+        gradeName: [
+          { required: true, message: this.$t("w_0086"), trigger: "change" },
+        ],
+        upgradeMemberName: [
+          { required: true, message: this.$t("w_0097"), trigger: "blur" },
+        ],
+        recName: [
+          { required: true, message: this.$t("w_0087"), trigger: "blur" },
+        ],
+        recPhone: [
+          { required: true, message: this.$t("w_0053"), trigger: "blur" },
+        ],
+        recAddress: [
+          { required: true, message: this.$t("w_0070"), trigger: "blur" },
         ],
-				fwzx: [{ required: true, message: '请输入活动名称', trigger: 'change' }],
-				gradeName: [{ required: true, message: this.$t('w_0086'), trigger: 'change' }],
-				upgradeMemberName: [{ required: true, message: this.$t('w_0097'), trigger: 'blur' }],
-				recName: [{ required: true, message: this.$t('w_0087'), trigger: 'blur' }],
-				recPhone: [{ required: true, message: this.$t('w_0053'), trigger: 'blur' }],
-				recAddress: [{ required: true, message: this.$t('w_0070'), trigger: 'blur' }],
         deliveryWay: [
           {
             required: true,
-						message: this.$t('w_0062'),
+            message: this.$t("w_0062"),
-						trigger: 'change'
+            trigger: "change",
-					}
+          },
         ],
         // transType: [
         //   {
@@ -261,48 +386,48 @@ export default {
         //     trigger: 'change',
         //   },
         // ],
-				transType: [{ validator: validateRecTransType }]
+        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',
+        label: "name",
-				value: 'id',
+        value: "id",
-				children: 'children',
+        children: "children",
-				expandTrigger: 'hover'
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-			isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-			shoppingArr: '',
+      shoppingArr: "",
       totalAmont: 0,
-			specialArea: 18
+      specialArea: 18,
     };
   },
   computed: {
-		...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     // // 数据源
@@ -337,12 +462,12 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-		this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'));
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     this.specialArea = this.$route.query.specialArea;
     // 获取购物车详情
     this.getCatDetail();
     // 幂等性
-		api.generate().then(res => {
+    api.generate().then((res) => {
       setTokenMi(res.msg);
     });
     if (this.userInfo.pkSettleCountry == 1) {
@@ -354,12 +479,13 @@ export default {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-				callback(new Error(this.$t('w_0046')));
+        callback(new Error(this.$t("w_0046")));
       } else {
-				api.upgRel({
+        api
-					upgradeMemberCode: value
+          .upgRel({
+            upgradeMemberCode: value,
           })
-					.then(res => {
+          .then((res) => {
             if (res.code == 200) {
               this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
@@ -367,18 +493,20 @@ export default {
               callback();
             }
           })
-					.catch(err => {
+          .catch((err) => {
             callback(new Error(err));
           });
       }
     },
     getCatDetail() {
-			api.shoppingWaresDetail({
+      api
+        .shoppingWaresDetail({
           shoppingIds: this.shoppingArr,
-				specialArea: this.specialArea
+          specialArea: this.specialArea,
-			}).then(res => {
+        })
+        .then((res) => {
           this.allGoodsData = res.data;
-				this.waresCodeList = res.data.orderItemsParams.map(item => {
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
             return item.waresCode;
           });
           this.allGoodsData.specialArea = this.specialArea;
@@ -400,9 +528,11 @@ export default {
         });
     },
     getUserName() {
-			api.upgRel({
+      api
-				upgradeMemberCode: this.ruleForm.upgradeMemberCode
+        .upgRel({
-			}).then(res => {
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
           if (res.code == 200) {
             this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
             this.$forceUpdate();
@@ -419,16 +549,16 @@ export default {
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-				text: 'Loading',
+        text: "Loading",
-				spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-				background: 'rgba(0, 0, 0, 0.7)'
+        background: "rgba(0, 0, 0, 0.7)",
       });
     },
     resetAll() {
-			this.ruleForm.parent = '';
+      this.ruleForm.parent = "";
-			this.ruleForm.upgradeMemberName = '';
+      this.ruleForm.upgradeMemberName = "";
-			this.ruleForm.deliveryWay = '';
+      this.ruleForm.deliveryWay = "";
-			this.ruleForm.transType = '';
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
@@ -437,8 +567,8 @@ export default {
       if (val) {
         this.isPay = false;
         this.$router.push({
-					path: '/vipCenter',
+          path: "/vipCenter",
-					query: { id: 1 }
+          query: { id: 1 },
         });
       } else {
         this.$confirm(this.$t("w_0090"), "", {
@@ -446,21 +576,21 @@ export default {
           cancelButtonText: this.$t("ENU_P_TYPE0"),
           type: "warning",
         })
-					.then(_ => {
+          .then((_) => {
             this.isPay = false;
             this.$router.push({
-							path: '/vipCenter',
+              path: "/vipCenter",
-							query: { id: 1 }
+              query: { id: 1 },
             });
           })
-					.catch(_ => {});
+          .catch((_) => {});
       }
     },
     setDizhi(e, val) {
       let arr = this.flatten(this.areaData);
-			let nameList = '';
+      let nameList = "";
-			arr.forEach(item => {
+      arr.forEach((item) => {
-				this.ruleForm.dizhi.forEach(ctem => {
+        this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
             nameList += item.name;
           }
@@ -469,47 +599,42 @@ export default {
       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.recCounty = this.ruleForm.dizhi[2] || "";
       this.getPostAge();
     },
     // 注册
     submitRegister(formName) {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
-			if (!this.agreementShow) {
+
-				this.$message({
-					message: this.$t('w_0091'),
-					type: 'warning'
-				});
-				return;
-			}
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-					message: this.$t('w_0092'),
+          message: this.$t("w_0092"),
-					type: 'warning'
+          type: "warning",
         });
         return;
       }
-			this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-						deleteList: deleteList
+            deleteList: deleteList,
           });
 
-					api.confirmOthOrder(obj)
+          api
-						.then(res => {
+            .confirmOthOrder(obj)
+            .then((res) => {
               this.isLoading.close();
               if (res.code == 200) {
                 this.isPay = true;
                 this.paramsPost = res.data;
               }
             })
-						.catch(err => {
+            .catch((err) => {
               this.isLoading.close();
             });
         } else {
@@ -525,26 +650,33 @@ export default {
     },
     flatten(arr) {
       return arr.reduce((result, item) => {
-				return result.concat(item, Array.isArray(item.children) ? this.flatten(item.children) : []);
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
       }, []);
     },
     checkRadio() {
-			this.$set(this.ruleForm, 'dizhi', []);
+      this.$set(this.ruleForm, "dizhi", []);
       let arr = [];
-			this.addressList.forEach(item => {
+      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 = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
       });
-			arr = arr.filter(s => {
+      arr = arr.filter((s) => {
         return s && s.trim();
       });
 
-			this.$set(this.ruleForm, 'dizhi', arr);
+      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];
@@ -555,15 +687,17 @@ export default {
     },
     getPostAge() {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
       this.allGoodsData.deleteList = deleteList;
-			api.queryPostage(this.allGoodsData).then(res => {
+      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);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
       });
     },
     // getMember() {
@@ -577,32 +711,32 @@ export default {
     //   })
     // },
     getTransList() {
-			api.transportList().then(res => {
+      api.transportList().then((res) => {
         this.transList = res.data;
       });
     },
     getDeliveryList() {
-			api.deliveryList().then(res => {
+      api.deliveryList().then((res) => {
         this.deliList = res.data;
       });
     },
     delAds(id) {
-			this.$confirm(this.$t('w_0088') + '?', '', {
+      this.$confirm(this.$t("w_0088") + "?", "", {
-				confirmButtonText: this.$t('w_0035'),
+        confirmButtonText: this.$t("w_0035"),
-				cancelButtonText: this.$t('ENU_P_TYPE0'),
+        cancelButtonText: this.$t("ENU_P_TYPE0"),
-				type: 'warning'
+        type: "warning",
       }).then(() => {
-				api.delAddress(id).then(res => {
+        api.delAddress(id).then((res) => {
           this.$message({
-						type: 'success',
+            type: "success",
-						message: this.$t('w_0089') + '!'
+            message: this.$t("w_0089") + "!",
           });
           this.getAddressList();
         });
       });
     },
     getAllArea() {
-			api.allArea().then(res => {
+      api.allArea().then((res) => {
         this.areaData = res.data;
       });
     },
@@ -610,7 +744,7 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
-			api.addressDefault(id).then(res => {
+      api.addressDefault(id).then((res) => {
         this.getAddressList();
       });
     },
@@ -622,9 +756,9 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
-			api.addressList({}).then(res => {
+      api.addressList({}).then((res) => {
         this.addressList = res.data;
-				this.addressList.forEach(item => {
+        this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
             this.moren = item.pkId;
             this.checkRadio();
@@ -636,13 +770,13 @@ export default {
     // 斑马线
     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>
 

src/views/tvIng/index.vue

@@ -9,10 +9,17 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex">{{ $t('w_0104') }}</div>
+      <div class="rti dis_flex">{{ $t("w_0104") }}</div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <!-- <el-col :span="6">
           <el-form-item :label="$t('ENU_REG_AU_2')"
@@ -24,19 +31,36 @@
         <el-col :span="6">
           <el-form-item :label="$t('N_I_124')" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-						<el-input v-model="ruleForm.upgradeMemberCode" :placeholder="$t('w_0046')"></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :placeholder="$t('w_0046')"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('CK_KS_14')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0060')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0060')"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery" :disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+            <el-select
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -51,53 +75,100 @@
       <!-- 收货人信息 -->
       <div v-show="isDeliveryWay">
         <div class="xian">
-					<div class="title">{{ $t('w_0065') }}</div>
+          <div class="title">{{ $t("w_0065") }}</div>
-					<div class="lan" @click="openAddress">{{ $t('w_0066') }}</div>
+          <div class="lan" @click="openAddress">{{ $t("w_0066") }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" prop="recName"><el-input v-model="ruleForm.recName" :placeholder="$t('w_0067')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_ORD_10')" prop="recName"
+              ><el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" prop="recPhone"><el-input v-model="ruleForm.recPhone" :placeholder="$t('w_0053')"></el-input></el-form-item>
+            <el-form-item :label="$t('w_0052')" prop="recPhone"
+              ><el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('w_0068')" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData" :props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+              <el-cascader
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('S_C_27')" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200" :placeholder="$t('w_0070')"></el-input>
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
+            <el-form-item :label="$t('w_0071')"
+              ><el-input v-model="ruleForm.postage" disabled></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark" :placeholder="$t('w_0072')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_WAL_22')"
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox">
-			<div class="title">{{ $t('w_0073') }}</div>
+      <div class="title">{{ $t("w_0073") }}</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">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{}}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
-				<div class="local1">{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)</div>
+        v-for="item in addressList"
-				<div class="local2" v-show="item.isDefault == 1">{{ $t('w_0074') }}</div>
+        :key="item.pkId"
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">{{ $t('w_0075') }}</div>
+      >
-				<div class="local2" @click="changeAds(item.pkId)">{{ $t('w_0076') }}</div>
+        <el-radio v-model="moren" @input="checkRadio" :label="item.pkId"
-				<div class="local3" @click="delAds(item.pkId)">{{ $t('ENU_CONTROL_TYPE_3') }}</div>
+          >{{}}</el-radio
+        >
+        <div class="local1">
+          {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
+        </div>
+        <div class="local2" v-show="item.isDefault == 1">
+          {{ $t("w_0074") }}
+        </div>
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ $t("w_0075") }}
+        </div>
+        <div class="local2" @click="changeAds(item.pkId)">
+          {{ $t("w_0076") }}
+        </div>
+        <div class="local3" @click="delAds(item.pkId)">
+          {{ $t("ENU_CONTROL_TYPE_3") }}
+        </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ $t('w_0077') }}</div>
+      <div class="title">{{ $t("w_0077") }}</div>
     </div>
     <el-table
       :data="allData"
@@ -108,11 +179,16 @@
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
-				fontSize: '15px'
+        fontSize: '15px',
       }"
       :row-class-name="tableRowClassName"
     >
-			<el-table-column align="center" prop="waresName" width="400" :label="$t('w_0078')">
+      <el-table-column
+        align="center"
+        prop="waresName"
+        width="400"
+        :label="$t('w_0078')"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
@@ -120,7 +196,11 @@
               <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="" />
                 <div class="goods_tit_lr">
@@ -133,18 +213,34 @@
           </div>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="$t('w_0079') + '(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="$t('w_0079') + '(¥)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -156,8 +252,14 @@
       </el-table-column>
     </el-table>
     <div class="tab_b">
-			<div>{{ $t('w_0083') }}:{{ userInfo.currencyIcon }}{{ allGoodsData.priceAmount | numberToCurrency }}</div>
+      <div>
-			<div>{{ $t('w_0071') }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}</div>
+        {{ $t("w_0083") }}:{{ userInfo.currencyIcon
+        }}{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>
+        {{ $t("w_0071") }}:{{ userInfo.currencyIcon
+        }}{{ ruleForm.postage | numberToCurrency }}
+      </div>
     </div>
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
@@ -166,23 +268,46 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ $t('w_0325') }}:</div>
+            <div class="f1">{{ $t("w_0325") }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
-						<div class="f1">{{ $t('ENU_TOTAL_V_1') }}:</div>
+            <div class="f1">{{ $t("ENU_TOTAL_V_1") }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
             </div>
           </div>
-				<div class="footer_tt" v-show="ruleForm.recAddress && ruleForm.recName && ruleForm.recPhone && ruleForm.nameList">
+        </div>
-					<div class="f2 f4">{{ $t('w_0084') }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}</div>
+        <div
-					<div class="f4">{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement
-				<div class="btn" @click="submitRegister('ruleForm')">{{ $t('w_0085') }}</div>
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ $t("w_0085") }}
+        </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
@@ -192,26 +317,26 @@
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue';
+import personInfo from "@/components/personInfo.vue";
-import AddAddress from '@/components/AddAddress.vue';
+import AddAddress from "@/components/AddAddress.vue";
-import agreement from '@/components/agreement.vue';
+import agreement from "@/components/agreement.vue";
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import * as api from '@/api/register.js';
+import * as api from "@/api/register.js";
-import { setTokenMi } from '@/util/auth';
+import { setTokenMi } from "@/util/auth";
-import Pay from '@/components/Pay.vue';
+import Pay from "@/components/Pay.vue";
-import mustAgreeMent from '@/components/mustAgreeMent.vue';
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
   components: {
     personInfo,
     AddAddress,
     agreement,
     Pay,
-		mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-			if (this.ruleForm.transType == '' && this.isDeliveryWay) {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-				callback(new Error(this.$t('w_0064')));
+        callback(new Error(this.$t("w_0064")));
       } else {
         callback();
       }
@@ -219,39 +344,49 @@ export default {
     return {
       waresCodeList: [],
       isPay: false,
-			paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
         dizhi: [],
-				fwzx: '',
+        fwzx: "",
-				upgradeMemberCode: '',
+        upgradeMemberCode: "",
-				upgradeMemberName: '',
+        upgradeMemberName: "",
-				postage: '',
+        postage: "",
-				recName: '',
+        recName: "",
-				recPhone: '',
+        recPhone: "",
-				recAddress: '',
+        recAddress: "",
-				deliveryWay: '',
+        deliveryWay: "",
-				transType: ''
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-						trigger: 'blur'
+            trigger: "blur",
-					}
+          },
+        ],
+        gradeName: [
+          { required: true, message: this.$t("w_0086"), trigger: "change" },
+        ],
+        upgradeMemberName: [
+          { required: true, message: this.$t("w_0060"), trigger: "change" },
+        ],
+        recName: [
+          { required: true, message: this.$t("w_0087"), trigger: "blur" },
+        ],
+        recPhone: [
+          { required: true, message: this.$t("w_0053"), trigger: "blur" },
+        ],
+        recAddress: [
+          { required: true, message: this.$t("w_0070"), trigger: "blur" },
         ],
-				gradeName: [{ required: true, message: this.$t('w_0086'), trigger: 'change' }],
-				upgradeMemberName: [{ required: true, message: this.$t('w_0060'), trigger: 'change' }],
-				recName: [{ required: true, message: this.$t('w_0087'), trigger: 'blur' }],
-				recPhone: [{ required: true, message: this.$t('w_0053'), trigger: 'blur' }],
-				recAddress: [{ required: true, message: this.$t('w_0070'), trigger: 'blur' }],
         deliveryWay: [
           {
             required: true,
-						message: this.$t('w_0062'),
+            message: this.$t("w_0062"),
-						trigger: 'change'
+            trigger: "change",
-					}
+          },
         ],
         // transType: [
         //   {
@@ -260,47 +395,47 @@ export default {
         //     trigger: 'change',
         //   },
         // ],
-				transType: [{ validator: validateRecTransType }]
+        transType: [{ validator: validateRecTransType }],
       },
       addressList: [],
-			moren: '',
+      moren: "",
       allGoodsData: [],
       allData: [],
-			agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
           value: 1,
-					label: this.$t('ENU_TRA_1')
+          label: this.$t("ENU_TRA_1"),
         },
         {
           value: 2,
-					label: this.$t('ENU_TRA_2')
+          label: this.$t("ENU_TRA_2"),
         },
         {
           value: 3,
-					label: this.$t('ENU_TRA_3')
+          label: this.$t("ENU_TRA_3"),
-				}
+        },
       ],
       deliList: [],
       bankLists: [],
       areaData: [],
       regionParams: {
-				label: 'name',
+        label: "name",
-				value: 'id',
+        value: "id",
-				children: 'children',
+        children: "children",
-				expandTrigger: 'hover'
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-			isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-			shoppingArr: '',
+      shoppingArr: "",
-			totalAmont: 0
+      totalAmont: 0,
     };
   },
   computed: {
-		...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     // // 数据源
@@ -336,11 +471,11 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-		this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'));
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
     this.getCatDetail();
     // 幂等性
-		api.generate().then(res => {
+    api.generate().then((res) => {
       setTokenMi(res.msg);
     });
     if (this.userInfo.pkSettleCountry == 1) {
@@ -352,12 +487,13 @@ export default {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-				callback(new Error(this.$t('w_0046')));
+        callback(new Error(this.$t("w_0046")));
       } else {
-				api.upgRel({
+        api
-					upgradeMemberCode: value
+          .upgRel({
+            upgradeMemberCode: value,
           })
-					.then(res => {
+          .then((res) => {
             if (res.code == 200) {
               this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
@@ -365,16 +501,16 @@ export default {
               callback();
             }
           })
-					.catch(err => {
+          .catch((err) => {
             callback(new Error(err));
           });
       }
     },
     setDizhi(e, val) {
       let arr = this.flatten(this.areaData);
-			let nameList = '';
+      let nameList = "";
-			arr.forEach(item => {
+      arr.forEach((item) => {
-				this.ruleForm.dizhi.forEach(ctem => {
+        this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
             nameList += item.name;
           }
@@ -383,16 +519,18 @@ export default {
       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.recCounty = this.ruleForm.dizhi[2] || "";
       this.getPostAge();
     },
     getCatDetail() {
-			api.shoppingWaresDetail({
+      api
+        .shoppingWaresDetail({
           shoppingIds: this.shoppingArr,
-				specialArea: 11
+          specialArea: 11,
-			}).then(res => {
+        })
+        .then((res) => {
           this.allGoodsData = res.data;
-				this.waresCodeList = res.data.orderItemsParams.map(item => {
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
             return item.waresCode;
           });
           this.allGoodsData.specialArea = 11;
@@ -423,23 +561,25 @@ export default {
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-				text: 'Loading',
+        text: "Loading",
-				spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-				background: 'rgba(0, 0, 0, 0.7)'
+        background: "rgba(0, 0, 0, 0.7)",
       });
     },
     resetAll() {
-			this.ruleForm.parent = '';
+      this.ruleForm.parent = "";
-			this.ruleForm.deliveryWay = '';
+      this.ruleForm.deliveryWay = "";
-			this.ruleForm.transType = '';
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
     },
     getUserName() {
-			api.upgRel({
+      api
-				upgradeMemberCode: this.ruleForm.upgradeMemberCode
+        .upgRel({
-			}).then(res => {
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
           if (res.code == 200) {
             this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
             this.$forceUpdate();
@@ -450,8 +590,8 @@ export default {
       if (val) {
         this.isPay = false;
         this.$router.push({
-					path: '/vipCenter',
+          path: "/vipCenter",
-					query: { id: 1 }
+          query: { id: 1 },
         });
       } else {
         this.$confirm(this.$t("w_0090"), "", {
@@ -459,54 +599,55 @@ export default {
           cancelButtonText: this.$t("ENU_P_TYPE0"),
           type: "warning",
         })
-					.then(_ => {
+          .then((_) => {
             this.isPay = false;
             this.$router.push({
-							path: '/vipCenter',
+              path: "/vipCenter",
-							query: { id: 1 }
+              query: { id: 1 },
             });
           })
-					.catch(_ => {});
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
-			if (!this.agreementShow) {
+      // if (!this.agreementShow) {
-				this.$message({
+      //   this.$message({
-					message: this.$t('w_0091'),
+      //     message: this.$t("w_0091"),
-					type: 'warning'
+      //     type: "warning",
-				});
+      //   });
-				return;
+      //   return;
-			}
+      // }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-					message: this.$t('w_0092'),
+          message: this.$t("w_0092"),
-					type: 'warning'
+          type: "warning",
         });
         return;
       }
-			this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-						deleteList: deleteList
+            deleteList: deleteList,
           });
 
-					api.confirmOthOrder(obj)
+          api
-						.then(res => {
+            .confirmOthOrder(obj)
+            .then((res) => {
               this.isLoading.close();
               if (res.code == 200) {
                 this.isPay = true;
                 this.paramsPost = res.data;
               }
             })
-						.catch(err => {
+            .catch((err) => {
               this.isLoading.close();
             });
         } else {
@@ -522,26 +663,33 @@ export default {
     },
     flatten(arr) {
       return arr.reduce((result, item) => {
-				return result.concat(item, Array.isArray(item.children) ? this.flatten(item.children) : []);
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
       }, []);
     },
     checkRadio() {
-			this.$set(this.ruleForm, 'dizhi', []);
+      this.$set(this.ruleForm, "dizhi", []);
       let arr = [];
-			this.addressList.forEach(item => {
+      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 = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
       });
-			arr = arr.filter(s => {
+      arr = arr.filter((s) => {
         return s && s.trim();
       });
 
-			this.$set(this.ruleForm, 'dizhi', arr);
+      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];
@@ -552,15 +700,17 @@ export default {
     },
     getPostAge() {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
       this.allGoodsData.deleteList = deleteList;
-			api.queryPostage(this.allGoodsData).then(res => {
+      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);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
       });
     },
     // getMember() {
@@ -574,32 +724,32 @@ export default {
     //   })
     // },
     getTransList() {
-			api.transportList().then(res => {
+      api.transportList().then((res) => {
         this.transList = res.data;
       });
     },
     getDeliveryList() {
-			api.deliveryList().then(res => {
+      api.deliveryList().then((res) => {
         this.deliList = res.data;
       });
     },
     delAds(id) {
-			this.$confirm(this.$t('w_0088') + '?', '', {
+      this.$confirm(this.$t("w_0088") + "?", "", {
-				confirmButtonText: this.$t('w_0035'),
+        confirmButtonText: this.$t("w_0035"),
-				cancelButtonText: this.$t('ENU_P_TYPE0'),
+        cancelButtonText: this.$t("ENU_P_TYPE0"),
-				type: 'warning'
+        type: "warning",
       }).then(() => {
-				api.delAddress(id).then(res => {
+        api.delAddress(id).then((res) => {
           this.$message({
-						type: 'success',
+            type: "success",
-						message: this.$t('w_0089') + '!'
+            message: this.$t("w_0089") + "!",
           });
           this.getAddressList();
         });
       });
     },
     getAllArea() {
-			api.allArea().then(res => {
+      api.allArea().then((res) => {
         this.areaData = res.data;
       });
     },
@@ -607,7 +757,7 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
-			api.addressDefault(id).then(res => {
+      api.addressDefault(id).then((res) => {
         this.getAddressList();
       });
     },
@@ -619,9 +769,9 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
-			api.addressList({}).then(res => {
+      api.addressList({}).then((res) => {
         this.addressList = res.data;
-				this.addressList.forEach(item => {
+        this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
             this.moren = item.pkId;
             this.checkRadio();
@@ -633,13 +783,13 @@ export default {
     // 斑马线
     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>
 

src/views/upgrade/index.vue

@@ -512,11 +512,11 @@
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-        <agreement
+        <!-- <agreement
           :isShow="agreementShow"
           ref="agree"
           @agree="agree"
-        ></agreement>
+        ></agreement> -->
         <div class="btn" @click="submitRegister('ruleForm')">
           {{ $t("w_0085") }}
         </div>
@@ -679,7 +679,7 @@ export default {
       moren: "",
       allGoodsData: [],
       allData: [],
-      agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
@@ -788,9 +788,6 @@ export default {
       this.ruleForm.transType = 1;
       this.ruleForm.deliveryWay = 1;
     }
-    if (this.userInfo.buyAgreementFlag == 1) {
-      this.agreementShow = true;
-    }
   },
   methods: {
     handleSizeChange(val) {
@@ -1043,13 +1040,13 @@ export default {
           shoppingId: item,
         });
       });
-      if (!this.agreementShow) {
+      // if (!this.agreementShow) {
-        this.$message({
+      //   this.$message({
-          message: this.$t("w_0091"),
+      //     message: this.$t("w_0091"),
-          type: "warning",
+      //     type: "warning",
-        });
+      //   });
-        return;
+      //   return;
-      }
+      // }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
           message: this.$t("w_0092"),

src/views/welfare/index.vue

@@ -9,10 +9,17 @@
     <!-- 用户头 -->
     <personInfo></personInfo>
     <div class="rt dis_flex">
-			<div class="rti dis_flex">{{ $t('w_0059') }}</div>
+      <div class="rti dis_flex">{{ $t("w_0059") }}</div>
     </div>
     <!-- 表单 -->
-		<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-position="top" status-icon class="demo-ruleForm">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-position="top"
+      status-icon
+      class="demo-ruleForm"
+    >
       <el-row :gutter="40" class="padRow">
         <!-- <el-col :span="6">
           <el-form-item :label="$t('ENU_REG_AU_2')"
@@ -24,19 +31,36 @@
         <el-col :span="6">
           <el-form-item :label="$t('N_I_124')" prop="upgradeMemberCode">
             <!-- <div class="dis_flex"> -->
-						<el-input v-model="ruleForm.upgradeMemberCode" :placeholder="$t('w_0046')"></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberCode"
+              :placeholder="$t('w_0046')"
+            ></el-input>
             <!-- </div> -->
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('CK_KS_14')" prop="upgradeMemberName">
-						<el-input v-model="ruleForm.upgradeMemberName" :placeholder="$t('w_0060')" disabled></el-input>
+            <el-input
+              v-model="ruleForm.upgradeMemberName"
+              :placeholder="$t('w_0060')"
+              disabled
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('w_0061')" prop="deliveryWay">
-						<el-select v-model="ruleForm.deliveryWay" @change="selDelivery" :disabled="this.userInfo.pkSettleCountry == 1" :placeholder="$t('w_0062')">
+            <el-select
-							<el-option v-for="item in deliList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              v-model="ruleForm.deliveryWay"
+              @change="selDelivery"
+              :disabled="this.userInfo.pkSettleCountry == 1"
+              :placeholder="$t('w_0062')"
+            >
+              <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>
@@ -50,53 +74,100 @@
       </el-row>
       <div v-show="isDeliveryWay">
         <div class="xian">
-					<div class="title">{{ $t('w_0065') }}</div>
+          <div class="title">{{ $t("w_0065") }}</div>
-					<div class="lan" @click="openAddress">{{ $t('w_0066') }}</div>
+          <div class="lan" @click="openAddress">{{ $t("w_0066") }}</div>
         </div>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('MY_ORD_10')" prop="recName"><el-input v-model="ruleForm.recName" :placeholder="$t('w_0067')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_ORD_10')" prop="recName"
+              ><el-input
+                v-model="ruleForm.recName"
+                :placeholder="$t('w_0067')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('w_0052')" prop="recPhone"><el-input v-model="ruleForm.recPhone" :placeholder="$t('w_0053')"></el-input></el-form-item>
+            <el-form-item :label="$t('w_0052')" prop="recPhone"
+              ><el-input
+                v-model="ruleForm.recPhone"
+                :placeholder="$t('w_0053')"
+              ></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('w_0068')" class="dizhi" prop="dizhi">
-							<el-cascader v-model="ruleForm.dizhi" @change="setDizhi" :options="areaData" :props="regionParams" :placeholder="$t('w_0069')"></el-cascader>
+              <el-cascader
+                v-model="ruleForm.dizhi"
+                @change="setDizhi"
+                :options="areaData"
+                :props="regionParams"
+                :placeholder="$t('w_0069')"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="$t('S_C_27')" prop="recAddress">
-							<el-input v-model="ruleForm.recAddress" maxlength="200" :placeholder="$t('w_0070')"></el-input>
+              <el-input
+                v-model="ruleForm.recAddress"
+                maxlength="200"
+                :placeholder="$t('w_0070')"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="40" class="padRow">
           <el-col :span="6">
-						<el-form-item :label="$t('w_0071')"><el-input v-model="ruleForm.postage" disabled></el-input></el-form-item>
+            <el-form-item :label="$t('w_0071')"
+              ><el-input v-model="ruleForm.postage" disabled></el-input
+            ></el-form-item>
           </el-col>
           <el-col :span="6">
-						<el-form-item :label="$t('MY_WAL_22')"><el-input v-model="ruleForm.remark" :placeholder="$t('w_0072')"></el-input></el-form-item>
+            <el-form-item :label="$t('MY_WAL_22')"
+              ><el-input
+                v-model="ruleForm.remark"
+                :placeholder="$t('w_0072')"
+              ></el-input
+            ></el-form-item>
           </el-col>
         </el-row>
       </div>
     </el-form>
     <div class="nox">
-			<div class="title">{{ $t('w_0073') }}</div>
+      <div class="title">{{ $t("w_0073") }}</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">
+      <div
-				<el-radio v-model="moren" @input="checkRadio" :label="item.pkId">{{}}</el-radio>
+        :class="['local_i', item.pkId == moren ? 'local_a' : '']"
-				<div class="local1">{{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)</div>
+        v-for="item in addressList"
-				<div class="local2" v-show="item.isDefault == 1">{{ $t('w_0074') }}</div>
+        :key="item.pkId"
-				<div class="local2 local3" v-show="item.isDefault == 0" @click="setDefaultAds(item.pkId)">{{ $t('w_0075') }}</div>
+      >
-				<div class="local2" @click="changeAds(item.pkId)">{{ $t('w_0076') }}</div>
+        <el-radio v-model="moren" @input="checkRadio" :label="item.pkId"
-				<div class="local3" @click="delAds(item.pkId)">{{ $t('ENU_CONTROL_TYPE_3') }}</div>
+          >{{}}</el-radio
+        >
+        <div class="local1">
+          {{ item.recArea }}{{ item.recAddress }}({{ item.recName }} 收)
+        </div>
+        <div class="local2" v-show="item.isDefault == 1">
+          {{ $t("w_0074") }}
+        </div>
+        <div
+          class="local2 local3"
+          v-show="item.isDefault == 0"
+          @click="setDefaultAds(item.pkId)"
+        >
+          {{ $t("w_0075") }}
+        </div>
+        <div class="local2" @click="changeAds(item.pkId)">
+          {{ $t("w_0076") }}
+        </div>
+        <div class="local3" @click="delAds(item.pkId)">
+          {{ $t("ENU_CONTROL_TYPE_3") }}
+        </div>
       </div>
     </div>
     <!-- 商品信息 -->
     <div class="nox">
-			<div class="title">{{ $t('w_0077') }}</div>
+      <div class="title">{{ $t("w_0077") }}</div>
     </div>
     <el-table
       :data="allData"
@@ -107,11 +178,16 @@
         background: '#C8161D',
         color: '#fff',
         fontWeight: 'bold',
-				fontSize: '15px'
+        fontSize: '15px',
       }"
       :row-class-name="tableRowClassName"
     >
-			<el-table-column align="center" prop="waresName" width="400" :label="$t('w_0078')">
+      <el-table-column
+        align="center"
+        prop="waresName"
+        width="400"
+        :label="$t('w_0078')"
+      >
         <template slot-scope="scope">
           <!-- <span>{{ scope.row.goodsPrice | numberToCurrency}}</span> -->
           <div class="goods">
@@ -119,7 +195,11 @@
               <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="" />
                 <div class="goods_tit_lr">
@@ -132,18 +212,34 @@
           </div>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsPrice" :label="$t('w_0079') + '(¥)'">
+      <el-table-column
+        align="center"
+        prop="goodsPrice"
+        :label="$t('w_0079') + '(¥)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.price | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="goodsAchive" :label="$t('w_0080') + '(PV)'">
+      <el-table-column
+        align="center"
+        prop="goodsAchive"
+        :label="$t('w_0080') + '(PV)'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieve | numberToCurrency }}</span>
         </template>
       </el-table-column>
-			<el-table-column align="center" prop="quantity" :label="$t('w_0081')"></el-table-column>
+      <el-table-column
-			<el-table-column align="center" prop="spyjxj" :label="$t('w_0082') + 'PV'">
+        align="center"
+        prop="quantity"
+        :label="$t('w_0081')"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="spyjxj"
+        :label="$t('w_0082') + 'PV'"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.achieveAmount | numberToCurrency }}</span>
         </template>
@@ -155,8 +251,14 @@
       </el-table-column>
     </el-table>
     <div class="tab_b">
-			<div>{{ $t('w_0083') }}:{{ userInfo.currencyIcon }}{{ allGoodsData.priceAmount | numberToCurrency }}</div>
+      <div>
-			<div>{{ $t('w_0071') }}:{{ userInfo.currencyIcon }}{{ ruleForm.postage | numberToCurrency }}</div>
+        {{ $t("w_0083") }}:{{ userInfo.currencyIcon
+        }}{{ allGoodsData.priceAmount | numberToCurrency }}
+      </div>
+      <div>
+        {{ $t("w_0071") }}:{{ userInfo.currencyIcon
+        }}{{ ruleForm.postage | numberToCurrency }}
+      </div>
     </div>
     <AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
     <div class="zhan"></div>
@@ -165,27 +267,53 @@
       <div class="footer_t">
         <div class="footer_tt">
           <div class="dis_flex">
-						<div class="f1">{{ $t('w_0325') }}:</div>
+            <div class="f1">{{ $t("w_0325") }}:</div>
-						<div class="f2">{{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}</div>
+            <div class="f2">
+              {{ userInfo.currencyIcon }}{{ totalAmont | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex f2">
-						<div class="f1">{{ $t('ENU_TOTAL_V_1') }}:</div>
+            <div class="f1">{{ $t("ENU_TOTAL_V_1") }}:</div>
-						<div class="f3">{{ allGoodsData.achieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ allGoodsData.achieveAmount | numberToCurrency }}
+            </div>
           </div>
           <div class="dis_flex">
             <div class="f1">BV:</div>
-						<div class="f3">{{ userInfo.currencyIcon }}{{ allGoodsData.assAchieveAmount | numberToCurrency }}</div>
+            <div class="f3">
+              {{ userInfo.currencyIcon
+              }}{{ allGoodsData.assAchieveAmount | numberToCurrency }}
             </div>
           </div>
-				<div class="footer_tt" v-show="ruleForm.recAddress && ruleForm.recName && ruleForm.recPhone && ruleForm.nameList">
+        </div>
-					<div class="f2 f4">{{ $t('w_0084') }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}</div>
+        <div
-					<div class="f4">{{ $t('MY_ORD_10') }}：{{ ruleForm.recName }} {{ ruleForm.recPhone }}</div>
+          class="footer_tt"
+          v-show="
+            ruleForm.recAddress &&
+            ruleForm.recName &&
+            ruleForm.recPhone &&
+            ruleForm.nameList
+          "
+        >
+          <div class="f2 f4">
+            {{ $t("w_0084") }}：{{ ruleForm.nameList }}{{ ruleForm.recAddress }}
+          </div>
+          <div class="f4">
+            {{ $t("MY_ORD_10") }}：{{ ruleForm.recName }}
+            {{ ruleForm.recPhone }}
+          </div>
         </div>
       </div>
       <div class="footer_b">
         <!-- 协议 -->
-				<agreement :isShow="agreementShow" ref="agree" @agree="agree"></agreement>
+        <!-- <agreement
-				<div class="btn" @click="submitRegister('ruleForm')">{{ $t('w_0085') }}</div>
+          :isShow="agreementShow"
+          ref="agree"
+          @agree="agree"
+        ></agreement> -->
+        <div class="btn" @click="submitRegister('ruleForm')">
+          {{ $t("w_0085") }}
+        </div>
       </div>
     </div>
     <!-- 强制阅读协议 -->
@@ -195,26 +323,26 @@
 </template>
 
 <script>
-import personInfo from '@/components/personInfo.vue';
+import personInfo from "@/components/personInfo.vue";
-import AddAddress from '@/components/AddAddress.vue';
+import AddAddress from "@/components/AddAddress.vue";
-import agreement from '@/components/agreement.vue';
+import agreement from "@/components/agreement.vue";
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import * as api from '@/api/register.js';
+import * as api from "@/api/register.js";
-import { setTokenMi } from '@/util/auth';
+import { setTokenMi } from "@/util/auth";
-import Pay from '@/components/Pay.vue';
+import Pay from "@/components/Pay.vue";
-import mustAgreeMent from '@/components/mustAgreeMent.vue';
+import mustAgreeMent from "@/components/mustAgreeMent.vue";
 export default {
   components: {
     personInfo,
     AddAddress,
     agreement,
     Pay,
-		mustAgreeMent
+    mustAgreeMent,
   },
   data() {
     let validateRecTransType = (rule, value, callback) => {
-			if (this.ruleForm.transType == '' && this.isDeliveryWay) {
+      if (this.ruleForm.transType == "" && this.isDeliveryWay) {
-				callback(new Error(this.$t('w_0064')));
+        callback(new Error(this.$t("w_0064")));
       } else {
         callback();
       }
@@ -222,39 +350,49 @@ export default {
     return {
       waresCodeList: [],
       isPay: false,
-			paramsPost: '',
+      paramsPost: "",
       isClick: 0,
       ruleForm: {
         dizhi: [],
-				fwzx: '',
+        fwzx: "",
-				upgradeMemberCode: '',
+        upgradeMemberCode: "",
-				upgradeMemberName: '',
+        upgradeMemberName: "",
-				postage: '',
+        postage: "",
-				recName: '',
+        recName: "",
-				recPhone: '',
+        recPhone: "",
-				recAddress: '',
+        recAddress: "",
-				deliveryWay: '',
+        deliveryWay: "",
-				transType: ''
+        transType: "",
       },
       rules: {
         upgradeMemberCode: [
           {
             required: true,
             validator: this.upgradeMemberCodePass,
-						trigger: 'blur'
+            trigger: "blur",
-					}
+          },
+        ],
+        gradeName: [
+          { required: true, message: this.$t("w_0086"), trigger: "change" },
+        ],
+        upgradeMemberName: [
+          { required: true, message: this.$t("w_0060"), trigger: "change" },
+        ],
+        recName: [
+          { required: true, message: this.$t("w_0087"), trigger: "blur" },
+        ],
+        recPhone: [
+          { required: true, message: this.$t("w_0053"), trigger: "blur" },
+        ],
+        recAddress: [
+          { required: true, message: this.$t("w_0070"), trigger: "blur" },
         ],
-				gradeName: [{ required: true, message: this.$t('w_0086'), trigger: 'change' }],
-				upgradeMemberName: [{ required: true, message: this.$t('w_0060'), trigger: 'change' }],
-				recName: [{ required: true, message: this.$t('w_0087'), trigger: 'blur' }],
-				recPhone: [{ required: true, message: this.$t('w_0053'), trigger: 'blur' }],
-				recAddress: [{ required: true, message: this.$t('w_0070'), trigger: 'blur' }],
         deliveryWay: [
           {
             required: true,
-						message: this.$t('w_0062'),
+            message: this.$t("w_0062"),
-						trigger: 'change'
+            trigger: "change",
-					}
+          },
         ],
         // transType: [
         //   {
@@ -263,47 +401,47 @@ export default {
         //     trigger: 'change',
         //   },
         // ],
-				transType: [{ validator: validateRecTransType }]
+        transType: [{ validator: validateRecTransType }],
       },
       addressList: [],
-			moren: '',
+      moren: "",
       allGoodsData: [],
       allData: [],
-			agreementShow: false,
+      agreementShow: true,
       countryList: [],
       transList: [
         {
           value: 1,
-					label: this.$t('ENU_TRA_1')
+          label: this.$t("ENU_TRA_1"),
         },
         {
           value: 2,
-					label: this.$t('ENU_TRA_2')
+          label: this.$t("ENU_TRA_2"),
         },
         {
           value: 3,
-					label: this.$t('ENU_TRA_3')
+          label: this.$t("ENU_TRA_3"),
-				}
+        },
       ],
       deliList: [],
       bankLists: [],
       areaData: [],
       regionParams: {
-				label: 'name',
+        label: "name",
-				value: 'id',
+        value: "id",
-				children: 'children',
+        children: "children",
-				expandTrigger: 'hover'
+        expandTrigger: "hover",
       },
       totalPrice: 0,
       totalAchive: 0,
-			isLoading: '',
+      isLoading: "",
       isDeliveryWay: true,
-			shoppingArr: '',
+      shoppingArr: "",
-			totalAmont: 0
+      totalAmont: 0,
     };
   },
   computed: {
-		...mapGetters(['userInfo'])
+    ...mapGetters(["userInfo"]),
   },
   mounted() {
     // // 数据源
@@ -339,11 +477,11 @@ export default {
     // // 获取会员等级
     // // this.getMember()
     // 数据源
-		this.shoppingArr = JSON.parse(localStorage.getItem('allGoods'));
+    this.shoppingArr = JSON.parse(localStorage.getItem("allGoods"));
     // 获取购物车详情
     this.getCatDetail();
     // 幂等性
-		api.generate().then(res => {
+    api.generate().then((res) => {
       setTokenMi(res.msg);
     });
     if (this.userInfo.pkSettleCountry == 1) {
@@ -355,12 +493,13 @@ export default {
     // 升级编号获取name
     upgradeMemberCodePass(rule, value, callback) {
       if (!value) {
-				callback(new Error(this.$t('w_0046')));
+        callback(new Error(this.$t("w_0046")));
       } else {
-				api.upgRel({
+        api
-					upgradeMemberCode: value
+          .upgRel({
+            upgradeMemberCode: value,
           })
-					.then(res => {
+          .then((res) => {
             if (res.code == 200) {
               this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
               // this.getMember()
@@ -368,18 +507,20 @@ export default {
               callback();
             }
           })
-					.catch(err => {
+          .catch((err) => {
             callback(new Error(err));
           });
       }
     },
     getCatDetail() {
-			api.shoppingWaresDetail({
+      api
+        .shoppingWaresDetail({
           shoppingIds: this.shoppingArr,
-				specialArea: 13
+          specialArea: 13,
-			}).then(res => {
+        })
+        .then((res) => {
           this.allGoodsData = res.data;
-				this.waresCodeList = res.data.orderItemsParams.map(item => {
+          this.waresCodeList = res.data.orderItemsParams.map((item) => {
             return item.waresCode;
           });
           this.allGoodsData.specialArea = 13;
@@ -409,9 +550,9 @@ export default {
     },
     setDizhi(e, val) {
       let arr = this.flatten(this.areaData);
-			let nameList = '';
+      let nameList = "";
-			arr.forEach(item => {
+      arr.forEach((item) => {
-				this.ruleForm.dizhi.forEach(ctem => {
+        this.ruleForm.dizhi.forEach((ctem) => {
           if (ctem == item.id) {
             nameList += item.name;
           }
@@ -420,29 +561,31 @@ export default {
       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.recCounty = this.ruleForm.dizhi[2] || "";
       this.getPostAge();
     },
     openLoading() {
       this.isLoading = this.$loading({
         lock: true,
-				text: 'Loading',
+        text: "Loading",
-				spinner: 'el-icon-loading',
+        spinner: "el-icon-loading",
-				background: 'rgba(0, 0, 0, 0.7)'
+        background: "rgba(0, 0, 0, 0.7)",
       });
     },
     resetAll() {
-			this.ruleForm.parent = '';
+      this.ruleForm.parent = "";
-			this.ruleForm.deliveryWay = '';
+      this.ruleForm.deliveryWay = "";
-			this.ruleForm.transType = '';
+      this.ruleForm.transType = "";
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate();
       });
     },
     getUserName() {
-			api.upgRel({
+      api
-				upgradeMemberCode: this.ruleForm.upgradeMemberCode
+        .upgRel({
-			}).then(res => {
+          upgradeMemberCode: this.ruleForm.upgradeMemberCode,
+        })
+        .then((res) => {
           if (res.code == 200) {
             this.ruleForm.upgradeMemberName = res.data.upgradeMemberName;
             this.$forceUpdate();
@@ -453,8 +596,8 @@ export default {
       if (val) {
         this.isPay = false;
         this.$router.push({
-					path: '/vipCenter',
+          path: "/vipCenter",
-					query: { id: 1 }
+          query: { id: 1 },
         });
       } else {
         this.$confirm(this.$t("w_0090"), "", {
@@ -462,54 +605,55 @@ export default {
           cancelButtonText: this.$t("ENU_P_TYPE0"),
           type: "warning",
         })
-					.then(_ => {
+          .then((_) => {
             this.isPay = false;
             this.$router.push({
-							path: '/vipCenter',
+              path: "/vipCenter",
-							query: { id: 1 }
+              query: { id: 1 },
             });
           })
-					.catch(_ => {});
+          .catch((_) => {});
       }
     },
     // 注册
     submitRegister(formName) {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
-			if (!this.agreementShow) {
+      // if (!this.agreementShow) {
-				this.$message({
+      //   this.$message({
-					message: this.$t('w_0091'),
+      //     message: this.$t("w_0091"),
-					type: 'warning'
+      //     type: "warning",
-				});
+      //   });
-				return;
+      //   return;
-			}
+      // }
       if (this.isDeliveryWay && !this.ruleForm.recPhone) {
         this.$message({
-					message: this.$t('w_0092'),
+          message: this.$t("w_0092"),
-					type: 'warning'
+          type: "warning",
         });
         return;
       }
-			this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.openLoading();
           let obj = Object.assign({}, this.allGoodsData, this.ruleForm, {
-						deleteList: deleteList
+            deleteList: deleteList,
           });
 
-					api.confirmOthOrder(obj)
+          api
-						.then(res => {
+            .confirmOthOrder(obj)
+            .then((res) => {
               this.isLoading.close();
               if (res.code == 200) {
                 this.isPay = true;
                 this.paramsPost = res.data;
               }
             })
-						.catch(err => {
+            .catch((err) => {
               this.isLoading.close();
             });
         } else {
@@ -525,26 +669,33 @@ export default {
     },
     flatten(arr) {
       return arr.reduce((result, item) => {
-				return result.concat(item, Array.isArray(item.children) ? this.flatten(item.children) : []);
+        return result.concat(
+          item,
+          Array.isArray(item.children) ? this.flatten(item.children) : []
+        );
       }, []);
     },
     checkRadio() {
-			this.$set(this.ruleForm, 'dizhi', []);
+      this.$set(this.ruleForm, "dizhi", []);
       let arr = [];
-			this.addressList.forEach(item => {
+      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 = [
+            item.recProvince + "",
+            item.recCity + "",
+            (item.recCounty || "") + "",
+          ];
         }
       });
-			arr = arr.filter(s => {
+      arr = arr.filter((s) => {
         return s && s.trim();
       });
 
-			this.$set(this.ruleForm, 'dizhi', arr);
+      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];
@@ -555,15 +706,17 @@ export default {
     },
     getPostAge() {
       let deleteList = [];
-			this.shoppingArr.forEach(item => {
+      this.shoppingArr.forEach((item) => {
         deleteList.push({
-					shoppingId: item
+          shoppingId: item,
         });
       });
       this.allGoodsData.deleteList = deleteList;
-			api.queryPostage(this.allGoodsData).then(res => {
+      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);
+        this.totalAmont =
+          parseFloat(this.allGoodsData.priceAmount) +
+          parseFloat(res.data.postage);
       });
     },
     // getMember() {
@@ -577,32 +730,32 @@ export default {
     //   })
     // },
     getTransList() {
-			api.transportList().then(res => {
+      api.transportList().then((res) => {
         this.transList = res.data;
       });
     },
     getDeliveryList() {
-			api.deliveryList().then(res => {
+      api.deliveryList().then((res) => {
         this.deliList = res.data;
       });
     },
     delAds(id) {
-			this.$confirm(this.$t('w_0088') + '?', '', {
+      this.$confirm(this.$t("w_0088") + "?", "", {
-				confirmButtonText: this.$t('w_0035'),
+        confirmButtonText: this.$t("w_0035"),
-				cancelButtonText: this.$t('ENU_P_TYPE0'),
+        cancelButtonText: this.$t("ENU_P_TYPE0"),
-				type: 'warning'
+        type: "warning",
       }).then(() => {
-				api.delAddress(id).then(res => {
+        api.delAddress(id).then((res) => {
           this.$message({
-						type: 'success',
+            type: "success",
-						message: this.$t('w_0089') + '!'
+            message: this.$t("w_0089") + "!",
           });
           this.getAddressList();
         });
       });
     },
     getAllArea() {
-			api.allArea().then(res => {
+      api.allArea().then((res) => {
         this.areaData = res.data;
       });
     },
@@ -610,7 +763,7 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData, id);
     },
     setDefaultAds(id) {
-			api.addressDefault(id).then(res => {
+      api.addressDefault(id).then((res) => {
         this.getAddressList();
       });
     },
@@ -622,9 +775,9 @@ export default {
       this.$refs.addAddress.isShowAddress(true, this.areaData);
     },
     getAddressList() {
-			api.addressList({}).then(res => {
+      api.addressList({}).then((res) => {
         this.addressList = res.data;
-				this.addressList.forEach(item => {
+        this.addressList.forEach((item) => {
           if (item.isDefault == 1) {
             this.moren = item.pkId;
             this.checkRadio();
@@ -636,13 +789,13 @@ export default {
     // 斑马线
     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>
 

vue.config.js

@@ -5,42 +5,51 @@
  * @Date: 2022-09-29 10:04:55
  */
 // 引入等比适配插件
-const px2rem = require('postcss-px2rem')
+const px2rem = require("postcss-px2rem");
 
 // 配置基本大小
 const postcss = px2rem({
   // 基准大小 baseSize，需要和rem.js中相同
-  remUnit: 16
+  remUnit: 16,
-})
+});
 
 // 使用等比适配插件
 module.exports = {
   lintOnSave: false,
+  devServer: {
+    port: 8866,
+    proxy: {
+      "/prod-api": {
+        target: "http://localhost:8080",
+        changeOrigin: true,
+        pathRewrite: {
+          "^/prod-api": "",
+        },
+      },
+    },
+  },
+
   css: {
     loaderOptions: {
       postcss: {
-        plugins: [
+        plugins: [postcss],
-          postcss
+      },
-        ]
+    },
-      }
-    }
   },
   configureWebpack: {
     externals: {
-      'enUS': 'enUS',
+      enUS: "enUS",
-      'zhCN': 'zhCN',
+      zhCN: "zhCN",
-      'zhTC': 'zhTC',
+      zhTC: "zhTC",
-      'ruRU':'ruRU',
+      ruRU: "ruRU",
-      'frFR':'frFR',
+      frFR: "frFR",
-      'ptPT':'ptPT',
+      ptPT: "ptPT",
     },
   },
-  chainWebpack: config => {
+  chainWebpack: (config) => {
-    config
+    config.plugin("html").tap((args) => {
-      .plugin('html')
+      args[0].title = "会员系统";
-      .tap(args => {
+      return args;
-        args[0].title = '会员系统'
+    });
-        return args
+  },
-      })
+};
-  }
-}