renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 申请试用权限调整

Browse Source
This commit is contained in:
rd
2025-09-11 11:26:51 +08:00
parent 32bc0c4b95
commit 44e1ea9a06
15 changed files with 147 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/layouts/components/navbar/components/middle-side/index.vue
View File

@ -2,17 +2,25 @@
import { Input } from 'ant-design-vue';
// import { handleUserHome } from '@/utils/user.ts';
import { useChatStore } from '@/stores/modules/chat';
import { useUserStore } from '@/stores';
export default {
setup(props, { emit, expose }) {
const chatStore = useChatStore();
const userStore = useUserStore();
const keyWord = ref('');
const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
const handleSearch = () => {
chatStore.setSearchValue(keyWord.value);
chatStore.onCreateSession();
keyWord.value = '';
};
if (!hasOpenEnterprise.value) return null;
return () => (
<div class="middle-wrap h-100% flex items-center justify-center">
<Input
@ -35,6 +43,6 @@ export default {
};
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
@import './style.scss';
</style>

11
src/layouts/components/navbar/components/right-side/index.vue
View File

@ -1,13 +1,13 @@
<template>
<div class="right-wrap">
<!-- 任务中心 -->
<div class="relative p-6px rounded-30px flex items-center justify-center task-icon" @click="setUnread">
<div class="relative p-6px rounded-30px flex items-center justify-center task-icon" @click="setUnread" v-if="hasOpenEnterprise">
<SvgIcon name="svg-taskCenter" size="20" class="color-#737478" @click="openDownloadCenter" />
<div class="w-6px h-6px rounded-50% bg-#F64B31 absolute top-6px right-6px" v-if="hasUnreadInfo"></div>
</div>
<!-- 灵机空间入口 -->
<div class="agent-entry mx-16px" :class="isAgentRoute ? 'agent' : ''" @click="handleAgentClick"></div>
<div class="agent-entry mx-16px" :class="isAgentRoute ? 'agent' : ''" @click="handleAgentClick" v-if="hasOpenEnterprise"></div>
<!-- 头像设置 -->
<Dropdown trigger="click" overlayClassName="layout-avatar-dropdown">
@ -23,7 +23,7 @@
<icon-right size="12" />
</div>
</MenuItem>
<MenuItem>
<MenuItem v-if="hasOpenEnterprise">
<SubMenu value="option-1" position="lt" trigger="hover" popupClassName="enterprises-dsubmenu">
<template #title>
<div class="flex justify-between w-100% h-full items-center">
@ -70,7 +70,8 @@
<script setup>
import { Dropdown, Menu, MenuItem, SubMenu } from 'ant-design-vue';
import router from '@/router';
import { useRouter } from "vue-router";
// import router from '@/router';
import { useEnterpriseStore } from '@/stores/modules/enterprise';
import { useSidebarStore } from '@/stores/modules/side-bar';
import { useUserStore } from '@/stores';
@ -94,8 +95,10 @@ const enterpriseStore = useEnterpriseStore();
const userStore = useUserStore();
const sideBarStore = useSidebarStore();
const route = useRoute();
const router = useRouter();
const hasUnreadInfo = computed(() => sideBarStore.unreadInfo.length);
const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
const exitAccountModalRef = ref(null);
const downloadCenterModalRef = ref(null);

23
src/layouts/components/navbar/index.vue
View File

@ -2,13 +2,13 @@
<div class="navbar-wrap px-24px">
<div class="w-full h-full relative flex justify-between">
<div class="left-wrap flex items-center cursor-pointer" @click="handleUserHome">
<img src="@/assets/img/icon-logo.png" alt="" width="96" height="24" />
<div class="left-wrap flex items-center cursor-pointer" @click="onLogoClick">
<img src="@/assets/img/icon-logo.png" alt="" width="96" height="24"/>
</div>
<!-- <div class="flex-1"> -->
<MiddleSide v-if="!isHomeRoute" />
<MiddleSide v-if="!isHomeRoute"/>
<!-- </div> -->
<RightSide :isAgentRoute="isAgentRoute" v-if="userStore.isLogin" />
<RightSide :isAgentRoute="isAgentRoute" v-if="userStore.isLogin"/>
</div>
</div>
@ -25,6 +25,7 @@ import router from '@/router';
const route = useRoute();
const userStore = useUserStore();
const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
const isAgentRoute = computed(() => {
return route.meta?.isAgentRoute;
});
@ -32,6 +33,16 @@ const isAgentRoute = computed(() => {
const isHomeRoute = computed(() => {
return route.name === 'Home';
});
const onLogoClick = () => {
if (hasOpenEnterprise.value) {
handleUserHome();
} else {
router.push({
name: 'Trial'
})
}
};
</script>
<style scoped lang="scss">
.navbar-wrap {
@ -58,16 +69,20 @@ const isHomeRoute = computed(() => {
display: flex;
align-items: center;
}
.arco-dropdown-option-suffix {
display: none;
}
.enterprises-doption {
.arco-dropdown-option-content {
padding: 0 !important;
border-radius: 8px;
}
&:not(.arco-dropdown-option-disabled):hover {
background-color: transparent;
.arco-dropdown-option-content {
background: var(--BG-200, #f2f3f5);
}

39
src/layouts/components/siderBar/index.vue
View File

@ -1,13 +1,12 @@
<script lang="tsx">
import { Dropdown, Menu, Layout } from 'ant-design-vue';
import type { RouteMeta, RouteRecordRaw } from 'vue-router';
import { Dropdown, Layout, Menu } from 'ant-design-vue';
import { useRoute } from 'vue-router';
import SvgIcon from '@/components/svg-icon/index.vue';
import { useAppStore } from '@/stores';
import { useAppStore, useUserStore } from '@/stores';
import { useSidebarStore } from '@/stores/modules/side-bar';
import { MENU_LIST } from './menu-list';
import type { typeMenuItem } from './menu-list';
import { MENU_LIST } from './menu-list';
import { handleUserHome } from '@/utils/user';
import icon1 from '@/assets/img/agent/icon1.png';
@ -21,14 +20,17 @@ export default defineComponent({
const sidebarStore = useSidebarStore();
const appStore = useAppStore();
const userStore = useUserStore();
const currentMenuList = ref<typeMenuItem[]>([]);
// const currentMenuList = ref<typeMenuItem[]>([]);
const currentMenuModInfo = ref<typeMenuItem>({});
const currentRouteName = computed(() => route.name as string);
const currentRouteGroup = computed(() => route.meta?.group ?? 'GroupMain');
const isHomeRoute = computed(() => currentRouteName.value === 'Home');
const showAiSearch = computed(() => !route.meta?.hideAiSearch);
const currentMenuList = computed(() => sidebarStore.currentMenuList);
const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
const collapsed = computed(() => {
return sidebarStore.menuCollapse;
@ -134,8 +136,27 @@ export default defineComponent({
};
const initMenuList = () => {
const groupMenuList = MENU_LIST?.[currentRouteGroup.value as string] ?? [];
currentMenuList.value = cloneDeep(groupMenuList);
let groupMenuList = MENU_LIST?.[currentRouteGroup.value as string] ?? [];
// 如果企业未开通，过滤掉 requireAuth 为 true 的菜单项
if (!hasOpenEnterprise.value) {
groupMenuList = groupMenuList.filter((item) => {
if (item.requireAuth === true) {
return false;
}
if (item.children && item.children.length > 0) {
const filteredChildren = item.children.filter((child) => !child.requireAuth);
if (filteredChildren.length === 0 && !item.routeName) {
return false;
}
item.children = filteredChildren;
}
return true;
});
}
sidebarStore.setCurrentMenuList(groupMenuList);
};
const initCollapse = () => {
@ -217,17 +238,21 @@ export default defineComponent({
</style>
<style lang="scss">
@import './style.scss';
.layout-sider-dropdown-xt {
.container {
border-radius: 8px;
background: var(--BG-White, #fff);
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
.menu-item {
@include menu-item;
padding: 8px;
&:hover {
background-color: rgba(109, 76, 254, 0.08) !important;
color: #6d4cfe !important;
.svg-icon {
color: #6d4cfe !important;
}

12
src/layouts/components/siderBar/menu-list.ts
View File

@ -26,6 +26,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '账号管理',
routeName: 'MediaAccountAccountManagement',
requireLogin: true,
requireAuth: true,
activeMatch: ['MediaAccountAccountManagement'],
},
{
@ -34,6 +35,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '账号数据',
routeName: 'MediaAccountAccountDashboard',
requireLogin: true,
requireAuth: true,
activeMatch: ['MediaAccountAccountDashboard', 'MediaAccountAccountDetails'],
},
// {
@ -42,6 +44,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
// label: '账户管理',
// routeName: 'PutAccountAccountManagement',
// requireLogin: true,
// requireAuth: true,
// activeMatch: ['PutAccountAccountManagement'],
// },
// {
@ -50,6 +53,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
// label: '账户数据',
// routeName: 'PutAccountAccountData',
// requireLogin: true,
// requireAuth: true,
// activeMatch: ['PutAccountAccountData'],
// },
// {
@ -58,6 +62,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
// label: '投放表现分析',
// routeName: 'PutAccountAccountDashboard',
// requireLogin: true,
// requireAuth: true,
// activeMatch: ['PutAccountAccountDashboard'],
// },
// {
@ -66,6 +71,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
// label: '投放指南',
// routeName: 'PutAccountInvestmentGuidelines',
// requireLogin: true,
// requireAuth: true,
// activeMatch: ['PutAccountInvestmentGuidelines', 'PutAccountInvestmentGuidelinesDetail'],
// },
],
@ -81,6 +87,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '成品库',
routeName: 'MaterialCenterFinishedProducts',
requireLogin: true,
requireAuth: true,
activeMatch: [
'MaterialCenterFinishedProducts',
'ManuscriptUpload',
@ -96,6 +103,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '原料库',
routeName: 'MaterialCenterRawMaterial',
requireLogin: true,
requireAuth: true,
activeMatch: ['MaterialCenterRawMaterial'],
},
],
@ -119,6 +127,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '成品库',
routeName: 'WriterMaterialCenterFinishedProducts',
requireLogin: true,
requireAuth: true,
activeMatch: [
'WriterMaterialCenterFinishedProducts',
'WriterManuscriptUpload',
@ -134,6 +143,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
// label: '原料库',
// routeName: 'WriterMaterialCenterRawMaterial',
// requireLogin: true,
// requireAuth: true,
// activeMatch: ['WriterMaterialCenterRawMaterial'],
// },
],
@ -156,6 +166,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '企业信息',
routeName: 'ManagementEnterprise',
requireLogin: true,
requireAuth: true,
activeMatch: [
'ManagementEnterprise',
],
@ -166,6 +177,7 @@ export const MENU_LIST = <Record<string, typeMenuItem[]>>{
label: '账号管理',
routeName: 'ManagementAccount',
requireLogin: true,
requireAuth: true,
activeMatch: ['ManagementAccount'],
},
]

62
src/layouts/components/siderBar/use-menu-tree.ts
View File

@ -1,62 +0,0 @@
// /*
// * @Author: RenXiaoDong
// * @Date: 2025-06-19 01:45:53
// */
// import type { RouteRecordRaw, RouteRecordNormalized } from 'vue-router';
// import { useRouter } from 'vue-router';
// import { useSidebarStore } from '@/stores/modules/side-bar';
// export default function useMenuTree() {
// const router = useRouter();
// const appRoutes = router.options?.routes ?? [];
// const sidebarStore = useSidebarStore();
// const appRoute = computed(() => {
// const _filterRoutes = appRoutes.filter((v) => v.meta?.id === sidebarStore.activeMenuKey);
// return _filterRoutes;
// });
// const menuTree = computed(() => {
// const copyRouter = cloneDeep(appRoute.value) as RouteRecordNormalized[];
// copyRouter.sort((a: RouteRecordNormalized, b: RouteRecordNormalized) => {
// return (a.meta.order || 0) - (b.meta.order || 0);
// });
// function travel(_routes: RouteRecordRaw[], layer: number) {
// if (!_routes) return null;
// const collector: any = _routes.map((element) => {
// // leaf node
// if (element.meta?.hideChildrenInMenu || !element.children) {
// element.children = [];
// return element;
// }
// // route filter hideInMenu true
// element.children = element.children.filter((x) => x.meta?.hideInMenu !== true);
// // Associated child node
// const subItem = travel(element.children, layer + 1);
// if (subItem.length) {
// element.children = subItem;
// return element;
// }
// // the else logic
// if (layer > 1) {
// element.children = subItem;
// return element;
// }
// if (element.meta?.hideInMenu === false) {
// return element;
// }
// return null;
// });
// return collector.filter(Boolean);
// }
// return travel(copyRouter, 0);
// });
// return {
// menuTree,
// };
// }

19
src/permission/permission.ts
View File

@ -1,9 +1,14 @@
// import { useUserStore } from '@/stores/modules/user';
import { useUserStore } from '@/stores/modules/user';
// export function checkRoutePermission(routeName: string) {
// // const userStore = useUserStore();
// // const allowAccessRoutes = userStore.allowAccessRoutes;
export function checkRoutePermission(routeName: string) {
// // if (!routeName) return false;
// // return allowAccessRoutes.includes(routeName);
// }
const userStore = useUserStore();
if (!routeName) return false;
if (!userStore.isOpenEnterprise) {
return false
}
return true;
}

23
src/router/guard/userLoginInfo.ts
View File

@ -7,7 +7,7 @@ import { message } from 'ant-design-vue';
import NProgress from 'nprogress';
import { goUserLogin } from '@/utils/user';
// import router from '@/router';
// import { checkRoutePermission } from '@/permission/permission';
import { checkRoutePermission } from '@/permission/permission';
import { useUserStore } from '@/stores/modules/user';
@ -27,16 +27,17 @@ export default function setupUserLoginInfoGuard(router: Router) {
return;
}
// if (requiresAuth) {
// const hasPermission = checkRoutePermission(routeName);
// if (!hasPermission) {
// message.error('您没有权限访问该页面');
// next('/');
// return;
// }
// next();
// return;
// }
if (requiresAuth) {
const hasPermission = checkRoutePermission(routeName);
if (!hasPermission) {
message.error('您没有权限访问该页面');
next('/trial');
return;
}
next();
return;
}
next();
});

2
src/router/index.ts
View File

@ -48,7 +48,7 @@ export const router = createRouter({
name: 'Trial',
component: () => import('@/views/trial/index.vue'),
meta: {
requiresAuth: true,
requiresAuth: false,
requireLogin: true,
},
},

2
src/stores/modules/user/index.ts
View File

@ -41,7 +41,7 @@ export const useUserStore = defineStore('user', {
},
// 是否开通企业
isOpenEnterprise(): boolean {
return this.userInfo?.primary_enterprise?.subscribe_status === 1;
return [1, 2].includes(this.userInfo?.primary_enterprise?.subscribe_status);
},
},
actions: {

1
src/utils/user.ts
View File

@ -11,6 +11,7 @@ import { useChatStore } from '@/stores/modules/chat';
// 登录
export function goUserLogin(query?: any) {
// console.log('goUserLogin', router)
router.push({ name: 'UserLogin', query });
}

11
src/views/components/management/person/index.vue
View File

@ -95,9 +95,9 @@ import axios from 'axios';
import { useUserStore } from '@/stores';
const store = useUserStore();
const userInfo = computed(() => {
return store.userInfo ?? {};
});
// const userInfo = computed(() => {
// return store.userInfo ?? {};
// });
const columns = [
{
@ -120,10 +120,13 @@ const formRef = ref();
const isSendCaptcha = ref(false);
const uploadInputRef = ref();
// console.log(userInfo.value)
const dataSource = computed(() => {
return userInfo.value ? [userInfo.value] : [];
return !isEmpty(store.userInfo) ? [store.userInfo] : [];
});
console.log(dataSource.value)
// 表单校验规则
const formRules = {
mobile: [

32
src/views/login/components/login-form/index.vue
View File

@ -98,37 +98,25 @@
</template>
<script setup lang="ts">
import {
Checkbox,
Modal,
Button,
Form,
FormItem,
Input,
Space,
message,
Typography,
Card,
List,
Tabs,
} from 'ant-design-vue';
const { Link } = Typography;
const { TabPane } = Tabs;
import { Button, Checkbox, Form, FormItem, Input, message, Tabs, Typography } from 'ant-design-vue';
import PuzzleVerification from '../PuzzleVerification.vue';
import SelectAccountModal from '../select-account-modal/index.vue';
import { fetchLoginCaptCha, fetchAuthorizationsCaptcha, fetchProfileInfo, postLoginPassword } from '@/api/all/login';
import { fetchAuthorizationsCaptcha, fetchLoginCaptCha, fetchProfileInfo, postLoginPassword } from '@/api/all/login';
import { postClearRateLimiter } from '@/api/all/common';
import { joinEnterpriseByInviteCode } from '@/api/all';
import { ref, reactive, onUnmounted, computed } from 'vue';
import { computed, onUnmounted, reactive, ref } from 'vue';
import { useUserStore } from '@/stores';
import { useEnterpriseStore } from '@/stores/modules/enterprise';
import { handleUserLogin, goUserLogin } from '@/utils/user';
import { handleUserLogin } from '@/utils/user';
import router from '@/router';
import { useRoute } from 'vue-router';
import icon1 from '@/assets/img/login/icon-close.png';
import icon2 from '@/assets/img/login/icon-open.png';
const { Link } = Typography;
const { TabPane } = Tabs;
const setPageType = inject('setPageType');
const formRef = ref();
@ -277,8 +265,9 @@ const onTabChange = () => {
const getProfileInfo = async () => {
const { code, data } = await fetchProfileInfo();
if (code === 200) {
userStore.setUserInfo(data);
// 已开通
if (data.primary_enterprise?.subscribe_status === 1) {
if (userStore.isOpenEnterprise) {
const enterprises = data['enterprises'];
mobileNumber.value = data['mobile'];
accounts.value = enterprises;
@ -293,14 +282,13 @@ const getProfileInfo = async () => {
}
}
} else {
router.push({name: 'Trial'})
router.push({ name: 'Trial' });
}
}
};
// 提交表单
const handleSubmit = async () => {
console.log('handleSubmit', disabledSubmitBtn.value);
if (disabledSubmitBtn.value) return;
try {

4
src/views/login/components/register-form/index.vue
View File

@ -293,8 +293,10 @@ const handleVerificationSubmit = async () => {
const getProfileInfo = async () => {
const { code, data } = await fetchProfileInfo();
if (code === 200) {
userStore.setUserInfo(data);
// 已开通
if (data.primary_enterprise?.subscribe_status === 1) {
if (userStore.isOpenEnterprise) {
const enterprises = data['enterprises'];
mobileNumber.value = data['mobile'];
accounts.value = enterprises;

23
src/views/trial/index.vue
View File

@ -1,6 +1,6 @@
<template>
<Layout class="flex justify-center items-center trial-wrap">
<Layout.Header class="header-wrap">
<Layout.Header class="header-wrap cursor-pointer" @click="onLogoClick">
<div class="h-full px-24px">
<div class="w-full h-full relative flex justify-between">
<div class="flex items-center">
@ -65,7 +65,7 @@
</section>
<!-- 建立商务联系中 -->
<section class="w-full" v-if="primary_enterprise.audit_status === 1">
<section class="w-full" v-if="primary_enterprise?.audit_status === 1">
<div class="rounded-16px bg-#fff px-36px pt-80px pb-60px flex flex-col items-center">
<img :src="icon2" width="96" height="96" class="mb-8px" />
<p class="cts !text-18px !lh-26px mb-8px">您的试用申请已提交</p>
@ -87,7 +87,7 @@
</section>
<!-- 试用到期 -->
<section class="w-full" v-if="primary_enterprise.subscribe_status === 4">
<section class="w-full" v-if="primary_enterprise?.subscribe_status === 4">
<div class="rounded-16px bg-#fff px-36px pt-80px pb-60px flex flex-col items-center">
<img :src="icon1" width="96" height="96" class="mb-8px" />
<p class="cts !text-18px !lh-26px mb-8px">试用已到期</p>
@ -113,8 +113,10 @@
</template>
<script setup lang="ts">
import { Layout, Form, Button, FormItem, Input, Steps } from 'ant-design-vue';
import { Button, Form, FormItem, Input, Layout, Steps } from 'ant-design-vue';
import RightSide from '@/layouts/components/navbar/components/right-side/index.vue';
import { useRouter } from 'vue-router';
import { postCreateEnterprises } from '@/api/all/login';
import { exactFormatTime } from '@/utils/tools';
import { handleUserHome } from '@/utils/user';
@ -126,6 +128,7 @@ import icon2 from './img/icon-check.png';
// 0-未开通，1-已开通，2-试用中，3-已到期，4-试用结束
type Status = 0 | 1 | 2 | 3 | 4;
const router = useRouter();
const userStore = useUserStore();
const formRef = ref();
const submitting = ref(false);
@ -175,7 +178,7 @@ const formRules = {
};
const primary_enterprise = computed(() => userStore.userInfo?.primary_enterprise);
const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
const trialingStepsItems = computed(() => {
return [
{
@ -209,6 +212,16 @@ const trialEndStepsItems = computed(() => {
];
});
const onLogoClick = () => {
if (hasOpenEnterprise.value) {
handleUserHome();
} else {
router.push({
name: 'Trial',
});
}
};
const handleSubmit = async () => {
submitting.value = true;
formRef.value