From 0bdb8f48bb875087e6afd7520518f20719fb9a24 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 17 Aug 2023 10:03:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E4=B8=BB=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jianshui-ui/src/views/freedom/login.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue
index 14f677c..4e0b76c 100644
--- a/jianshui-ui/src/views/freedom/login.vue
+++ b/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,13 +224,13 @@ 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"){
+            }else if(res.msg == "10011"){
               this.ruleForm.showone = false;
               this.ruleForm.showtwo = true;
               this.ruleForm.showthree = false;

From 3af57da77458ed3a34b03d5c8460778c334e9f1a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 17 Aug 2023 10:11:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E4=B8=BB=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jianshui-ui/src/views/freedom/login.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue
index 4e0b76c..e35a404 100644
--- a/jianshui-ui/src/views/freedom/login.vue
+++ b/jianshui-ui/src/views/freedom/login.vue
@@ -230,12 +230,6 @@ export default {
               this.ruleForm.showthree = true;
               this.loading = false;
               clearInterval(timer)
-            }else if(res.msg == "10011"){
-              this.ruleForm.showone = false;
-              this.ruleForm.showtwo = true;
-              this.ruleForm.showthree = false;
-              this.loading = false;
-              clearInterval(timer)
             }
           }).catch(()=>{
           this.ruleForm.showone = false;