eoss-ui 0.4.58 → 0.4.59

package/lib/input-number.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {

package/lib/input.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -2943,7 +2956,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     readonly: Boolean,
     plain: Boolean,
     text: [String, Number],
-    scope: {}
+    scope: {},
+    exclude: Boolean
   },
   data: function data() {
     return {
@@ -3036,12 +3050,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       }
     },
     searchFilter: function searchFilter(query) {
+      var _this3 = this;
+
       return function (state) {
-        return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+        if (_this3.exclude) {
+          return state.value.toLowerCase().indexOf(query.toLowerCase()) === -1;
+        } else {
+          return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+        }
       };
     },
     renderd: function renderd(doms, h, type) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (typeof this.$attrs[type] === 'boolean') {
         if (this.$attrs.render) {
@@ -3067,8 +3087,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
           domProps: this.$attrs[type].icon ? { innerHTML: this.$attrs[type].icon } : {},
           on: {
             click: function click() {
-              _this3.$attrs[type].click && _this3.$attrs[type].click(_this3, _this3.model, _this3.scope);
-              _this3.$attrs[type].event && _this3.$attrs[type].event(_this3, _this3.model, _this3.scope);
+              _this4.$attrs[type].click && _this4.$attrs[type].click(_this4, _this4.model, _this4.scope);
+              _this4.$attrs[type].event && _this4.$attrs[type].event(_this4, _this4.model, _this4.scope);
             }
           }
         }, [this.$attrs[type].text]));

