Przeglądaj źródła

fix: 登录没关联身份证的 点下次关联后进去页面

xuqiaoying 3 lat temu
rodzic
commit
127e56b9dc

+ 12 - 7
src/pages/home/index.vue

@@ -914,9 +914,10 @@ export default {
      * 微信登入—返回数据
      */
     wxLoginBack(res) {
+      localStorage.setItem("user_account", res.data.user_account);
+      localStorage.setItem("token", res.data.token);
       if (res.data.full_info) {
-        localStorage.setItem("user_account", res.data.user_account);
-        localStorage.setItem("token", res.data.token);
+        
         this.getInfo();
       } else {
         this.indexUserAccount = res.data.user_account;
@@ -1201,9 +1202,11 @@ export default {
           this.$request
             .login(loginForm)
             .then((res) => {
+              localStorage.setItem("user_account", res.data.user_account);
+              localStorage.setItem("token", res.data.token);
               if (res.data.full_info) {
-                localStorage.setItem("user_account", res.data.user_account);
-                localStorage.setItem("token", res.data.token);
+                // localStorage.setItem("user_account", res.data.user_account);
+                // localStorage.setItem("token", res.data.token);
 
                 this.getInfo();
               } else {
@@ -1271,10 +1274,11 @@ export default {
             .loginSms(this.loginSmsForm)
             .then((res) => {
               this.isloginSms = false;
+              localStorage.setItem("user_account", res.data.user_account);
+              localStorage.setItem("token", res.data.token);
+              this.$tools.setUuid(new Date().valueOf() + "");
               if (res.data.full_info) {
-                localStorage.setItem("user_account", res.data.user_account);
-                localStorage.setItem("token", res.data.token);
-                this.$tools.setUuid(new Date().valueOf() + "");
+                
                 this.getInfo();
               } else {
                 this.indexUserAccount = res.data.user_account;
@@ -1373,6 +1377,7 @@ export default {
       this.bindShow = false;
       this.indexToken = "";
       this.indexUserAccount = "";
+      this.getInfo();
     },
   },
 };

+ 33 - 28
src/pages/login/index.vue

@@ -974,17 +974,18 @@ export default {
      * 微信登入—返回数据
      */
     wxLoginBack(res) {
-      // if (res.data.full_info) {
-        localStorage.setItem("user_account", res.data.user_account);
-        localStorage.setItem("token", res.data.token);
-        this.$tools.setUuid(new Date().valueOf() + "");
+      localStorage.setItem("user_account", res.data.user_account);
+      localStorage.setItem("token", res.data.token);
+      this.$tools.setUuid(new Date().valueOf() + "");
+      if (res.data.full_info) {
+        
         this.getInfo();
-      // } else {
+      } else {
         this.user_account = res.data.user_account;
         this.token = res.data.token;
-        // this.islogin = false;
-        // this.state = 4;
-      // }
+        this.islogin = false;
+        this.state = 4;
+      }
     },
     /**
      * 账号密码登录
@@ -1001,18 +1002,19 @@ export default {
           this.$request
             .login(loginForm)
             .then((res) => {
-              // if (res.data.full_info) {
-                localStorage.setItem("user_account", res.data.user_account);
-                localStorage.setItem("token", res.data.token);
-                this.$tools.setUuid(new Date().valueOf() + "");
+              localStorage.setItem("user_account", res.data.user_account);
+              localStorage.setItem("token", res.data.token);
+              this.$tools.setUuid(new Date().valueOf() + "");
+              if (res.data.full_info) {
+                
                 this.getInfo();
-              // } else {
+              } else {
                 this.user_account = res.data.user_account;
                 this.token = res.data.token;
                 console.log(this.token);
-                // this.islogin = false;
-                // this.state = 4;
-              // }
+                this.islogin = false;
+                this.state = 4;
+              }
             })
             .catch((err) => {
               this.islogin = false;
@@ -1110,17 +1112,18 @@ export default {
           this.$request
             .loginSms(this.loginSmsForm)
             .then((res) => {
-              // if (res.data.full_info) {
-                localStorage.setItem("user_account", res.data.user_account);
-                localStorage.setItem("token", res.data.token);
-                this.$tools.setUuid(new Date().valueOf() + "");
+              localStorage.setItem("user_account", res.data.user_account);
+              localStorage.setItem("token", res.data.token);
+              this.$tools.setUuid(new Date().valueOf() + "");
+              if (res.data.full_info) {
+                
                 this.getInfo();
-              // } else {
+              } else {
                 this.user_account = res.data.user_account;
                 this.token = res.data.token;
-                // this.isloginSms = false;
-                // this.state = 4;
-              // }
+                this.isloginSms = false;
+                this.state = 4;
+              }
             })
             .catch((err) => {
               this.isloginSms = false;
@@ -1233,11 +1236,12 @@ export default {
       this.$request
         .login(loginForm)
         .then((res) => {
+          localStorage.setItem("user_account", res.data.user_account);
+          localStorage.setItem("token", res.data.token);
+          this.$tools.setUuid(new Date().valueOf() + "");
           if (res.data.full_info) {
             //信息完善,获取用户信息
-            localStorage.setItem("user_account", res.data.user_account);
-            localStorage.setItem("token", res.data.token);
-            this.$tools.setUuid(new Date().valueOf() + "");
+            
             this.getInfo();
           } else {
             //不完善,跳转完善信息页面
@@ -1279,7 +1283,8 @@ export default {
     },
 
     nextBind() {
-      this.state = 1;
+      // this.state = 1;
+      this.getInfo();
       this.user_account = "";
       this.token = "";
     },

+ 7 - 1
src/pages/person-center/my-course/components/AppointTest.vue

@@ -9,7 +9,7 @@
             :close-on-press-escape="false"
             :before-close="cancel"
         >
-            <div class="appoint-modal">
+            <div v-if="appointItem.examApplyGoodsList && appointItem.examApplyGoodsList.length" class="appoint-modal">
                 <div v-for="(appointChild, appointIndex) in appointItem.examApplyGoodsList" :key="appointIndex"  class="appoint_item" >
                     <div class="names">{{ appointChild.applyName }}</div>
                     <div class="btns" @click="confirmAppoint(appointChild)">预约</div>
@@ -23,6 +23,7 @@
                     {{ appointChild.applyName }}
                 </el-radio> -->
             </div>
+            <div v-else class="no_data">暂无考试预约~</div>
             <!-- <span slot="footer" class="dialog-footer">
                 <el-button @click="cancel()">取 消</el-button>
                 <el-button type="primary" @click="confirmAppoint">立即预约</el-button>
@@ -110,5 +111,10 @@ export default {
         color: #F67205;
         cursor: pointer;
     }
+    .no_data {
+        text-align: center;
+        font-size: 16px;
+        margin-bottom: 20px;
+    }
 }
 </style>