Merge branch 'master' of gitee.com:liangzigongshe/foreign-admin-ui into 2026-4-8SongslDev

Signed-off-by: Songsl <16905340+songsl2000@user.noreply.gitee.com>

src/api/index.ts

@@ -79,6 +79,7 @@ service.interceptors.request.use(requestInterceptor, requestErrorInterceptor)
 const responseInterceptor = <T = unknown>(response: AxiosResponse<ApiResponse<T>>) => {
   //关闭loading（无论成功失败都要关）
   hideLoading()
+  const config = response.config
   if (response.headers['new_token'] !== undefined) {
     setStorage('token', response.headers['new_token'] as string)
   }
@@ -87,13 +88,14 @@ const responseInterceptor = <T = unknown>(response: AxiosResponse<ApiResponse<T>
   console.log('响应数据data', data)
   // 判断业务状态码
   if (data.code == 200 || data.code == 0) {
-    // 仅当业务成功时，才弹成功提示
-    ElNotification({
-      message: data.msg || '操作成功！',
-      type: 'success',
-      duration: 2000,
-      customClass: 'global-notification',
-    })
+     if (config.showMessage !== false) {
+      ElNotification({
+        message: data.msg || '操作成功！',
+        type: 'success',
+        duration: 2000,
+        customClass: 'global-notification'
+      })
+    }
     return data.data
   } else {
     switch (data.code) {
@@ -156,12 +158,14 @@ const responseErrorInterceptor = (error: AxiosError) => {
     errMsg = error.message || '服务器错误'
   }
 
-  ElNotification({
-    message: errMsg,
-    type: 'error',
-    duration: 2000,
-    customClass: 'global-notification',
-  })
+   if (error.config?.showMessage !== false) {
+    ElNotification({
+      message: errMsg,
+      type: 'error',
+      duration: 2000,
+      customClass: 'global-notification'
+    })
+   }
   return Promise.reject(error)
 }
 
@@ -170,14 +174,14 @@ service.interceptors.response.use(responseInterceptor, responseErrorInterceptor)
 // 5. 封装通用请求方法
 export const request = {
   get<T = unknown>(url: string, params?: unknown, config?: InternalAxiosRequestConfig): Promise<T> {
-    return service.get<ApiResponse<T>>(url, { params, ...config }).then((res) => {
-      return res as T
-    })
+    return service.get<ApiResponse<T>>(url, { params, ...config,showMessage:false }).then((res) => {
+      return res as T;
+    });
   },
   post<T = unknown>(url: string, data?: unknown, config?: InternalAxiosRequestConfig): Promise<T> {
-    return service.post<ApiResponse<T>>(url, data, config).then((res) => {
-      return res as T
-    })
+    return service.post<ApiResponse<T>>(url, data, {config,showMessage: true,}).then((res) => {
+      return res as T;
+    });
   },
 }
 

src/components/layout/Sidebar.vue

@@ -7,16 +7,16 @@
       </div>
     </div>
 
-    <!-- 菜单区域 -->
-    <el-menu class="menu" :unique-opened="true" :default-active="activeMenu" router>
-      <template v-for="menu in staticMenuList" :key="menu.id">
-        <!-- 无子菜单 -->
-        <el-menu-item v-if="!menu.children || menu.children.length === 0" :index="menu.path">
-          <el-icon>
-            <component :is="iconMap[menu.icon]" />
-          </el-icon>
-          <template #title>{{ menu.label }}</template>
-        </el-menu-item>
+        <!-- 菜单区域 -->
+        <el-menu class="menu" :unique-opened="true" :default-active="activeMenu" router>
+            <template v-for="menu in menuList" :key="menu.id">
+                <!-- 无子菜单 -->
+                <el-menu-item v-if="!menu.children || menu.children.length === 0" :index="menu.path">
+                    <el-icon>
+                        <component :is="iconMap[menu.icon]" />
+                    </el-icon>
+                    <template #title>{{ menu.label }}</template>
+                </el-menu-item>
 
         <el-sub-menu v-else :index="menu.path">
           <template #title>
@@ -58,7 +58,7 @@ const menuList = ref<any[]>([])
 
 // 计算当前激活的菜单 index（取路由 fullPath 作为激活标识）
 const activeMenu = computed(() => {
-  return route.fullPath // 直接使用完整路径，和你的菜单 path 保持一致
+  return route.fullPath // 直接使用完整路径，和菜单 path 保持一致
 })
 // 组件挂载时异步加载菜单
 onMounted(async () => {