package/lib/login.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -2858,7 +2871,7 @@ function normalizeComponent(
 // 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=49ebf1b6&
+// 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=6f4e7cde&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2988,16 +3001,19 @@ var render = function () {
                                   },
                                   [
                                     _c(
-                                      "el-input",
+                                      "es-input",
                                       {
                                         attrs: {
                                           size: "large",
                                           type: "text",
                                           name: "username",
+                                          exclude: "",
                                           placeholder: _vm.username.placeholder,
+                                          focusShow: _vm.focusShow,
+                                          data: _vm.users,
                                           autocomplete: "off",
                                         },
-                                        on: { blur: _vm.handleBlur },
+                                        on: { select: _vm.handleBlur },
                                         model: {
                                           value: _vm.formData.username,
                                           callback: function ($$v) {
@@ -3207,9 +3223,11 @@ var render = function () {
                                             name: "show",
                                             rawName: "v-show",
                                             value:
-                                              _vm.remember && _vm.active == "0",
+                                              _vm.remember &&
+                                              (_vm.active == "0" ||
+                                                _vm.active == "12"),
                                             expression:
-                                              "remember && active == '0'",
+                                              "remember && (active == '0' || active == '12')",
                                           },
                                         ],
                                         model: {
@@ -3297,6 +3315,10 @@ var render = function () {
                                                 {
                                                   staticClass:
                                                     "es-login-app-name es-pointer",
+                                                  attrs: {
+                                                    target: "_blank",
+                                                    href: _vm.downloadApp,
+                                                  },
                                                 },
                                                 [
                                                   _vm._v(
@@ -3415,7 +3437,6 @@ var render = function () {
                                               : _vm.email.placeholder,
                                           autocomplete: "off",
                                         },
-                                        on: { blur: _vm.handleBlur },
                                         model: {
                                           value: _vm.formData.target,
                                           callback: function ($$v) {
@@ -3708,7 +3729,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=49ebf1b6&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=6f4e7cde&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -4443,6 +4464,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 
@@ -4490,7 +4517,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       default: function _default() {
         return {
           placeholder: '请输入账号',
-          rules: [{ required: true, message: '账号不能为空', trigger: 'blur' }]
+          rules: [{ required: true, message: '账号不能为空', trigger: 'change' }]
         };
       }
     },
@@ -4612,6 +4639,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       default: true
     },
     downloadApp: String,
+    downLoadUrls: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
     onDownLoadApp: [Function, Boolean],
     redirect_uri: String,
     position: {
@@ -4757,7 +4790,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     checked: function checked(val) {
       if (!val) {
         localStorage.removeItem('unpd');
-        localStorage.removeItem('remember');
+        //localStorage.removeItem('remember');
       }
     },
 
@@ -4785,6 +4818,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       submit: false,
       checked: false,
       formData: this.model,
+      focusShow: false,
+      users: [],
       imageCode: '',
       secret: null,
       identifyingId: '',
@@ -4876,27 +4911,38 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       return url;
     },
     getRemember: function getRemember(user) {
-      if (!user) {
-        user = localStorage.getItem('remember');
-        if (user) {
-          user = util["a" /* default */].esDecode(user);
-        } else {
-          return false;
-        }
-      }
       var values = localStorage.getItem('unpd');
       var value = {};
       if (values) {
         try {
           values = JSON.parse(values);
+          var users = [];
           for (var i in values) {
-            value[util["a" /* default */].esDecode(i)] = util["a" /* default */].esDecode(values[i]);
+            var k = util["a" /* default */].esDecode(i);
+            value[k] = util["a" /* default */].esDecode(values[i]);
+            users.push({ value: k });
           }
-          if (value[user]) {
+          this.users = users;
+          var keys = Object.keys(value);
+          if (keys.length) {
             this.checked = true;
           }
-          this.$set(this.formData, 'username', user);
-          this.$set(this.formData, 'password', value[user]);
+          if (!user && keys.length == 1) {
+            user = keys[0];
+            // user = localStorage.getItem('remember');
+            // if (user) {
+            //   user = util.esDecode(user);
+            // } else {
+            //   user = keys[0];
+            // }
+          }
+          if (keys.length > 1) {
+            this.focusShow = true;
+          }
+          if (user) {
+            this.$set(this.formData, 'username', user);
+            this.$set(this.formData, 'password', value[user]);
+          }
         } catch (error) {
           localStorage.removeItem('unpd');
         }
@@ -4917,7 +4963,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         }
       }
       if (this.checked) {
-        localStorage.setItem('remember', util["a" /* default */].esEncode(this.formData.username));
+        //localStorage.setItem('remember', util.esEncode(this.formData.username));
         value[this.formData.username] = this.formData.password;
         var data = {};
         for (var _i in value) {
@@ -4935,7 +4981,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         } else {
           localStorage.removeItem('unpd');
         }
-        localStorage.removeItem('remember');
+        //localStorage.removeItem('remember');
       }
     },
 
@@ -4956,7 +5002,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
         this.active = res;
-        this.formData = JSON.parse(JSON.stringify(this.defaultModel));
+        Object.keys(this.defaultModel).length && (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
       }
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
@@ -4998,10 +5044,22 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       var host = util["a" /* default */].getStorage('host');
       this.identifyingId = res.identifyingId;
       this.getImgCode();
-      this.download = {
-        android: res.androidDownloadUrl,
-        ios: res.iosDownloadUrl || res.iosDownloadUrl2
-      };
+      var downloads = {};
+      if (res.androidDownloadUrl) {
+        downloads['android'] = res.androidDownloadUrl;
+      }
+      if (res.iosDownloadUrl || res.iosDownloadUrl2) {
+        downloads['ios'] = res.iosDownloadUrl || res.iosDownloadUrl2;
+      }
+      if (res.macDownloadUrl) {
+        downloads['mac'] = res.macDownloadUrl;
+      }
+      if (res.winDownloadUrl) {
+        downloads['win'] = res.winDownloadUrl;
+      }
+      if (res.linuxDownloadUrl) {
+        downloads['linux'] = res.linuxDownloadUrl;
+      }
       this.secret = res.secret;
       this.setup = res.setup;
       this.sysName = res.subsystemName;
@@ -5036,10 +5094,20 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
           util["a" /* default */].updateTheme(res.subsystemExtend.themeColor);
           localStorage.setItem('theme', res.subsystemExtend.themeColor);
         }
+        if (res.subsystemExtend.macDownloadUrl) {
+          downloads.mac = res.subsystemExtend.macDownloadUrl;
+        }
+        if (res.subsystemExtend.winDownloadUrl) {
+          downloads.win = res.subsystemExtend.winDownloadUrl;
+        }
+        if (res.subsystemExtend.linuxDownloadUrl) {
+          downloads.linux = res.subsystemExtend.linuxDownloadUrl;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
       this.wechatScope = res.wechatScope;
+      this.download = mainvue_type_script_lang_js_extends({}, this.downLoadUrls, downloads);
       if (res.sysLogoIco) {
         util["a" /* default */].setFavicon(res.sysLogoIco);
       }

package/lib/main.js

@@ -263,20 +263,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -2919,7 +2932,7 @@ module.exports = require("stompjs");
 // 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/main/src/main.vue?vue&type=template&id=558be874&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=134babd4&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3347,10 +3360,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=558be874&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=134babd4&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
-var userinfovue_type_template_id_327101d6_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=2c2316da&
+var userinfovue_type_template_id_2c2316da_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3366,11 +3379,11 @@ var userinfovue_type_template_id_327101d6_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_327101d6_staticRenderFns = []
-userinfovue_type_template_id_327101d6_render._withStripped = true
+var userinfovue_type_template_id_2c2316da_staticRenderFns = []
+userinfovue_type_template_id_2c2316da_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=327101d6&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=2c2316da&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3706,7 +3719,22 @@ var util = __webpack_require__(0);
               closeOnClickModal: false,
               type: 'warning'
             }).then(function () {
-              if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+              var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
+              if (loginPage) {
+                var src = void 0;
+                if (!util["a" /* default */].startWith(loginPage, ['http', '/'])) {
+                  var pathname = util["a" /* default */].win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                util["a" /* default */].win.top.location.href = src;
+              } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
                 util["a" /* default */].win.top.location.href = './login.html';
               } else {
                 var hash = util["a" /* default */].win.top.location.hash;
@@ -3714,12 +3742,7 @@ var util = __webpack_require__(0);
                   var len = util["a" /* default */].win.top.location.href.indexOf(hash);
                   util["a" /* default */].win.top.location.href = util["a" /* default */].win.location.href.slice(0, len) + '#/login';
                 } else {
-                  var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
-                  if (loginPage) {
-                    util["a" /* default */].win.top.location.href = loginPage;
-                  } else {
-                    util["a" /* default */].win.top.location.href = '/login.html';
-                  }
+                  util["a" /* default */].win.top.location.href = '/login.html';
                 }
               }
             }).catch(function (e) {});
@@ -3779,8 +3802,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_327101d6_render,
-  userinfovue_type_template_id_327101d6_staticRenderFns,
+  userinfovue_type_template_id_2c2316da_render,
+  userinfovue_type_template_id_2c2316da_staticRenderFns,
   false,
   null,
   null,
@@ -6832,21 +6855,30 @@ var log = util["a" /* default */].getParams('console');
       }
       this.$confirm(msg, btn).then(function () {
         util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-        if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+        var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
+        if (loginPage) {
+          var src = void 0;
+          if (!util["a" /* default */].startWith(loginPage, ['http', '/'])) {
+            var pathname = util["a" /* default */].win.top.location.pathname;
+            if (pathname !== '/') {
+              pathname = pathname.split('/');
+              pathname.splice(pathname.length - 1);
+              pathname = pathname.join('/');
+            }
+            src = pathname + loginPage.replace('./', '');
+          } else {
+            src = loginPage;
+          }
+          util["a" /* default */].win.top.location.href = src;
+        } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
           util["a" /* default */].win.top.location.href = './login.html';
         } else {
           var hash = util["a" /* default */].win.top.location.hash;
           if (hash) {
             var len = util["a" /* default */].win.top.location.href.indexOf(hash);
-            var href = util["a" /* default */].win.top.location.href.slice(0, len) + '#/login';
-            util["a" /* default */].win.top.location.href = href;
+            util["a" /* default */].win.top.location.href = util["a" /* default */].win.location.href.slice(0, len) + '#/login';
           } else {
-            var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
-            if (loginPage) {
-              util["a" /* default */].win.top.location.href = loginPage;
-            } else {
-              util["a" /* default */].win.top.location.href = '/login.html';
-            }
+            util["a" /* default */].win.top.location.href = '/login.html';
           }
         }
       }).catch(function (e) {});

package/lib/mainComp.js

@@ -263,20 +263,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {

package/lib/nav.js

@@ -264,20 +264,33 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                  }
+                  src = pathname + loginPage.replace('./', '');
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {