zhouna 3 سال پیش
والد
کامیت
d59d9c1aba
2فایلهای تغییر یافته به همراه6 افزوده شده و 39 حذف شده
  1. 1 2
      src/js/login.js
  2. 5 37
      src/js/utils.js

+ 1 - 2
src/js/login.js

@@ -16,7 +16,7 @@ $(function () {
   if (hideLogo || otherLogo) {
     $(".copy-right").text("");
   }
-  localStorage.removeItem('accessToken')
+  //localStorage.removeItem('accessToken')
   $(document).keyup(function (event) {
     if (event.keyCode == 13) {
       sureLogin()
@@ -51,7 +51,6 @@ function getSecurityCode() {
   xhr.send();
 }
 function getHospitalMark() {
-  
   post(api.getHospitalMark).then((res) => {
   const data = res.data;//{ code: 0, data: 0 }
   if (data.code == 0) {

+ 5 - 37
src/js/utils.js

@@ -141,41 +141,7 @@ const getUrlArgObjectNew = function (name, srcUrl) {
   return obj[name];
 };
 window.abortAjax = '';
-//显示登出提示:被挤和过期
-function alertQuitPop(msg, type) {
-  localStorage.removeItem('accessToken')
-  console.log('token已清除utils')
-  if (type) {     //父窗口请求登出
-    $.alerModal({
-      gobackBtn: true,
-      title: "提示",
-      type: "modal",
-      width: '470',
-      time: 1000,
-      cancalText: '我知道了',
-      sureBtn: false,
-      message: msg || '登录过期',
-      callback: function () {
-
-        //alert('跳回登录2')
-        // localStorage.removeItem('accessToken')
-        // if (window.parent) {
-        //   window.parent.window.location.href = 'login.html'
-        // } else {
-        //   window.location.href = 'login.html'
-        // }
-        window.location.href = 'login.html'
-      }
-    });
-  } else {    //子窗口请求登出
-    const dialogmessage = {
-      iframemessage: 1,
-      data: jsonres.msg
-    }
-    window.parent.postMessage(JSON.stringify(dialogmessage), '*')
-  }
 
-}
 const post = function (url, data, opts) {
   let isPlacefile = getCookie('isPlacefile') || 1;
   const token = localStorage.getItem('accessToken');
@@ -213,9 +179,11 @@ const post = function (url, data, opts) {
       })),
       contentType: 'application/json; charset=UTF-8',
       beforeSend: function (xmlHttp) {
-        xmlHttp.setRequestHeader('If-Modified-Since', '0');
-        xmlHttp.setRequestHeader('Cache-Control', 'no-cache');
-        xmlHttp.setRequestHeader('Authorization', token ? 'Bearer ' + token : '');
+        if(url.indexOf("sys/user/getHospitalMark")===-1){
+		  xmlHttp.setRequestHeader('If-Modified-Since', '0');
+		  xmlHttp.setRequestHeader('Cache-Control', 'no-cache');
+		  xmlHttp.setRequestHeader('Authorization', token ? 'Bearer ' + token : '');
+        }
       },
       success: function (res) {