优化注册

pages/login/examine.vue

@@ -6,7 +6,7 @@
       <el-step title="审核"></el-step>
     </el-steps>
     <!-- 注册 -->
-    <div class="register" v-if="active == 0">
+    <div class="register" v-if="active == 1">
       <div class="company">
         <h4>单位信息</h4>
         <el-form ref="form" :model="form" label-width="1.4rem" :rules="rules">
@@ -397,19 +397,19 @@
       
     </div>
     <!-- 完善 -->
-    <div class="perfect content" v-if="active == 1">
+    <div class="perfect content" v-if="active == 0">
       <div class="flex-between perfect-head">
         <div class="t2 flex">
           <div>单位名称：</div>
-          <div>腾讯</div>
+          <div>{{cpName}}</div>
         </div>
         <div class="t2 flex">
           <div>注册角色：</div>
-          <div>供应商</div>
+          <div>{{regName}}</div>
         </div>
         <div class="t2 flex">
           <div>行政区域：</div>
-          <div>浙江省 杭州市 滨江区</div>
+          <div>{{area}}</div>
         </div>
       </div>
       <el-form
@@ -809,8 +809,7 @@ export default {
           );
           let a = value.replace(reg, "");
           console.log(a + "--------------");
-          this.perfectForm.legalPersonPhone = a;
-          this.adminform.phonenumber = a;
+          this.adminform.phonenumber = a
 
           return callback(new Error("您的输入有误,请重新输入!"));
         } else {
@@ -826,6 +825,7 @@ export default {
           var reg = new RegExp(
             "^[A-z。？！，、 ； ： “ ” ‘ ’ （ ） 《 》 〈 〉 【 】 『 』 「 」 ﹃ ﹄ 〔 〕 … — ～ ﹏ ￥.]"
           );
+          console.log(value+'+++++++++++++++')
           let a = value.replace(reg, "");
           console.log(a + "--------------");
           this.adminform.idNumber = a;
@@ -837,12 +837,13 @@ export default {
     };
     //统一社会代码
     let validateRealSHid = (rule, value, callback) => {
-      const realnameReg = /^[_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g;
+      const realnameReg = /^[A-Z0-9]+$/;
       /* setTimeout(() => { */
         if (!realnameReg.test(value)) {
           var reg = new RegExp(
             "^[a-z。？！，、 ； ： “ ” ‘ ’ （ ） 《 》 〈 〉 【 】 『 』 「 」 ﹃ ﹄ 〔 〕 … — ～ ﹏ ￥.]"
           );
+          
           let a = value.replace(reg, "");
           console.log(a + "--------------");
           this.perfectForm.socialCode = a;
@@ -869,7 +870,7 @@ export default {
    /*    }, 1000); */
     };
     let validateRealPrice = (rule, value, callback) => {
-      const realnameReg = /^[1-9]{1}[0-9]{9}|^[1-9]{1}[0-9]{6}\.[0-9]{1,2}/;
+      const realnameReg = /^[0-9]+(.[0-9]{2})?$/;
       /* setInterval(() => { */
         if (!realnameReg.test(value)) {
           var reg = new RegExp(
@@ -888,6 +889,9 @@ export default {
       this.flag = true; */
 
     return {
+      cpName:"",
+      regName:'',
+      area:'',
       Verification:true,
       timer:60,
       centerDialogVisible: false,
@@ -903,7 +907,7 @@ export default {
       flag: true, //该值变化，就会触发刷新
       code: "", //刷新后的验证码
       active: 0,
-      checked: false,
+      checked: true,
       adminform: {
         name: "",
         idNumber: "",
@@ -1112,7 +1116,7 @@ export default {
           },
           {
             validator: validateRealSHid,
-          },
+          }
         ],
         companyNature: [
           {
@@ -1238,7 +1242,7 @@ export default {
         const valid1 = await this.$refs["adminform"].validate();
         if (valid && valid1) {
           let checked = this.checked;
-          if (checked) {
+          if (!checked) {
             this.$message.error("请勾选协议");
           }else{
               let message = {};
@@ -1247,6 +1251,10 @@ export default {
               const { msg, code,data } = await verifyPhone(message);
               if (code === 200) {
                 this.active++;
+                this.perfectForm.legalPersonPhone = this.adminform.phonenumber
+                this.cpName = this.form.companyName
+                this.regname = this.form.type
+                this.area = this.form.provinceId + this.form.cityId + this.form.districtId
               } else {
                 this.$message.error(msg);
               }