eoss-ui 0.6.40 → 0.6.41

package/lib/login.js

@@ -559,6 +559,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -612,8 +613,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;
@@ -4235,7 +4240,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=462127d5&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=68362bbf&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4332,7 +4337,8 @@ var render = function () {
                           },
                         },
                         [
-                          this.mode == "complex"
+                          this.mode == "complex" &&
+                          _vm.loginModel.indexOf("3") > -1
                             ? [
                                 _vm._l(_vm.switchs, function (item) {
                                   return [
@@ -4344,9 +4350,10 @@ var render = function () {
                                               {
                                                 name: "show",
                                                 rawName: "v-show",
-                                                value: _vm.active != item.type,
+                                                value:
+                                                  _vm.switchActive != item.type,
                                                 expression:
-                                                  "active != item.type",
+                                                  "switchActive != item.type",
                                               },
                                             ],
                                             key: item.type + "_0",
@@ -4400,42 +4407,76 @@ var render = function () {
                                   ]
                                 }),
                               ]
-                            : _vm._l(_vm.icons, function (item, index) {
-                                return _c(
-                                  "span",
-                                  {
-                                    directives: [
+                            : [
+                                _vm._l(_vm.icons, function (item) {
+                                  return [
+                                    _c(
+                                      "div",
                                       {
-                                        name: "show",
-                                        rawName: "v-show",
-                                        value:
-                                          _vm.modelLength > 2 ||
-                                          _vm.active != item.type,
-                                        expression:
-                                          "modelLength > 2 || active != item.type",
+                                        directives: [
+                                          {
+                                            name: "show",
+                                            rawName: "v-show",
+                                            value:
+                                              _vm.modelLength == 2 &&
+                                              _vm.active != item.type &&
+                                              _vm.modelTips,
+                                            expression:
+                                              "modelLength == 2 && active != item.type && modelTips",
+                                          },
+                                        ],
+                                        key: item.type,
+                                        staticClass: "es-login-model-item-tips",
                                       },
-                                    ],
-                                    key: index,
-                                    staticClass: "es-icon-box",
-                                    class: [
+                                      [
+                                        _vm._v(
+                                          "\n              " +
+                                            _vm._s(item.name) +
+                                            "点这里"
+                                        ),
+                                        _c("i", {
+                                          staticClass: "es-icon-zhixiangyou",
+                                        }),
+                                      ]
+                                    ),
+                                    _c(
+                                      "span",
                                       {
-                                        "es-icon-active":
-                                          _vm.active == item.type,
-                                      },
-                                    ],
-                                    attrs: {
-                                      title:
-                                        _vm.modelLength > 2 ? item.name : "",
-                                    },
-                                    on: {
-                                      click: function ($event) {
-                                        _vm.switchLogin(item)
+                                        directives: [
+                                          {
+                                            name: "show",
+                                            rawName: "v-show",
+                                            value:
+                                              _vm.modelLength > 2 ||
+                                              _vm.active != item.type,
+                                            expression:
+                                              "modelLength > 2 || active != item.type",
+                                          },
+                                        ],
+                                        key: item.name,
+                                        staticClass: "es-icon-box",
+                                        class: [
+                                          {
+                                            "es-icon-active":
+                                              _vm.active == item.type,
+                                          },
+                                        ],
+                                        attrs: { title: item.name },
+                                        on: {
+                                          click: function ($event) {
+                                            _vm.switchLogin(item)
+                                          },
+                                        },
                                       },
-                                    },
-                                  },
-                                  [_c("i", { class: [item.icon, "es-icon"] })]
-                                )
-                              }),
+                                      [
+                                        _c("i", {
+                                          class: [item.icon, "es-icon"],
+                                        }),
+                                      ]
+                                    ),
+                                  ]
+                                }),
+                              ],
                         ],
                         2
                       )
@@ -4956,7 +4997,9 @@ var render = function () {
                                       ]
                                     )
                                   : _vm._e(),
