diff --git a/.env.development b/.env.development index b6264c1..3a7a354 100644 --- a/.env.development +++ b/.env.development @@ -3,10 +3,11 @@ # VITE_API_BASE='http://18.143.76.3:10704/' # VITE_API_BASE='http://192.168.9.52:10705/' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload - VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.9.28:8081/' # sunjiabei # VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.5.92:8081/' # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' +# 李慧琳 +VITE_API_BASE='http://localhost:8081/' \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 6a32f14..3a20703 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,6 +52,11 @@ const routes = [ meta: {permissionId: [13, 14]} // 对应"查看退款审核"id=13、"退款审批"id=14 }, ] + },{ + path: 'beanAudit', + name: "beanAudit", + component: () => import("../views/audit/beanAudit.vue"), + meta: {permissionId: [54,55]} }, @@ -229,6 +234,13 @@ const routes = [ }, ] }, + { + path: 'userbean', + name: "userbean", + component: () => import("../views/usergold/userbean.vue"), + meta:{ permissionId: 45 } + }, + // 权限管理 { path: '/permissions', @@ -313,7 +325,7 @@ router.beforeEach(async (to, from, next) => { // 获取管理员信息 let roleId = null; - console.log('adminData:', adminData) + console.log('路由的adminData:', adminData.value) try { roleId = adminData.value.roleId; if (!roleId) { diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js index f1a8a01..7aa00e8 100644 --- a/src/utils/menuTreePermission.js +++ b/src/utils/menuTreePermission.js @@ -51,6 +51,11 @@ export const permissionMapping = { Recharge_Audit: 31, // 充值审核 Refund_Audit: 32, // 退款审核 + + Bean_Audit_Select: 54, // 查看金豆审核 + Bean_Audit_Approval: 55, // 金豆审核 + + View_Bean_Details: 56, // 查看金豆明细 }; // 递归查找菜单中是否存在目标id diff --git a/src/views/audit/beanAudit.vue b/src/views/audit/beanAudit.vue index 96c0baf..d7a3028 100644 --- a/src/views/audit/beanAudit.vue +++ b/src/views/audit/beanAudit.vue @@ -1,11 +1,404 @@ - + + + + + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/usergold/userbean.vue b/src/views/usergold/userbean.vue index 96c0baf..9cc11ed 100644 --- a/src/views/usergold/userbean.vue +++ b/src/views/usergold/userbean.vue @@ -1,11 +1,176 @@ - +
+ 重置 + 查询 +
+
- + + + + + \ No newline at end of file