From c5dc821692c0529e3a688af84c647bf80cc49360 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 10:49:40 +0800
Subject: [PATCH] Merge branch 'master' into djp
---
Pda/js/public.js | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Pda/js/public.js b/Pda/js/public.js
index 345f420..9f55680 100644
--- a/Pda/js/public.js
+++ b/Pda/js/public.js
@@ -1,7 +1,8 @@
// var IP = "http://47.104.149.73:1991";//鎺ュ彛IP
// var IP = "https://localhost:44368";
//var IP = "http://localhost:13243/api";
-var IP = "http://localhost:50515/api";
+//var IP = "http://localhost:50515/api";
+var IP = "https://localhost:44363/api";
//var IP = "http://192.168.1.2:8017/";
// var IP = "http://192.168.10.112/WmsService/";
// var IP = "http://192.168.1.226:8086";
@@ -18,19 +19,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 +69,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;
}
--
Gitblit v1.8.0