Merge branch 'beta' into xingze

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

@@ -48,7 +48,7 @@
       </el-form-item>
       <el-form-item label="登陆方式" prop="loginType">
         <el-select v-model="ruleForm.loginType" placeholder="" style="width: 100%">
-          <el-option label="账密手机号" value="1"></el-option>
+          <el-option label="账密" value="1"></el-option>
           <el-option label="扫码登陆" value="2"></el-option>
         </el-select>
       </el-form-item>
@@ -94,14 +94,14 @@
     </el-form>
 
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px" class="demo-ruleForm" size="medium" v-if="ruleForm.showthree">
-      <el-row>
+      <el-row style="margin-left: 500px">
         <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>
+      <span @click="changeShow()" style="color: #787be8;text-decoration-line: underline;margin-left: 48%">重新授权</span>
     </el-form>
   </div>
 </template>
@@ -121,8 +121,8 @@ export default {
     return {
       ruleForm: {
         smsCode : "",
-        showone : false,
-        showtwo : true,
+        showone : true,
+        showtwo : false,
         showthree : false,
         nsrsbh: '',
         nsrdq: '',
@@ -224,18 +224,12 @@ export default {
         // 这里ajax 请求的代码片段和判断是否停止定时器
         submitNoteResult(this.ruleForm.traceno,this.ruleForm.nsrsbh,this.ruleForm.smsCode,this.ruleForm.nsrInfo.zjh)
           .then(res=>{
-            if (res.msg == "10011"){
+            if (res.msg == "10012"){
               this.ruleForm.showone = false;
               this.ruleForm.showtwo = false;
               this.ruleForm.showthree = true;
               this.loading = false;
               clearInterval(timer)
-            }else if(res.msg == "10012"){
-              this.ruleForm.showone = false;
-              this.ruleForm.showtwo = true;
-              this.ruleForm.showthree = false;
-              this.loading = false;
-              clearInterval(timer)
             }
           }).catch(()=>{
           this.ruleForm.showone = false;