Merge branch 'beta' into xingze

jianshui-ui/src/views/freedom/login.vue

@@ -2,7 +2,7 @@
   <div id="a-login">
     <h4 style="text-align: center;color: white;background: #00afff;margin: 0px;padding-top: 15px;padding-bottom: 15px; margin-bottom: 40px">自主授权登陆</h4>
 
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.show">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.showone">
       <el-form-item label="税号" prop="nsrsbh">
         <el-input v-model="ruleForm.nsrsbh" placeholder="请输入纳税人识别号"></el-input>
       </el-form-item>
@@ -82,7 +82,7 @@
       </el-form-item>
     </el-form>
 
-    <el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="!ruleForm.show">
+    <el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.showtwo">
       <p style="text-align: center;margin-bottom: 30px">短信验证码已发送，请提交短信验证码</p>
       <el-form-item  prop="ruleForm.smsCode" style="height: 50px">
         <el-input v-model="ruleForm.smsCode" style="height: 30px;width: 60%;margin-left: 20%"></el-input>
@@ -92,6 +92,17 @@
       </el-form-item>
       <span @click="changeShow()" style="color: #787be8;text-decoration-line: underline;margin-left: 50%">返回授权</span>
     </el-form>
+
+    <el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.showthree">
+      <el-row>
+        <el-col :xl="12" :lg="12" >
+          <el-result icon="success" title="" subTitle="">
+          </el-result>
+        </el-col>
+      </el-row>
+      <p style="text-align: center;margin-bottom: 30px">授权成功,任务可能需要5-10分钟，请耐心等待...</p>
+      <span @click="changeShow()" style="color: #787be8;text-decoration-line: underline;margin-left: 50%">返回授权</span>
+    </el-form>
   </div>
 </template>
 
@@ -110,7 +121,9 @@
       return {
         ruleForm: {
           smsCode : "",
-          show : true,
+          showone : true,
+          showtwo : false,
+          showthree : false,
           nsrsbh: '',
           nsrdq: '',
           loginType: '1',
@@ -166,7 +179,9 @@
             login(this.ruleForm).then(res=>{
               if (res.code == 200){
                 this.ruleForm.traceno = res.msg;
-                this.ruleForm.show = false;
+                this.ruleForm.showone = false;
+                this.ruleForm.showtwo = true;
+                this.ruleForm.showthree = false;
               }else {
                 this.$alert("<font color='red'>登陆失败，失败原因"+res.msg+"</font>")
               }
@@ -180,13 +195,24 @@
       },
       submitFormWithMsgCode(){
         submitNote(this.ruleForm.traceno,this.ruleForm.nsrsbh,this.ruleForm.smsCode,this.ruleForm.nsrInfo.zjh)
-        .then();
+        .then(res=>{
+          if (res.code == "200"){
+            this.ruleForm.showone = false;
+            this.ruleForm.showtwo = false;
+            this.ruleForm.showthree = true;
+
+          }else {
+            alter("请求失败请重试")
+          }
+        });
       },
       resetForm(formName) {
         this.$refs[formName].resetFields();
       },
       changeShow(){
-        this.ruleForm.show = true;
+        this.ruleForm.showone = true;
+        this.ruleForm.showtwo = false;
+        this.ruleForm.showthree = false;
       }
     }