diff --git a/admin/src/layouts/DefaultLayout.vue b/admin/src/layouts/DefaultLayout.vue index b76f2f4..6909e10 100644 --- a/admin/src/layouts/DefaultLayout.vue +++ b/admin/src/layouts/DefaultLayout.vue @@ -5,7 +5,7 @@ * 支持响应式布局 * Requirements: 2.1, 2.2, 2.4 */ -import { computed, onMounted, onUnmounted } from 'vue' +import { computed, onMounted, onUnmounted, ref } from 'vue' import { useAppStore } from '@/stores/app' import type { DeviceType } from '@/stores/app' import Sidebar from './Sidebar.vue' @@ -13,6 +13,9 @@ import Header from './Header.vue' const appStore = useAppStore() +// 需要缓存的页面组件名称 +const cachedViews = ref(['UserListPage']) + // 侧边栏折叠状态 const isCollapsed = computed(() => appStore.isSidebarCollapsed) @@ -107,13 +110,10 @@ onUnmounted(() => { - - - - + + + + diff --git a/admin/src/views/user/list.vue b/admin/src/views/user/list.vue index 907ca98..a1807cb 100644 --- a/admin/src/views/user/list.vue +++ b/admin/src/views/user/list.vue @@ -1,3 +1,7 @@ + + @@ -480,7 +480,7 @@ onMounted(() => { v-if="row.isMember" type="warning" > - {{ row.memberLevelText }} + {{ getMemberLevelName(row.memberLevel) }} 非会员 diff --git a/miniapp/config/index.js b/miniapp/config/index.js index 7794e45..6bdbd8d 100644 --- a/miniapp/config/index.js +++ b/miniapp/config/index.js @@ -23,7 +23,7 @@ const ENV = { } // 当前环境 - 开发时使用 development,打包时改为 production -const CURRENT_ENV = 'development' +const CURRENT_ENV = 'production' // 导出配置 export const config = { diff --git a/server/src/XiangYi.Application/Services/AdminPopupService.cs b/server/src/XiangYi.Application/Services/AdminPopupService.cs index 2df3980..1296a62 100644 --- a/server/src/XiangYi.Application/Services/AdminPopupService.cs +++ b/server/src/XiangYi.Application/Services/AdminPopupService.cs @@ -116,7 +116,7 @@ public class AdminPopupService : IAdminPopupService public async Task UpdatePopupByTypeAsync(int popupType, UpdatePopupRequest request, long adminId) { // Validate popup type - if (popupType < 1 || popupType > 3) + if (popupType < 1 || popupType > 4) { throw new BusinessException(ErrorCodes.InvalidParameter, "无效的弹窗类型"); }