From e1b20f71e8cef0da9e233f39ff168d8140e447d2 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Tue, 26 Sep 2023 16:21:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/Layout.vue                           | 2 +-
 src/layout/components/UserInfo/src/UserInfo.vue | 4 ++--
 src/views/Login/components/LoginForm.vue        | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 43f9b69dd..420341e64 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -59,7 +59,7 @@ export default defineComponent({
 
         <Backtop></Backtop>
 
-        <Setting></Setting>
+        {/* <Setting></Setting> */}
       </section>
     )
   }
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index a5a92da3a..3c03ea7d2 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -64,10 +64,10 @@ const toDocument = () => {
           <Icon icon="ep:tools" />
           <div @click="toProfile">{{ t('common.profile') }}</div>
         </ElDropdownItem>
-        <ElDropdownItem>
+        <!-- <ElDropdownItem>
           <Icon icon="ep:menu" />
           <div @click="toDocument">{{ t('common.document') }}</div>
-        </ElDropdownItem>
+        </ElDropdownItem> -->
         <ElDropdownItem divided @click="loginOut">
           <Icon icon="ep:switch-button" />
           <div>{{ t('common.loginOut') }}</div>
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 30a7ab7cc..ebc0989a4 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -60,17 +60,17 @@
             :title="t('login.login')"
             class="w-[100%]"
             type="primary"
-            @click="getCode()"
+            @click="handleLogin"
           />
         </el-form-item>
       </el-col>
-      <Verify
+      <!-- <Verify
         ref="verify"
         :captchaType="captchaType"
         :imgSize="{ width: '400px', height: '200px' }"
         mode="pop"
         @success="handleLogin"
-      />
+      /> -->
     </el-row>
   </el-form>
 </template>

From 0dcda795821d0327c58bd621e17074bbd8a1f650 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Tue, 26 Sep 2023 16:24:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index a0e685861..5487729e5 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -84,6 +84,7 @@ import { handleTree } from '@/utils/tree'
 import * as MenuApi from '@/api/system/menu'
 import MenuForm from './MenuForm.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getInfo } from '@/api/login'
 
 defineOptions({ name: 'SystemMenu' })
 
@@ -107,6 +108,9 @@ const getList = async () => {
   try {
     const data = await MenuApi.getMenuList(queryParams)
     list.value = handleTree(data)
+    let userInfo = await getInfo()
+    wsCache.set(CACHE_KEY.USER, userInfo)
+    wsCache.set(CACHE_KEY.ROLE_ROUTERS, userInfo.menus)
   } finally {
     loading.value = false
   }

From 26bb311a351c5c1d185602a62fe393492c0ad38b Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Tue, 26 Sep 2023 16:30:32 +0800
Subject: [PATCH 3/4] 1

---
 src/views/Login/components/LoginForm.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index ebc0989a4..1998f3827 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -15,6 +15,17 @@
           <LoginFormTitle style="width: 100%" />
         </el-form-item>
       </el-col>
+        <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+          <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
+            <el-input
+              v-model="loginData.loginForm.tenantName"
+              :placeholder="t('login.tenantNamePlaceholder')"
+              :prefix-icon="iconHouse"
+              link
+              type="primary"
+            />
+          </el-form-item>
+        </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="username">
           <el-input

From 656ace8b074456ceab6404c405b4dbe82a17c753 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Tue, 26 Sep 2023 16:36:40 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E7=A4=BE=E4=BA=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Profile/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Profile/Index.vue b/src/views/Profile/Index.vue
index b05f93ccb..e813f0435 100644
--- a/src/views/Profile/Index.vue
+++ b/src/views/Profile/Index.vue
@@ -22,9 +22,9 @@
           <el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd">
             <ResetPwd />
           </el-tab-pane>
-          <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
+          <!-- <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
             <UserSocial />
-          </el-tab-pane>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
     </el-card>