From 458ae1f76971883a62d0230d0e9e53196a8fc912 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 15 八月 2024 16:21:44 +0800
Subject: [PATCH] Merge branch 'hwh'
---
HTML/js/public.js | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HTML/js/public.js b/HTML/js/public.js
index 7438589..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';
}
@@ -203,9 +210,9 @@
var bodyHeight = $("#body").outerHeight();
var topHeight = $("#top").outerHeight();
var centerHeight = $("#center").outerHeight();
-// console.log(bodyHeight);
-// console.log(topHeight);
-// console.log(centerHeight);
+ console.log(bodyHeight);
+ console.log(topHeight);
+ console.log(centerHeight);
var hh = bodyHeight - topHeight-centerHeight - 26 ;//6鏄痓ody涓婂唴杈硅窛
return hh;
--
Gitblit v1.8.0