From 61f2b4493efea473f095d475afc37ef52f2763c0 Mon Sep 17 00:00:00 2001
From: txb <txbauo@163.com>
Date: Fri, 2 Dec 2022 15:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E6=9D=A8=E9=9C=84):=20?=
 =?UTF-8?q?=E6=9C=89=E4=BA=8B=E6=89=BE=E6=9D=A8=E9=9C=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.jsx                                   | 9 ++++++---
 src/pages/sys/deviceConfig/StockLoc/index.jsx | 2 +-
 src/pages/sys/sysSettings/components/base.jsx | 2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app.jsx b/src/app.jsx
index c119eb7..2ae1c01 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -983,10 +983,13 @@ export const layout = ({ initialState }) => {
       // children.pathname = history.location.pathname;
       console.log("11111",children);
       return (
-
-        <TagView children={children} home="/quickStart" current={history.location.pathname}>
-          {/* <PageContainer>{children}</PageContainer> */}
+        <>
+          {initialState?.currentUser && location.pathname !== loginPath ? (
+        <TagView  home="/quickStart" current={history.location.pathname}>
+          {children}
         </TagView>
+          ) : children}
+        </>
       );
     },
     // 自定义 403 页面
diff --git a/src/pages/sys/deviceConfig/StockLoc/index.jsx b/src/pages/sys/deviceConfig/StockLoc/index.jsx
index 4861cc0..8fdd56b 100644
--- a/src/pages/sys/deviceConfig/StockLoc/index.jsx
+++ b/src/pages/sys/deviceConfig/StockLoc/index.jsx
@@ -5,7 +5,7 @@ import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import ProDescriptions from '@ant-design/pro-descriptions';
 import CreateForm from './components/CreateForm';
-import { Add, Update, Delete, GetPage } from './services';
+import { Add, Delete, GetPage } from './services';
 
 const key = 'message';
 
diff --git a/src/pages/sys/sysSettings/components/base.jsx b/src/pages/sys/sysSettings/components/base.jsx
index 0ca864b..a57a709 100644
--- a/src/pages/sys/sysSettings/components/base.jsx
+++ b/src/pages/sys/sysSettings/components/base.jsx
@@ -9,8 +9,6 @@ import ProForm, {
   ProFormTextArea,
 } from '@ant-design/pro-form';
 import { useRequest } from 'umi';
-import { queryCurrent } from './service';
-import { queryProvince, queryCity } from './service';
 import styles from './BaseView.less';
 
 const validatorPhone = (rule, value, callback) => {