From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
HTML/js/public.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index f209f46..59bbbe0 100644
--- a/HTML/js/public.js
+++ b/HTML/js/public.js
@@ -38,8 +38,15 @@
if (url!=IP+"/WeatherForecast/Login") {
if (!$.cookie('token')) {
callbackFun("鐧诲綍浜轰俊鎭凡澶辨晥");
+ try{
+ parent.window.location.href = '/views/Login.html';
+ }
+ catch(error){
+ window.location.href = '/views/Login.html';
+ }
+ return;
}
- if(isExpired = isTokenExpired($.cookie('token'))){
+ if(isTokenExpired($.cookie('token'))){
try{
parent.window.location.href = '/views/Login.html';
}
--
Gitblit v1.8.0