cloud-web-corejs 1.0.54-dev.198 → 1.0.54-dev.199

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.198",
+  "version": "1.0.54-dev.199",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/views/user/login/indexMixin.js

@@ -454,14 +454,12 @@ export default {
     },
     initQR() {
       this.clearQrLoginTimer();
-      this.qrCodeFlag = 0;
-      this.qrExpired = false;
+      this.qrExpired = true;
       let option = {width: 300, height: 300};
       this.qrContent = this.guid();
       this.createQR(this.qrContent, option).then(url => {
         this.qrExpired = false;
         this.qrBase64 = url
-        this.qrCodeFlag = 1;
         this.createQrLoginTimer();
       })
     },
@@ -484,7 +482,7 @@ export default {
     },
     clearQrLoginTimer() {
       if (this.qrTimer1) {
-        clearInterval(this.qrTimer1)
+        clearTimeout(this.qrTimer1)
         this.qrTimer1 = null;
       }
       if (this.qrTimer2) {
@@ -493,18 +491,21 @@ export default {
       }
     },
     createQrLoginTimer() {
-      this.qrTimer1 = setInterval(() => {
-        this.checkQrLoginStatus();
-      }, 3000)
+      this.checkQrLoginTimerHanlde()
       this.qrTimer2 = setTimeout(() => {
-        debugger
         this.qrExpired = true;
         this.clearQrLoginTimer();
-      }, 60000)
+      }, 10000)
+    },
+    checkQrLoginTimerHanlde() {
+      this.qrTimer1 = setTimeout(() => {
+        this.checkQrLoginStatusHanlde();
+      }, 3000)
     },
-    checkQrLoginStatus() {
-      if (this.qrExpired) return
-      if (this.qrCodeFlag !== 1) return
+    checkQrLoginStatusHanlde() {
+      if (this.qrExpired) {
+        return
+      }
       this.$http({
         url: USER_PREFIX + '/auth/login',
         method: `post`,
@@ -526,6 +527,8 @@ export default {
               window.removeEventListener('keydown', this.keyDown, false);
               this.handleRedirectUrl();
             });
+          } else {
+            this.checkQrLoginTimerHanlde();
           }
         }
       });