From 29e9f30eb7c74c7b1314526cc2ae4d216eb89fab Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sat, 11 Jan 2025 12:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95=E6=98=AF=E5=90=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                 |  4 ++--
 src/views/home/index.vue         |  2 +-
 src/views/home/navMenu/index.vue | 18 ++++++------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index 639afc5..e1223e0 100644
--- a/.env.development
+++ b/.env.development
@@ -8,13 +8,13 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 # VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5db0505..5eae2ff 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script setup lang="ts" name="dashboard">
-import navMmenu from './navMenu/index.vue';
+const navMmenu = defineAsyncComponent(() => import('./navMenu/index.vue'));
 
 // const Widgets = defineAsyncComponent(() => import('./widgets/index.vue'));
 // const pageLoading = ref(true);
diff --git a/src/views/home/navMenu/index.vue b/src/views/home/navMenu/index.vue
index bd5e013..6537e14 100644
--- a/src/views/home/navMenu/index.vue
+++ b/src/views/home/navMenu/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-card class="card" v-loading="loading">
 		<el-row>
-			<el-col :span="4" v-for="(item, index) in navMenuListTop" :key="index">
+			<el-col :span="4" v-for="(item, index) in navMenuList" :key="index">
 				<div :class="['nav-menu-item-top', item.id == currentActiveMenuId ? 'nav-menu-item-active' : '']" @click="currentActiveMenuId = item.id">
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
 					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
@@ -10,8 +10,8 @@
 		</el-row>
 		<br />
 		<el-row v-if="currentActiveMenuId" style="background-color: #e2eff677; border-radius: 1rem; padding: 2rem 6rem">
-			<el-col :span="3" v-for="(item, index) in navMenuListBottom" :key="index">
-				<div class="nav-menu-item-bottom" @click="handleClickBottomMenu(item)">
+			<el-col v-for="(item, index) in navMenuListBottom" :key="index" :span="!item.meta?.isHide ? 3 : 0">
+				<div v-if="!item.meta?.isHide" class="nav-menu-item-bottom" @click="handleClickBottomMenu(item)">
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
 					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
 				</div>
@@ -29,7 +29,6 @@ const router = useRouter();
 const menuApi = useMenuApi();
 const loading = ref(false);
 const navMenuList = ref<any>([]);
-const navMenuListTop = ref<any>([]);
 const currentActiveMenuId = ref('');
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
 
@@ -37,16 +36,12 @@ const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
 const getNavMenuList = async () => {
 	loading.value = true;
 	try {
-		const res = await menuApi.getAdminMenu().finally(() => {
-			loading.value = false;
-		});
+		const res = await menuApi.getAdminMenu().finally(() => (loading.value = false));
 		if (res.code == 0 && res.data.length > 0) {
 			navMenuList.value = res.data;
-			navMenuListTop.value = res.data.map((item: any) => ({ id: item.id, name: item.name, path: item.path, menuPic: item.menuPic }));
 		}
 	} catch (error) {
 		navMenuList.value = [];
-		navMenuListTop.value = [];
 		ElMessage.error('加载错误');
 		loading.value = false;
 	}
@@ -55,9 +50,7 @@ const getNavMenuList = async () => {
 const navMenuListBottom = computed(() => {
 	if (navMenuList.value) {
 		const currentMenuItem = navMenuList.value.find((item: any) => item.id == currentActiveMenuId.value);
-		if (currentMenuItem && currentMenuItem.children) {
-			return currentMenuItem.children.map((item: any) => ({ id: item.id, name: item.name, path: item.path, menuPic: item.menuPic }));
-		}
+		if (currentMenuItem && currentMenuItem.children) return currentMenuItem.children;
 	} else {
 		return [];
 	}
@@ -67,6 +60,7 @@ const navMenuListBottom = computed(() => {
 const handleClickBottomMenu = (item: any) => {
 	router.push(item.path);
 };
+
 onMounted(async () => {
 	await getNavMenuList();
 });