From 8eeef19c7a9f9abf6c11e1440711bf05574d0df4 Mon Sep 17 00:00:00 2001 From: Youngster_yj <907985037@qq.com> Date: Thu, 18 Apr 2024 14:49:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=89=B9=E5=88=AB=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=B9=8B=E5=86=9C=E4=B8=9A=E9=93=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/renderer/src/main/src/pages/EnterpriseJudgeLogin.tsx | 4 ++-- app/renderer/src/main/src/pages/MainOperator.tsx | 6 +++--- app/renderer/src/main/src/utils/login.tsx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/renderer/src/main/src/pages/EnterpriseJudgeLogin.tsx b/app/renderer/src/main/src/pages/EnterpriseJudgeLogin.tsx index d9cd3a6d67..6ee5620769 100644 --- a/app/renderer/src/main/src/pages/EnterpriseJudgeLogin.tsx +++ b/app/renderer/src/main/src/pages/EnterpriseJudgeLogin.tsx @@ -16,7 +16,7 @@ const EnterpriseJudgeLogin: React.FC = (props) => { const {setJudgeLicense, setJudgeLogin} = props // License // const [licenseVerified, setLicenseVerified] = useState(false) - const [activateLicense, setActivateLicense] = useState(false) + const [activateLicense, setActivateLicense] = useState(true) const [loading, setLoading] = useState(true) const [licensePageLoading, setLicensePageLoading] = useState(false) useEffect(() => { @@ -95,7 +95,7 @@ const EnterpriseJudgeLogin: React.FC = (props) => { setJudgeLicense(false)} - skipShow={isEnpriTrace()||isEnpriTraceAgent()} + // skipShow={isEnpriTrace()||isEnpriTraceAgent()} /> ) : ( diff --git a/app/renderer/src/main/src/pages/MainOperator.tsx b/app/renderer/src/main/src/pages/MainOperator.tsx index fa6b471ade..d830596e83 100644 --- a/app/renderer/src/main/src/pages/MainOperator.tsx +++ b/app/renderer/src/main/src/pages/MainOperator.tsx @@ -429,11 +429,11 @@ const Main: React.FC = React.memo((props) => { if (isCommunityEdition()) { return "" } else if (userInfo.isLogin) { - return userInfo.companyName || "" + return "农业银行专用" } else if (isEnpriTrace()) { - return "EnpriTrace-试用版" + return "农业银行专用" } else if (isEnpriTraceAgent()) { - return "EnpriTraceAgent-试用版" + return "农业银行专用" } return "" } diff --git a/app/renderer/src/main/src/utils/login.tsx b/app/renderer/src/main/src/utils/login.tsx index a2835770dd..1ab3f6f6b1 100644 --- a/app/renderer/src/main/src/utils/login.tsx +++ b/app/renderer/src/main/src/utils/login.tsx @@ -2,7 +2,7 @@ import {UserInfoProps} from "@/store" import {NetWorkApi} from "@/services/fetch" import {API} from "@/services/swagger/resposeType" import {getRemoteValue} from "./kv" -import {globalUserLogout, isEnpriTraceAgent} from "@/utils/envfile" +import {globalUserLogout, isEnpriTrace, isEnpriTraceAgent} from "@/utils/envfile" import emiter from "./eventBus/eventBus" const {ipcRenderer} = window.require("electron") @@ -36,7 +36,7 @@ export const loginOutLocal = (userInfo: UserInfoProps) => { OnlineBaseUrl }) .finally(() => { - ipcRenderer.send("user-sign-out") + ipcRenderer.send("user-sign-out",{isEnpriTrace:isEnpriTrace()}) emiter.emit("onRefLocalPluginList", "") }) })