diff --git a/login.html b/login.html
index b9a946c..6afe926 100644
--- a/login.html
+++ b/login.html
@@ -104,6 +104,8 @@
$('#verifyCode').val('')
if(data && data.code){
if(data.code=='200'){
+ localStorage.setItem("public_token",data.data.access_token);
+ localStorage.setItem("auth_type",data.data.user.dataType)
//登录成功
window.location.href="home.html";
}else{
diff --git a/smz-screen/js/core/public.js b/smz-screen/js/core/public.js
index 8f434b6..94d31cf 100644
--- a/smz-screen/js/core/public.js
+++ b/smz-screen/js/core/public.js
@@ -7,16 +7,16 @@ let content_path="smz_screen"
// var dataUrl ="http://140.210.195.210:1917/gzrmw/";//部署
// var dataUrl ="http://140.210.195.210:1921/gzrmw/";//CS部署
-var token=localStorage.getItem('token');
+var token=localStorage.getItem('smzweb-token');
var companyId=localStorage.getItem('companyId');
$(function() {
-
+ debugger
// 全局配置所有AJAX请求
$.ajaxSetup({
// 对所有类型的请求(GET/POST/PUT/DELETE等)生效
beforeSend: function(xhr) {
// 从本地存储获取Token
- const token = localStorage.getItem('token') || sessionStorage.getItem('token');
+ const token = localStorage.getItem('smzweb-token');
if (token) {
// 为所有请求添加Token头
xhr.setRequestHeader('x-auth-token', token);
@@ -25,10 +25,10 @@ $(function() {
// 全局错误处理(可选,统一处理401等错误)
error: function(xhr) {
if (xhr.status === 401) {
- // Token无效或过期,跳转登录页
- localStorage.removeItem('token');
- sessionStorage.removeItem('token');
- window.location.href =contant_path+ '/login.html';
+ //Token无效或过期,跳转登录页
+ localStorage.removeItem('smzweb-token');
+ sessionStorage.removeItem('smzweb-token');
+ window.location.href="../../../login.html";
}
}
});
@@ -38,8 +38,7 @@ $(function() {
headHTML += '';
document.getElementsByTagName('head')[0].innerHTML = headHTML;
if(token=="" || token==null){
- window.location.href =contant_path+"/login.html";//线上
-
+ // window.location.href="../../../login.html";
}
})
function isNull(str) {
diff --git a/smz-screen/js/home/home.js b/smz-screen/js/home/home.js
index 6676e31..e4fbde2 100644
--- a/smz-screen/js/home/home.js
+++ b/smz-screen/js/home/home.js
@@ -79,7 +79,7 @@ function getAgeStructureList(){
// 手动添加请求头
beforeSend: function(xhr) {
// 从本地存储获取token(确保登录后已保存)
- const token = localStorage.getItem('token') || sessionStorage.getItem('token');
+ const token = localStorage.getItem('smzweb-token') || sessionStorage.getItem('smzweb-token');
if (token) {
xhr.setRequestHeader('x-auth-token', token); // 与后端配置的头名一致
}
diff --git a/smz-screen/js/index/login.js b/smz-screen/js/index/login.js
index ab558f9..e592cce 100644
--- a/smz-screen/js/index/login.js
+++ b/smz-screen/js/index/login.js
@@ -94,7 +94,7 @@ function login() {
} else {
var token = data.user.token;
var companyId = data.user.companyId;
- localStorage.setItem('token', token);
+ localStorage.setItem('smzweb-token', token);
localStorage.setItem('companyId', companyId);
localStorage.setItem('remeberName', jzname);
localStorage.setItem('userName', uName);