diff --git a/pages/memorial/adminMemorial.vue b/pages/memorial/adminMemorial.vue index 7dd9822..ce01eb6 100644 --- a/pages/memorial/adminMemorial.vue +++ b/pages/memorial/adminMemorial.vue @@ -147,7 +147,8 @@ export default { return { // 兼容字段:同时传 floorId 与后端现用的 regionId - regionId: String(floorId), + // regionId: String(floorId), + regionId: 1, command, // open | close mac: "FFFFFFFFFFFF", timeout: "11", diff --git a/pages/personalCenter/personalCenter.vue b/pages/personalCenter/personalCenter.vue index 919fe5b..c1bda78 100644 --- a/pages/personalCenter/personalCenter.vue +++ b/pages/personalCenter/personalCenter.vue @@ -26,7 +26,7 @@ @click="handleMenuClick(item)" > - + {{ item.title }} @@ -51,6 +51,7 @@ export default { backgroundColor: "#F5F0E7", }, CommonEnum, + SysAdmin: false, // 加载状态 loading: false, // 用户信息 @@ -86,6 +87,11 @@ export default { icon: CommonEnum.MY_ACTIVITY, path: "/page_user/luru/index", }, + { + title: "牌位管理", + // 无图标,仅管理员可见 + path: "/pages/memorial/adminMemorial", + }, { title: "退出登录", path: "/pages/login/login", @@ -166,9 +172,11 @@ export default { }, toFilteredMenuItems() { console.log("filteredMenuItems触发了:", this.SysAdmin); - return this.SysAdmin - ? this.menuItems - : this.menuItems.filter((item) => item.title !== "牌位录入"); + // 非管理员隐藏:牌位录入、牌位管理 + if (this.SysAdmin) return this.menuItems; + return this.menuItems.filter( + (item) => item.title !== "牌位录入" && item.title !== "牌位管理", + ); }, }, computed: { diff --git a/utils/request.js b/utils/request.js index 4456d42..555cc23 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,5 +1,5 @@ // 统一请求工具 -import { getAppId, getTempToken, shouldUseTempToken } from "@/config/dev.js"; +import { getAppId, getTempToken } from "@/config/dev.js"; import debounce from "uview-ui/libs/function/debounce"; // 环境配置 @@ -52,7 +52,7 @@ function getRequestHeaders(customHeader = {}) { let token = uni.getStorageSync("token"); // 开发环境使用临时token - if (shouldUseTempToken() && !token) { + if (!token) { token = getTempToken(); } @@ -147,7 +147,7 @@ export function request(options = {}) { let token = uni.getStorageSync("token"); // 如果本地没有token且启用了临时token,则使用临时token - if (!token && shouldUseTempToken() && !options.noToken) { + if (!token && !options.noToken) { token = getTempToken(); console.log("使用临时token进行开发测试"); }