-                                _vm.active == 3 && _vm.mode == "complex"
+                                _vm.active == 3 &&
+                                _vm.loginModel.indexOf("0") > -1 &&
+                                _vm.mode == "complex"
                                   ? _c("div", { staticClass: "es-to-login" }, [
                                       _c(
                                         "span",
@@ -5387,7 +5430,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=462127d5&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=68362bbf&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(14);
@@ -6433,6 +6476,23 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6500,6 +6560,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       type: Boolean,
       default: true
     },
+    modelTips: Boolean,
     model: {
       type: Object,
       default: function _default() {
@@ -6746,10 +6807,14 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         0: { type: '0', icon: 'es-icon-zhanghaodenglu', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
         3: { type: '3', icon: 'es-icon-saomadenglu', name: '扫码登录' },
-        6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
+        6: { type: '6', icon: 'es-icon-duanxindenglu', name: '短信登录' },
         7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
         9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-        11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
+        11: {
+          type: '11',
+          icon: 'es-icon-youxiangdenglu',
+          name: '邮箱登录'
+        },
         12: { type: '12', icon: 'es-icon-zhanghaodenglu', name: '账号登录' //双因素
         } };
     },
@@ -6784,8 +6849,16 @@ var ceshi = util["a" /* default */].getParams('ceshi');
     loginModel: {
       immediate: true,
       handler: function handler(val) {
+        var _this2 = this;
+
         this.active = val.split(',')[0];
         this.title = this.iconfonts[this.active].name;
+        this.switchs.forEach(function (item) {
+          if (item.type == _this2.active) {
+            _this2.switchActive = item.type;
+            return;
+          }
+        });
       }
     },
     active: {
@@ -6951,7 +7024,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       loginBoxAlign && (this.align = loginBoxAlign);
     },
     doWechatLogin: function doWechatLogin(code) {
-      var _this2 = this;
+      var _this3 = this;
 
       util["a" /* default */].ajax({
         method: 'post',
@@ -6960,10 +7033,10 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }).then(function (res) {
         if (res.rCode == 0) {
           var results = res.results;
-          _this2.handleResults(results);
+          _this3.handleResults(results);
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this2.$message({
+          _this3.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
@@ -6977,7 +7050,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
@@ -7106,7 +7179,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }
     },
     switchLogin: function switchLogin(res) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (res != 1) {
         this.active = res.type;
@@ -7116,18 +7189,33 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
       this.$nextTick(function () {
-        var ref = 'login' + _this3.active;
-        _this3.$refs[ref] && _this3.$refs[ref].clearValidate();
+        var ref = 'login' + _this4.active;
+        _this4.$refs[ref] && _this4.$refs[ref].clearValidate();
       });
     },
     switchLoginType: function switchLoginType(res) {
-      var _this4 = this;
+      var _this5 = this;
 
       this.countdown = 0;
       if (res) {
-        this.active = res.type;
-        this.title = res.name || '';
         this.switchActive = res.type;
+        this.title = res.name || '';
+        if (this.loginModel.indexOf(res.type) > -1) {
+          this.active = res.type;
+        } else {
+          var other = this.switchs.filter(function (item) {
+            return item.type != res.type;
+          })[0];
+          var model = this.loginModel.split(',').filter(function (item) {
+            return item != res.type && item != other.type;
+          })[0];
+          if (model) {
+            this.active = model;
+            this.title = this.iconfonts[model].name;
+          } else {
+            console.error('complex风格的登录方式，loginModel配置错误！');
+          }
+        }
       } else {
         this.active = this.switchs[0].type;
         this.title = '';
@@ -7135,15 +7223,15 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }
       this.$emit('change-type', res, this.identifyingId);
       this.$nextTick(function () {
-        var ref = 'login' + _this4.active;
-        _this4.$refs[ref] && _this4.$refs[ref].clearValidate();
+        var ref = 'login' + _this5.active;
+        _this5.$refs[ref] && _this5.$refs[ref].clearValidate();
       });
     },
     isShow: function isShow(res) {
       return this.loginModel.indexOf(res) > -1;
     },
     getLogin: function getLogin() {
-      var _this5 = this;
+      var _this6 = this;
 
       return _asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee() {
         var config;
@@ -7154,10 +7242,10 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                 config = util["a" /* default */].getStorage('initLogin');
 
                 if (config) {
-                  _this5.setConfig(JSON.parse(config));
+                  _this6.setConfig(JSON.parse(config));
                 }
                 _context.next = 4;
-                return util["a" /* default */].ajax({ url: _this5.initLogin }).then(function (res) {
+                return util["a" /* default */].ajax({ url: _this6.initLogin }).then(function (res) {
                   if (res && res.rCode === 0) {
                     store["a" /* default */].set('initLogin', res.results);
                     util["a" /* default */].setStorage({
@@ -7165,10 +7253,10 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                       key: 'initLogin',
                       value: JSON.stringify(res.results)
                     });
-                    _this5.$emit('initLogin', res.results);
-                    _this5.setConfig(res.results);
+                    _this6.$emit('initLogin', res.results);
+                    _this6.setConfig(res.results);
                   } else {
-                    _this5.$message({
+                    _this6.$message({
                       message: res.msg || '系统错误，请联系管理员！',
                       type: 'error',
                       duration: 2000
@@ -7176,7 +7264,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                   }
                 }).catch(function (err) {
                   if (err.message && err.message !== 'canceled') {
-                    _this5.$message.error(err.message);
+                    _this6.$message.error(err.message);
                   }
                 });
 
@@ -7185,7 +7273,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                 return _context.stop();
             }
           }
-        }, _callee, _this5);
+        }, _callee, _this6);
       }))();
     },
     setConfig: function setConfig(res) {
@@ -7320,7 +7408,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       return this.imageCode;
     },
     getCode: function getCode() {
-      var _this6 = this;
+      var _this7 = this;
 
       if (this.countdown) {
         return false;
@@ -7362,14 +7450,14 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }
       this.countdown = 60;
       this.timer = setInterval(function () {
-        if (_this6.countdown > 0) {
-          _this6.countdown--;
-          _this6.disabled = true;
-          _this6.btnText = '重新获取' + _this6.countdown + 's';
+        if (_this7.countdown > 0) {
+          _this7.countdown--;
+          _this7.disabled = true;
+          _this7.btnText = '重新获取' + _this7.countdown + 's';
         } else {
-          _this6.btnText = '重新获取';
-          _this6.disabled = false;
-          _this6.submit = false;
+          _this7.btnText = '重新获取';
+          _this7.disabled = false;
+          _this7.submit = false;
         }
       }, 1000);
       util["a" /* default */].ajax({
@@ -7377,26 +7465,26 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         url: this.active == 12 ? this.getTwoFactorLoginCode : this.getLoginCode,
         data: data
       }).then(function (res) {
-        _this6.$message({
+        _this7.$message({
           message: res.msg,
           duration: 2000,
           type: res.rCode == 0 ? 'success' : 'error'
         });
 
         if (res.rCode === 2) {
-          _this6.btnText = '获取验证码';
-          _this6.disabled = false;
-          _this6.countdown = 0;
-          clearInterval(_this6.timer);
+          _this7.btnText = '获取验证码';
+          _this7.disabled = false;
+          _this7.countdown = 0;
+          clearInterval(_this7.timer);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     },
     handleLogin: function handleLogin() {
-      var _this7 = this;
+      var _this8 = this;
 
       if (this.submit) {
         return false;
@@ -7404,40 +7492,40 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       var ref = 'login' + this.active;
       this.$refs[ref].validate(function (valid) {
         if (valid) {
-          _this7.submit = true;
+          _this8.submit = true;
           var param = util["a" /* default */].getParams() || {};
-          var data = _this7.active == '0' ? {
-            username: _this7.formData.username,
-            password: _this7.secret && _this7.isEncrypt ? util["a" /* default */].esmEncrypt({
-              data: _this7.formData.password,
-              key: _this7.secret
-            }) : _this7.formData.password,
-            identifyingCode: _this7.formData.identifyingCode,
-            identifyingId: _this7.identifyingId
-          } : _this7.active == '12' ? {
-            username: _this7.formData.username,
-            password: _this7.secret && _this7.isEncrypt ? util["a" /* default */].esmEncrypt({
-              data: _this7.formData.password,
-              key: _this7.secret
-            }) : _this7.formData.password,
-            targetType: _this7.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
-            verificationCode: _this7.formData.identifyingCode
+          var data = _this8.active == '0' ? {
+            username: _this8.formData.username,
+            password: _this8.secret && _this8.isEncrypt ? util["a" /* default */].esmEncrypt({
+              data: _this8.formData.password,
+              key: _this8.secret
+            }) : _this8.formData.password,
+            identifyingCode: _this8.formData.identifyingCode,
+            identifyingId: _this8.identifyingId
+          } : _this8.active == '12' ? {
+            username: _this8.formData.username,
+            password: _this8.secret && _this8.isEncrypt ? util["a" /* default */].esmEncrypt({
+              data: _this8.formData.password,
+              key: _this8.secret
+            }) : _this8.formData.password,
+            targetType: _this8.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS',
+            verificationCode: _this8.formData.identifyingCode
           } : {
-            target: _this7.formData.target,
-            verificationCode: _this7.formData.verificationCode,
-            targetType: _this7.active == '6' ? 'SMS' : 'EMAIL'
+            target: _this8.formData.target,
+            verificationCode: _this8.formData.verificationCode,
+            targetType: _this8.active == '6' ? 'SMS' : 'EMAIL'
           };
-          if (_this7.onLogin) {
-            if (_this7.active == '0') {
-              _this7.onLogin(mainvue_type_script_lang_js_extends({}, param, data), _this7.getImgCode, _this7.handleRemember);
+          if (_this8.onLogin) {
+            if (_this8.active == '0') {
+              _this8.onLogin(mainvue_type_script_lang_js_extends({}, param, data), _this8.getImgCode, _this8.handleRemember);
             } else {
-              _this7.onLogin(mainvue_type_script_lang_js_extends({}, param, data));
+              _this8.onLogin(mainvue_type_script_lang_js_extends({}, param, data));
             }
           } else {
-            _this7.handleUserLogin(mainvue_type_script_lang_js_extends({}, param, _this7.param, data));
+            _this8.handleUserLogin(mainvue_type_script_lang_js_extends({}, param, _this8.param, data));
           }
         } else {
-          _this7.submit = false;
+          _this8.submit = false;
           return false;
         }
       });
@@ -7453,7 +7541,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }
     },
     handleUserLogin: function handleUserLogin(data) {
-      var _this8 = this;
+      var _this9 = this;
 
       var extUserBindHandleId = sessionStorage.getItem('extUserBindHandleId');
       util["a" /* default */].ajax({
@@ -7461,68 +7549,68 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         url: this.active == '0' ? this.actionUrl : this.active == '12' ? this.doTwoFactorLogin : this.doCodeLogin,
         data: extUserBindHandleId ? mainvue_type_script_lang_js_extends({}, data, { extUserBindHandleId: extUserBindHandleId }) : data
       }).then(function (res) {
-        _this8.submit = false;
+        _this9.submit = false;
         if (res.rCode == 0) {
           util["a" /* default */].removeStorage('extUserBindHandleId');
-          _this8.handleRemember();
+          _this9.handleRemember();
           var results = res.results;
-          _this8.handleResults(results);
-          if (_this8.onSuccess) {
-            _this8.onSuccess(res);
+          _this9.handleResults(results);
+          if (_this9.onSuccess) {
+            _this9.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this8.$message({
+          _this9.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this8.btnText = '获取验证码';
-              _this8.disabled = false;
-              _this8.countdown = 0;
-              clearInterval(_this8.timer);
-              _this8.getImgCode();
+              _this9.btnText = '获取验证码';
+              _this9.disabled = false;
+              _this9.countdown = 0;
+              clearInterval(_this9.timer);
+              _this9.getImgCode();
             }
           });
-          _this8.onError(res);
+          _this9.onError(res);
         }
       }).catch(function (err) {
-        _this8.submit = false;
+        _this9.submit = false;
         if (err.message && err.message !== 'canceled') {
-          _this8.$message.error(err.message);
+          _this9.$message.error(err.message);
         }
       });
     },
     caLogin: function caLogin(signedData) {
-      var _this9 = this;
+      var _this10 = this;
 
       util["a" /* default */].ajax({
         method: 'post',
         url: this.caAction,
         data: { identifyingId: this.identifyingId, signedData: signedData }
       }).then(function (res) {
-        _this9.submit = false;
+        _this10.submit = false;
         if (res.rCode == 0) {
           var results = res.results;
-          _this9.handleResults(results);
-          if (_this9.onSuccess) {
-            _this9.onSuccess(res);
+          _this10.handleResults(results);
+          if (_this10.onSuccess) {
+            _this10.onSuccess(res);
           }
         } else {
           var msg = res.results && res.results.msg ? res.results.msg : res.msg;
-          _this9.$message({
+          _this10.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
-              _this9.getImgCode();
+              _this10.getImgCode();
             }
           });
-          _this9.onError(res);
+          _this10.onError(res);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this9.$message.error(err.message);
+          _this10.$message.error(err.message);
         }
       });
     },
@@ -7539,17 +7627,17 @@ var ceshi = util["a" /* default */].getParams('ceshi');
 
     //获取app登录信息
     loginInfo: function loginInfo(res) {
-      var _this10 = this;
+      var _this11 = this;
 
       clearTimeout(this.interval);
       if (res) {
         this.interval = setTimeout(function () {
-          _this10.initRequestLoginInfo();
+          _this11.initRequestLoginInfo();
         }, this.scanIntervalTime);
       }
     },
     initRequestLoginInfo: function initRequestLoginInfo() {
-      var _this11 = this;
+      var _this12 = this;
 
       if (this.identifyingId == '') {
         return false;
@@ -7564,21 +7652,21 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this11.interval);
-            _this11.handleResults(results, 3);
+            clearTimeout(_this12.interval);
+            _this12.handleResults(results, 3);
           } else {
-            _this11.loginInfo(true);
+            _this12.loginInfo(true);
           }
         }
       }).catch(function (err) {
-        clearTimeout(_this11.interval);
+        clearTimeout(_this12.interval);
         if (err.message && err.message !== 'canceled') {
-          _this11.$message.error(err.message);
+          _this12.$message.error(err.message);
         }
       });
     },
     handleResults: function handleResults(results, type) {
-      var _this12 = this;
+      var _this13 = this;
 
       switch (results.statusCode) {
         case 0:
@@ -7603,9 +7691,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
             });
             this.showLaunch = true;
             setTimeout(function () {
-              if (_this12.toUrl) {
-                window.location.href = _this12.toUrl;
-              } else if (results.doorIndex && _this12.doorIndex) {
+              if (_this13.toUrl) {
+                window.location.href = _this13.toUrl;
+              } else if (results.doorIndex && _this13.doorIndex) {
                 sessionStorage.setItem('doorIndex', results.doorIndex);
                 localStorage.setItem('isLogined', true);
                 window.location.href = results.doorIndex;
@@ -7613,9 +7701,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                 if (window.location.href.indexOf('login.html') > -1) {
                   window.location.href = './main.html';
                 } else {
-                  _this12.$router.push({ name: 'main' });
-                  _this12.$nextTick(function () {
-                    _this12.showLaunch = false;
+                  _this13.$router.push({ name: 'main' });
+                  _this13.$nextTick(function () {
+                    _this13.showLaunch = false;
                   });
                 }
               }
@@ -7626,9 +7714,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
               type: 'success',
               duration: 1500,
               onClose: function onClose() {
-                if (_this12.toUrl) {
-                  window.location.href = _this12.toUrl;
-                } else if (results.doorIndex && _this12.doorIndex) {
+                if (_this13.toUrl) {
+                  window.location.href = _this13.toUrl;
+                } else if (results.doorIndex && _this13.doorIndex) {
                   sessionStorage.setItem('doorIndex', results.doorIndex);
                   localStorage.setItem('isLogined', true);
                   window.location.href = results.doorIndex;
@@ -7636,7 +7724,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                   if (window.location.href.indexOf('login.html') > -1) {
                     window.location.href = './main.html';
                   } else {
-                    _this12.$router.push({ name: 'main' });
+                    _this13.$router.push({ name: 'main' });
                   }
                 }
               }
@@ -7649,11 +7737,11 @@ var ceshi = util["a" /* default */].getParams('ceshi');
             //cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this12.operationCheckCode = results.checkCode;
-            if (typeof _this12.forgetUrl === 'string') {
-              util["a" /* default */].win.open(_this12.forgetUrl);
+            _this13.operationCheckCode = results.checkCode;
+            if (typeof _this13.forgetUrl === 'string') {
+              util["a" /* default */].win.open(_this13.forgetUrl);
             } else {
-              _this12.showResetPassword = true;
+              _this13.showResetPassword = true;
             }
           }).catch(function (e) {});
           break;
@@ -7694,13 +7782,13 @@ var ceshi = util["a" /* default */].getParams('ceshi');
               type: 'error',
               duration: 1500,
               onClose: function onClose() {
-                if (_this12.code) {
+                if (_this13.code) {
                   window.location.href = util["a" /* default */].delUrlParam({ key: 'code' });
                   if (window.location.hash) {
                     location.reload();
                   }
                 } else {
-                  _this12.getImgCode();
+                  _this13.getImgCode();
                 }
               }
             });
@@ -7710,15 +7798,15 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }
     },
     handleAssistance: function handleAssistance(data) {
-      var _this13 = this;
+      var _this14 = this;
 
       clearTimeout(this.doAssistance);
       this.doAssistance = setTimeout(function () {
-        _this13.doAssistanceLogin(data);
+        _this14.doAssistanceLogin(data);
       }, this.scanIntervalTime);
     },
     doAssistanceLogin: function doAssistanceLogin(data) {
-      var _this14 = this;
+      var _this15 = this;
 
       util["a" /* default */].ajax({
         method: 'post',
@@ -7728,19 +7816,19 @@ var ceshi = util["a" /* default */].getParams('ceshi');
         if (res.rCode === 0) {
           var results = res.results;
           if (results.statusCode === 0) {
-            clearTimeout(_this14.doAssistance);
-            _this14.handleResults(results, 3);
+            clearTimeout(_this15.doAssistance);
+            _this15.handleResults(results, 3);
           } else {
-            _this14.handleAssistance(data);
+            _this15.handleAssistance(data);
           }
         } else {
-          clearTimeout(_this14.doAssistance);
-          _this14.$message.error(res.msg);
+          clearTimeout(_this15.doAssistance);
+          _this15.$message.error(res.msg);
         }
       }).catch(function (err) {
-        clearTimeout(_this14.doAssistance);
+        clearTimeout(_this15.doAssistance);
         if (err.message && err.message !== 'canceled') {
-          _this14.$message.error(err.message);
+          _this15.$message.error(err.message);
         }
       });
     },