Merge branch 'wxw'

wxw

7 天以前 61c3051ac62f6bc15c885403a0b9bd53f0d1b7e0

 Pda/js/public.js

@@ -18,19 +18,19 @@
      if (!$.cookie('token')) {
         callbackFun("登录人信息已失效");
         try {
            parent.window.location.href = '/views/Login.html';
            parent.window.location.href = '/View/login.html';
         }
         catch (error) {
            window.location.href = '/views/Login.html';
            window.location.href = '/View/login.html';
         }
         return;
      }
      if (isTokenExpired($.cookie('token'))) {
         try {
            parent.window.location.href = '/views/Login.html';
            parent.window.location.href = '/View/login.html';
         }
         catch (error) {
            window.location.href = '/views/Login.html';
            window.location.href = '/View/login.html';
         }
         return;
      }
@@ -68,19 +68,19 @@
      if (!$.cookie('token')) {
         callbackFun("登录人信息已失效");
         try {
            parent.window.location.href = '/view/Login.html';
            parent.window.location.href = '/View/login.html';
         }
         catch (error) {
            window.location.href = '/view/Login.html';
            window.location.href = '/View/login.html';
         }
         return;
      }
      if (isTokenExpired($.cookie('token'))) {
         try {
            parent.window.location.href = '/view/Login.html';
            parent.window.location.href = '/View/login.html';
         }
         catch (error) {
            window.location.href = '/view/Login.html';
            window.location.href = '/View/login.html';
         }
         return;
      }