yumoqing/kboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yumoqing:1147e353102d7068b0a6602ed1dedb96ce86aefd
Branches Tags
yumoqing:main
yumoqing:prod
yumoqing:dev1
..
compare: yumoqing:791dca13d3fd38af9956e7566e63c56c31ed9a39
Branches Tags
yumoqing:prod
yumoqing:main
yumoqing:dev1

No commits in common. "1147e353102d7068b0a6602ed1dedb96ce86aefd" and "791dca13d3fd38af9956e7566e63c56c31ed9a39" have entirely different histories.
1147e35310 ... 791dca13d3

3 changed files with 16 additions and 18 deletions
Show Stats Expand all files Collapse all files

7
f/web-kboss/src/store/modules/permission.js
View File

@ -62,8 +62,8 @@ function addUserRoutes(routes, userType, orgType, userRoles = []) {
const userRoutes = []; const userRoutes = [];
// 修复：包含 orgType 为 2 和 3 的情况（公司客户和个人客户） // 如果是普通用户（org_type为2或userType为user），添加订单管理和资源管理路由
if (userType === 'user' || orgType == 2 || orgType == 3) { if (userType === 'user' || orgType == 2) {
const orderManagementRoute = routes.find(route => route.path === "/orderManagement"); const orderManagementRoute = routes.find(route => route.path === "/orderManagement");
const resourceManagementRoute = routes.find(route => route.path === "/resourceManagement"); const resourceManagementRoute = routes.find(route => route.path === "/resourceManagement");
@ -160,8 +160,7 @@ const actions = {
console.log("用户类型:", userType, "orgType:", orgType); console.log("用户类型:", userType, "orgType:", orgType);
// 修复：包含 orgType 为 2 和 3 的情况 if (params.user && params.user.includes("admin") && orgType != 2) {
if (params.user && params.user.includes("admin") && orgType != 2 && orgType != 3) {
// 管理员：只显示超级管理员菜单 // 管理员：只显示超级管理员菜单
accessedRoutes = asyncRoutes.filter(item => item.path === '/superAdministrator'); accessedRoutes = asyncRoutes.filter(item => item.path === '/superAdministrator');
} else { } else {

8
f/web-kboss/src/store/modules/user.js
View File

@ -128,10 +128,11 @@ const actions = {
const {data, org_type} = response; const {data, org_type} = response;
commit("SET_USER", username); commit("SET_USER", username);
// 修复：org_type 为 2 或 3 都表示客户 // 新增：根据 org_type 设置用户类型和角色
const userType = (org_type == 2 || org_type == 3) ? 'user' : 'admin'; // org_type 为 2 表示客户，其他为管理员
const userType = org_type == 2 ? 'user' : 'admin';
// 设置用户角色 - 如果是客户，则添加'客户'角色 // 设置用户角色 - 如果是客户，则添加'客户'角色
const userRoles = (org_type == 2 || org_type == 3) ? ['客户'] : ['管理员']; const userRoles = org_type == 2 ? ['客户'] : ['管理员'];
commit("SET_USER_TYPE", userType); commit("SET_USER_TYPE", userType);
// 确保 org_type 不为 undefined // 确保 org_type 不为 undefined
@ -283,3 +284,4 @@ export default {
mutations, mutations,
actions, actions,
}; };

19
f/web-kboss/src/views/product/mainPage/index.vue
View File

@ -129,8 +129,7 @@ export default Vue.extend({
}, },
viewList: [], viewList: [],
navList: [], navList: [],
// 移除 data 中的 mybalance 定义 mybalance: 0,
// mybalance: 0, // ❌ 删除这一行
todoList: [ todoList: [
{ name: '待支付', count: 0 }, { name: '待支付', count: 0 },
{ name: '待续费', count: 0 }, { name: '待续费', count: 0 },
@ -143,8 +142,7 @@ export default Vue.extend({
} }
}, },
created() { created() {
// 移除 initMybalance 调用，因为现在使用 computed 的 mybalance this.initMybalance();
// this.initMybalance(); // ❌ 删除这一行
this.getUnreadMsgCount(); this.getUnreadMsgCount();
this.fetchTodoCount(); this.fetchTodoCount();
}, },
@ -187,13 +185,12 @@ export default Vue.extend({
const iconIndex = index % this.navIcons.length; const iconIndex = index % this.navIcons.length;
return this.navIcons[iconIndex]; return this.navIcons[iconIndex];
}, },
// 移除 initMybalance 方法，因为现在使用 computed 的 mybalance async initMybalance() {
// async initMybalance() { // ❌ 删除这个方法 const res = await editReachargelogAPI()
// const res = await editReachargelogAPI() if (res.status) {
// if (res.status) { this.mybalance = res.data
// this.mybalance = res.data }
// } },
// },
async getUnreadMsgCount() { async getUnreadMsgCount() {
try { try {
const res = await getUnreadmsgAPI(); const res = await getUnreadmsgAPI();