diff --git a/.env.development b/.env.development
index 522e48fce..1a13d24b8 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist'
# VITE_APP_BASE_URL='http://192.168.1.10:8546'
# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
# VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
-VITE_APP_BASE_URL='http://192.168.1.22:8545'
+VITE_APP_BASE_URL='http://192.168.1.22:8544'
# VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn'
diff --git a/src/api/user.ts b/src/api/user.ts
index 30183962d..d1c3bbb9b 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -66,3 +66,6 @@ export function apiUserSingList(params: any) {
export function apiUserGiftList(params: any) {
return request.get({ url: '/user/user/userGiftList', params })
}
+export function getUserInfoByID(params: any) {
+ return request.get({ url: '/auth/menu/model_menu_lists', params })
+}
diff --git a/src/layout/default/components/header/index.vue b/src/layout/default/components/header/index.vue
index 0b1a79042..a4f564c7d 100644
--- a/src/layout/default/components/header/index.vue
+++ b/src/layout/default/components/header/index.vue
@@ -13,9 +13,9 @@
@@ -41,6 +41,7 @@ import UserDropDown from './user-drop-down.vue'
import Setting from '../setting/index.vue'
import MultipleTabs from './multiple-tabs.vue'
import Cache from './cache.vue'
+import menuLi from './menuLi.vue'
import useSettingStore from '@/stores/modules/setting'
const appStore = useAppStore()
@@ -52,8 +53,9 @@ const settingStore = useSettingStore()
.navbar {
height: var(--navbar-height);
@apply flex px-2 bg-body;
+
.navbar-item {
- @apply h-full flex justify-center items-center hover:bg-page;
+ @apply h-full flex justify-center items-center hover:bg-page;
}
}
diff --git a/src/layout/default/components/header/menuLi.vue b/src/layout/default/components/header/menuLi.vue
new file mode 100644
index 000000000..65f574cec
--- /dev/null
+++ b/src/layout/default/components/header/menuLi.vue
@@ -0,0 +1,53 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
diff --git a/src/stores/modules/user.ts b/src/stores/modules/user.ts
index 27b4ebcb5..8ce6cfbb1 100644
--- a/src/stores/modules/user.ts
+++ b/src/stores/modules/user.ts
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia'
import cache from '@/utils/cache'
import type { RouteRecordRaw } from 'vue-router'
-import { getUserInfo, login, logout } from '@/api/user'
+import { getUserInfo, login, logout, getUserInfoByID } from '@/api/user'
import router, { filterAsyncRoutes } from '@/router'
import { TOKEN_KEY } from '@/enums/cacheEnums'
import { PageEnum } from '@/enums/pageEnum'
@@ -75,6 +75,21 @@ const useUserStore = defineStore({
reject(error)
})
})
+ },
+ getUserInfoByID(id: number) {
+ return new Promise((resolve, reject) => {
+ getUserInfoByID({ id })
+ .then((data) => {
+ data.forEach((item) => {
+ item.paths = item.model_name + '/' + item.paths
+ })
+ this.routes = filterAsyncRoutes(data)
+ resolve(data)
+ })
+ .catch((error) => {
+ reject(error)
+ })
+ })
}
}
})
diff --git a/src/views/user/setting.vue b/src/views/user/setting.vue
new file mode 100644
index 000000000..e69de29bb