From 991c77f5dd140f6b32203d127c67e912b6c1e988 Mon Sep 17 00:00:00 2001 From: lihui Date: Thu, 24 Jul 2025 11:08:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/router/index.js b/src/router/index.js index 1362ca2..7cc393a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,6 +6,7 @@ import {ref} from "vue"; // 路由定义（包含权限映射 meta.permissionId） const routes = [ // { + // path: '/workspace', // name: "workspace", // component: () => import("../views/workspace/audit.vue"), From 5f83ae7d33537c6962f7b965f99ece01a14857b2 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Thu, 24 Jul 2025 11:08:48 +0800 Subject: [PATCH 2/3] ?? --- src/router/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 1362ca2..2eeee2c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ const routes = [ meta: { permissionId: 40 }, // redirect: '/index', children: [ - // 充值审核 + // 充值审核======================================== { path: 'rechargeAudit', name: "rechargeAudit", From fb67754990b51c720d503bf9b8b2478cefbe07e4 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Thu, 24 Jul 2025 11:33:02 +0800 Subject: [PATCH 3/3] zry merge --- .env.development | 4 ++-- src/router/index.js | 52 ++++++++++++++++++++++++++-------------------------- src/util/request.js | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.env.development b/.env.development index c5af22d..82d8d16 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' - VITE_API_BASE='http://192.168.9.28:8081/' +VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +# VITE_API_BASE='http://192.168.9.28:8081/' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload diff --git a/src/router/index.js b/src/router/index.js index 4251ad5..247742b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -21,12 +21,12 @@ const routes = [ name: "login", component: () => import("../views/login.vue"), }, - { - meta: { requireAuth: true }, + { + meta: { requireAuth: true }, path: '/', component: () => import("../views/home.vue"), - children: [ - // 工作台 + children: [ + // 工作台 { path: '/workspace', name: "workspace", @@ -50,7 +50,7 @@ const routes = [ component: () => import("../views/audit/rechargeAudit.vue"), meta: { permissionId: [11, 12] } // 对应"查看充值审核"id=11、"充值审批"id=12 }, - // 退款审核 + // 退款审核 { path: 'refundAudit', name: "refundAudit", @@ -62,22 +62,22 @@ const routes = [ - // 金币消耗 + // 金币消耗 { path: '/coinConsume', name: "coinConsume", component: () => import("../views/consume/coinConsume.vue"), // redirect: '/coinConsume/add', meta: { permissionId: 6 }, - children: [ - // 金币新增消耗 + children: [ + // 金币新增消耗 { path: 'add', name: "addCoinConsume", component: () => import("../views/consume/addCoinConsume.vue"), meta: { permissionId: 19 } // 对应"提交金币消耗"id=19 }, - // 金币消耗明细详情 + // 金币消耗明细详情 { path: 'detail', name: "coinConsumeDetail", @@ -87,28 +87,28 @@ const routes = [ ] }, - // 汇率管理 + // 汇率管理 { path: '/rate', name: "rate", component: () => import("../views/managerecharge/rate.vue"), meta: { permissionId: [15, 16] } // 对应"汇率查看"id=15、"汇率修改"id=16 }, - // 金币充值 + // 金币充值 { path: '/coinRecharge', name: "coinRecharge", component: () => import("../views/recharge/coinRecharge.vue"), // redirect: '/coinRecharge/add', - children: [ - // 金币新增充值 + children: [ + // 金币新增充值 { path: 'add', name: "addCoinRecharge", component: () => import("../views/recharge/addCoinRecharge.vue"), meta: { permissionId: 17 } // 对应"提交金币充值"id=17 }, - // 金币充值明细详情 + // 金币充值明细详情 { path: 'detail', name: "coinRechargeDetail", @@ -118,14 +118,14 @@ const routes = [ ] }, - // 金币退款 + // 金币退款 { path: '/coinRefund', name: "coinRefund", component: () => import("../views/refund/coinRefund.vue"), // redirect: '/coinRefund/add', meta: { permissionId: 7 }, - children: [ + children: [ // 金币新增退款 { path: 'add', @@ -143,45 +143,45 @@ const routes = [ ] }, - // 客户账户明细 + // 客户账户明细 { path: '/usergold', name: "usergold", component: () => import("../views/usergold/clientCount.vue"), // redirect: '/usergold/detail', meta: { permissionId: 8 }, - children: [ - // 金币明细 + children: [ + // 金币明细 { path: 'detail', name: "clientCountDetail", component: () => import("../views/usergold/clientCountDetail.vue"), meta: { permissionId: 23 } // 对应"查看金币明细"id=23 }, - // 金币余额 + // 金币余额 { path: 'balance', name: "clientCountBalance", component: () => import("../views/usergold/clientCountBalance.vue"), meta: { permissionId: 24 } // 对应"查看金币余额"id=24 }, - ] - }, - // 权限管理 + ] + }, + // 权限管理 { path: '/permissions', name: "permissions", component: () => import("../views/permissions/permission.vue"), meta: { permissionId: [25, 26, 27, 28, 29] } // 对应权限管理下的所有操作 }, - // 没有权限 + // 没有权限 { path: '/noPermission', name: "noPermission", component: () => import("../views/noPermissionPage.vue") } - ] - }, + ] + }, // 跳转页面（无需权限） { path: '/PasswordSuccess', diff --git a/src/util/request.js b/src/util/request.js index cc206eb..6cd3c48 100644 --- a/src/util/request.js +++ b/src/util/request.js @@ -7,7 +7,7 @@ const service = axios.create({ 'Content-Type': 'application/json' }, // 设置请求头，指定请求体的格式为 JSON - // 设置默认请求方法为 POST 这行对应的代码搁哪呢？ util/http.js自己看 + // 设置默认请求方法为 POST 这行对应的代码搁哪呢？ util/http.js }) // 添加上传方法