diff --git a/ruoyi-ui/src/assets/image/activity/1.png b/ruoyi-ui/src/assets/image/activity/1.png new file mode 100644 index 000000000..0af33d0a7 Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/1.png differ diff --git a/ruoyi-ui/src/assets/image/activity/2.png b/ruoyi-ui/src/assets/image/activity/2.png new file mode 100644 index 000000000..173dc786d Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/2.png differ diff --git a/ruoyi-ui/src/assets/image/activity/3.png b/ruoyi-ui/src/assets/image/activity/3.png new file mode 100644 index 000000000..143f0c174 Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/3.png differ diff --git a/ruoyi-ui/src/assets/image/activity/4.png b/ruoyi-ui/src/assets/image/activity/4.png new file mode 100644 index 000000000..0bcac8b3c Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/4.png differ diff --git a/ruoyi-ui/src/assets/image/activity/5.png b/ruoyi-ui/src/assets/image/activity/5.png new file mode 100644 index 000000000..d2390fa4f Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/5.png differ diff --git a/ruoyi-ui/src/assets/image/activity/6.png b/ruoyi-ui/src/assets/image/activity/6.png new file mode 100644 index 000000000..3e76d4a86 Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/6.png differ diff --git a/ruoyi-ui/src/assets/image/activity/7.png b/ruoyi-ui/src/assets/image/activity/7.png new file mode 100644 index 000000000..2ac0d8813 Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/7.png differ diff --git a/ruoyi-ui/src/assets/image/activity/8.png b/ruoyi-ui/src/assets/image/activity/8.png new file mode 100644 index 000000000..0fa12c60b Binary files /dev/null and b/ruoyi-ui/src/assets/image/activity/8.png differ diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index 5b3c7bc37..33fb6d665 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -66,7 +66,7 @@ router.beforeEach((to, from, next) => { } else { //console.log(whiteList.indexOf(to.path)); // 没有token - if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience/apply/") != -1||to.path.indexOf("/experience/result/") != -1||to.path.indexOf("/experience/content/") != -1) { + if (whiteList.indexOf(to.path) !== -1 ||to.path.indexOf("/experience/apply/") != -1||to.path.indexOf("/experience/result/") != -1||to.path.indexOf("/experience/content/") != -1||to.path.indexOf("/activity") != -1) { // 在免登录白名单,直接进入 next() } else { diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 6341496e4..4c9ccc429 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -26,306 +26,312 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [{ - path: '/redirect', - component: Layout, - hidden: true, - children: [{ - path: '/redirect/:path(.*)', - component: () => - import ('@/views/redirect') - }] - }, - { - path: '/login', - component: () => - import ('@/views/login'), - hidden: true - }, - { - path: '/404', - component: () => - import ('@/views/error/404'), - hidden: true - }, - { - path: '/401', - component: () => - import ('@/views/error/401'), - hidden: true - }, - { - path: '/experience/content/:id', - component: () => - import ('@/views/benyi/experience/content'), - hidden: true - }, - { + path: '/redirect', + component: Layout, + hidden: true, + children: [{ + path: '/redirect/:path(.*)', + component: () => + import('@/views/redirect') + }] + }, + { + path: '/login', + component: () => + import('@/views/login'), + hidden: true + }, + { + path: '/404', + component: () => + import('@/views/error/404'), + hidden: true + }, + { + path: '/401', + component: () => + import('@/views/error/401'), + hidden: true + }, + { + path: '/experience/content/:id', + component: () => + import('@/views/benyi/experience/content'), + hidden: true + }, + { + path: '/activity', + component: () => + import('@/views/benyi/activity'), + hidden: true + }, + { + path: '/experience/apply/:id(\\d+)', + component: () => + import('@/views/benyi/experience/choose'), + hidden: true, + children: [{ path: '/experience/apply/:id(\\d+)', component: () => - import ('@/views/benyi/experience/choose'), - hidden: true, - children: [{ - path: '/experience/apply/:id(\\d+)', - component: () => - import ('@/views/benyi/experience/apply'), - hidden: true - }, - { - path: '/experience/result/:id(\\d+)', - component: () => - import ('@/views/benyi/experience/result'), - hidden: true - } - ] - }, - { - path: '', - component: Layout, - redirect: 'index', - children: [{ - path: 'index', - component: () => - import ('@/views/index'), - name: '首页', - meta: { - title: '首页', - icon: 'dashboard', - noCache: true, - affix: true - } - }] - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [{ - path: 'profile', - component: () => - import ('@/views/system/user/profile/index'), - name: 'Profile', - meta: { - title: '个人中心', - icon: 'user' - } - }] - }, - { - path: '/user/change', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [{ - path: 'dept', - component: () => - import ('@/views/system/user/change/dept/index'), - name: 'Changedept', - meta: { - title: '切换岗位', - icon: 'user' - } - }] - }, - { - path: '/dict', - component: Layout, - hidden: true, - children: [{ - path: 'type/data/:dictId(\\d+)', - component: () => - import ('@/views/system/dict/data'), - name: 'Data', - meta: { - title: '字典数据', - icon: '' - } - }] - }, - { - path: '/dayflow', - component: Layout, - hidden: true, - children: [{ - path: 'dayflowmanger/dayflowtask/:id(\\d+)', - component: () => - import ('@/views/benyi/dayflow/task'), - name: 'Task', - meta: { - title: '一日流程任务', - icon: '' - } - }] - }, - { - path: '/dayflow/dayflowmanger', - component: Layout, - hidden: true, - children: [{ - path: 'dayflowtask/standard/:code(\\d+)', - component: () => - import ('@/views/benyi/dayflow/standard'), - name: 'Standard', - meta: { - title: '一日流程标准', - icon: '' - } - }] - }, - { - path: '/dayflow/dayflowmanger/dayflowtask', - component: Layout, - hidden: true, - children: [{ - path: 'standard/unscramble/:id(\\d+)', - component: () => - import ('@/views/benyi/dayflow/unscramble'), - name: 'unscramble', - meta: { - title: '一日流程标准解读', - icon: '' - } - }] - }, - { - path: '/video_study', - component: Layout, - hidden: true, - children: [{ - path: 'study/detail/:id(\\d+)', - component: () => - import ('@/views/benyi_train/video_study/detail'), - name: 'Detail', - meta: { - title: '培训视频详情', - icon: '' - } - }] - }, - { - path: '/benyi_course/planweek', - component: Layout, - hidden: true, - children: [{ - path: 'data/:id', - component: () => - import ('@/views/benyi/planweek/data'), - name: 'planweek1', - meta: { - title: '周计划(明细)', - icon: '' - } - }] - }, - { - path: '/benyi_course/theme', - component: Layout, - hidden: true, - children: [{ - path: 'activity/:id(\\d+)', - component: () => - import ('@/views/benyi/theme/activity'), - name: 'Theme1', - meta: { - title: '主题整合内容', - icon: '' - } - }] - }, - { - path: '/benyi_course/themetermplan', - component: Layout, - hidden: true, - children: [{ - path: 'data/:id', - component: () => - import ('@/views/benyi/themetermplan/data'), - name: 'Themetermplan1', - meta: { - title: '主题整合学期计划(明细)', - icon: '' - } - }] - }, - { - path: '/benyi_course/thememonthplan', - component: Layout, - hidden: true, - children: [{ - path: 'data/:id', - component: () => - import ('@/views/benyi/thememonthplan/data'), - name: 'Thememonthplan1', - meta: { - title: '主题整合月计划(明细)', - icon: '' - } - }] - }, - { - path: '/benyi_course/themeweekplan', - component: Layout, - hidden: true, - children: [{ - path: 'data/:id', - component: () => - import ('@/views/benyi/themeweekplan/data'), - name: 'Themeweekplan1', - meta: { - title: '主题整合周计划(明细)', - icon: '' - } - }] - }, - { - path: '/benyi_course/math', - component: Layout, - hidden: true, - children: [{ - path: 'plan/:id(\\d+)', - component: () => - import ('@/views/benyi/math/plan'), - name: 'Math1', - meta: { - title: '游戏数学方案', - icon: '' - } - }] - }, - { - path: '/job', - component: Layout, - hidden: true, - children: [{ - path: 'log', - component: () => - import ('@/views/monitor/job/log'), - name: 'JobLog', - meta: { - title: '调度日志' - } - }] - }, - { - path: '/gen', - component: Layout, - hidden: true, - children: [{ - path: 'edit', - component: () => - import ('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { - title: '修改生成配置' - } - }] - } + import('@/views/benyi/experience/apply'), + hidden: true + }, + { + path: '/experience/result/:id(\\d+)', + component: () => + import('@/views/benyi/experience/result'), + hidden: true + } + ] + }, + { + path: '', + component: Layout, + redirect: 'index', + children: [{ + path: 'index', + component: () => + import('@/views/index'), + name: '首页', + meta: { + title: '首页', + icon: 'dashboard', + noCache: true, + affix: true + } + }] + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [{ + path: 'profile', + component: () => + import('@/views/system/user/profile/index'), + name: 'Profile', + meta: { + title: '个人中心', + icon: 'user' + } + }] + }, + { + path: '/user/change', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [{ + path: 'dept', + component: () => + import('@/views/system/user/change/dept/index'), + name: 'Changedept', + meta: { + title: '切换岗位', + icon: 'user' + } + }] + }, + { + path: '/dict', + component: Layout, + hidden: true, + children: [{ + path: 'type/data/:dictId(\\d+)', + component: () => + import('@/views/system/dict/data'), + name: 'Data', + meta: { + title: '字典数据', + icon: '' + } + }] + }, + { + path: '/dayflow', + component: Layout, + hidden: true, + children: [{ + path: 'dayflowmanger/dayflowtask/:id(\\d+)', + component: () => + import('@/views/benyi/dayflow/task'), + name: 'Task', + meta: { + title: '一日流程任务', + icon: '' + } + }] + }, + { + path: '/dayflow/dayflowmanger', + component: Layout, + hidden: true, + children: [{ + path: 'dayflowtask/standard/:code(\\d+)', + component: () => + import('@/views/benyi/dayflow/standard'), + name: 'Standard', + meta: { + title: '一日流程标准', + icon: '' + } + }] + }, + { + path: '/dayflow/dayflowmanger/dayflowtask', + component: Layout, + hidden: true, + children: [{ + path: 'standard/unscramble/:id(\\d+)', + component: () => + import('@/views/benyi/dayflow/unscramble'), + name: 'unscramble', + meta: { + title: '一日流程标准解读', + icon: '' + } + }] + }, + { + path: '/video_study', + component: Layout, + hidden: true, + children: [{ + path: 'study/detail/:id(\\d+)', + component: () => + import('@/views/benyi_train/video_study/detail'), + name: 'Detail', + meta: { + title: '培训视频详情', + icon: '' + } + }] + }, + { + path: '/benyi_course/planweek', + component: Layout, + hidden: true, + children: [{ + path: 'data/:id', + component: () => + import('@/views/benyi/planweek/data'), + name: 'planweek1', + meta: { + title: '周计划(明细)', + icon: '' + } + }] + }, + { + path: '/benyi_course/theme', + component: Layout, + hidden: true, + children: [{ + path: 'activity/:id(\\d+)', + component: () => + import('@/views/benyi/theme/activity'), + name: 'Theme1', + meta: { + title: '主题整合内容', + icon: '' + } + }] + }, + { + path: '/benyi_course/themetermplan', + component: Layout, + hidden: true, + children: [{ + path: 'data/:id', + component: () => + import('@/views/benyi/themetermplan/data'), + name: 'Themetermplan1', + meta: { + title: '主题整合学期计划(明细)', + icon: '' + } + }] + }, + { + path: '/benyi_course/thememonthplan', + component: Layout, + hidden: true, + children: [{ + path: 'data/:id', + component: () => + import('@/views/benyi/thememonthplan/data'), + name: 'Thememonthplan1', + meta: { + title: '主题整合月计划(明细)', + icon: '' + } + }] + }, + { + path: '/benyi_course/themeweekplan', + component: Layout, + hidden: true, + children: [{ + path: 'data/:id', + component: () => + import('@/views/benyi/themeweekplan/data'), + name: 'Themeweekplan1', + meta: { + title: '主题整合周计划(明细)', + icon: '' + } + }] + }, + { + path: '/benyi_course/math', + component: Layout, + hidden: true, + children: [{ + path: 'plan/:id(\\d+)', + component: () => + import('@/views/benyi/math/plan'), + name: 'Math1', + meta: { + title: '游戏数学方案', + icon: '' + } + }] + }, + { + path: '/job', + component: Layout, + hidden: true, + children: [{ + path: 'log', + component: () => + import('@/views/monitor/job/log'), + name: 'JobLog', + meta: { + title: '调度日志' + } + }] + }, + { + path: '/gen', + component: Layout, + hidden: true, + children: [{ + path: 'edit', + component: () => + import('@/views/tool/gen/editTable'), + name: 'GenEdit', + meta: { + title: '修改生成配置' + } + }] + } ] export default new Router({ - mode: 'history', // 去掉url中的# - scrollBehavior: () => ({ - y: 0 - }), - routes: constantRoutes -}) \ No newline at end of file + mode: 'history', // 去掉url中的# + scrollBehavior: () => ({ + y: 0 + }), + routes: constantRoutes +}) diff --git a/ruoyi-ui/src/views/benyi/activity/index.vue b/ruoyi-ui/src/views/benyi/activity/index.vue new file mode 100644 index 000000000..307f9c133 --- /dev/null +++ b/ruoyi-ui/src/views/benyi/activity/index.vue @@ -0,0 +1,307 @@ + + + + + \ No newline at end of file