From 854d0b52fcc574127d85bdc1bb496a5e8369c606 Mon Sep 17 00:00:00 2001 From: lijingyu007 <904564792@qq.com> Date: Tue, 21 May 2024 11:03:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E8=8F=9C=E5=8D=95+?= =?UTF-8?q?=E6=97=A0=E5=85=B3=E8=B7=AF=E7=94=B1=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commonheader/personalheader.vue | 704 ++++++++++-------- src/router/router.js | 193 ++--- 2 files changed, 473 insertions(+), 424 deletions(-) diff --git a/src/page/personalpage/commonheader/personalheader.vue b/src/page/personalpage/commonheader/personalheader.vue index 0a144bb..4e9008b 100644 --- a/src/page/personalpage/commonheader/personalheader.vue +++ b/src/page/personalpage/commonheader/personalheader.vue @@ -1,11 +1,20 @@ \ No newline at end of file diff --git a/src/router/router.js b/src/router/router.js index 0191cbb..62147e6 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -1,62 +1,61 @@ import Vue from 'vue' import Router from 'vue-router' import store from "@/store"; -import { Message,MessageBox } from 'element-ui' +// import { Message,MessageBox } from 'element-ui' //自定义组件 -import logpage from "../page/logpage/index.vue" import login from "../page/logpage/log/login.vue" import index from "../page/homepage/index.vue" import home from "../page/homepage/home/home.vue" import toolmarker from "../page/homepage/tool/toolmarker.vue" -import openSource from "../page/homepage/openSource/index.vue" -import openSourceTooldetails from "../page/homepage/openSource/tooldetails.vue" -import safetyTesteTool from "../page/homepage/openSourceArea/safetyTesteTool.vue" -import codeScanningTool from "../page/homepage/openSourceArea/codeScanningTool.vue" -import unitTesteTool from "../page/homepage/openSourceArea/unitTesteTool.vue" -import functionTesteTool from "../page/homepage/openSourceArea/functionTesteTool.vue" -import pressureTesteTool from "../page/homepage/openSourceArea/pressureTesteTool.vue" -import interfaceTestTool from "../page/homepage/openSourceArea/interfaceTestTool.vue" -import CNASsolution from "../page/homepage/solution/CNASsolution.vue" -import GJB5000Bsolution from "../page/homepage/solution/GJB5000Bsolution.vue" import tooldetails from "../page/homepage/tool/tooldetails.vue" import crowd from "../page/homepage/crowdsourcing/crowd.vue" import crowddetails from "../page/homepage/crowdsourcing/crowddetails.vue" import publishtasks from "../page/homepage/crowdsourcing/publishtasks.vue" import train from "../page/homepage/traininstitute/train.vue" -import dynamics from "../page/homepage/industrydynamics/dynamics.vue" -import industrydetails from "../page/homepage/industrydynamics/industrydetails.vue" import ability from "../page/homepage/personability/ability.vue" import employ from "../page/homepage/employ/employ.vue" import cooperation from "../page/homepage/cooperation/cooperation.vue" import aboutwo from "../page/homepage/aboutus/aboutwo.vue" -import joinus from "../page/homepage/aboutus/joinus.vue" import personal from "../page/personalpage/index.vue" -import imember from "../page/personalpage/home/imember.vue" import personalcenter from "../page/personalpage/home/personalcenter.vue" import stationmessage from "../page/personalpage/home/stationmessage.vue" -import messagelist from "../page/personalpage/home/messagelist.vue" -import toolmarket from "../page/personalpage/testtool/toolmarket.vue" -import mytooldetails from "../page/personalpage/testtool/mytooldetails.vue" import myorder from "../page/personalpage/testtool/myorder.vue" -import myshopcart from "../page/personalpage/testtool/myshopcart.vue" import mytask from "../page/personalpage/testmanagement/mytask.vue" import mytool from "../page/personalpage/testmanagement/mytool.vue" -import crowdmarket from "../page/personalpage/testcrowd/crowdmarket.vue" -import currentcrowd from "../page/personalpage/testcrowd/currentcrowd.vue" -import crowdinform from "../page/personalpage/testcrowd/crowdinform.vue" -import mycrowd from "../page/personalpage/testcrowd/mycrowd.vue" import myparticipate from "../page/personalpage/testcrowd/myparticipate.vue" import myrelease from "../page/personalpage/testcrowd/myrelease.vue" -import pendingtask from "../page/personalpage/testcrowd/pendingtask.vue" import edittasks from "../page/personalpage/testcrowd/edittasks.vue" -import accountoverview from "../page/personalpage/testtreasure/accountoverview.vue" -import transaction from "../page/personalpage/testtreasure/transaction.vue" -import tranpassword from "../page/personalpage/testtreasure/tranpassword.vue" import testKit from "../page/personalpage/testtreasure/testKit.vue" import demand from "../page/personalpage/demand/index.vue" - import myreview from '../page/personalpage/myreview/index.vue' import myBm from '../page/personalpage/myBm/index.vue' +// import logpage from "../page/logpage/index.vue" +// import openSource from "../page/homepage/openSource/index.vue" +// import openSourceTooldetails from "../page/homepage/openSource/tooldetails.vue" +// import safetyTesteTool from "../page/homepage/openSourceArea/safetyTesteTool.vue" +// import codeScanningTool from "../page/homepage/openSourceArea/codeScanningTool.vue" +// import unitTesteTool from "../page/homepage/openSourceArea/unitTesteTool.vue" +// import functionTesteTool from "../page/homepage/openSourceArea/functionTesteTool.vue" +// import pressureTesteTool from "../page/homepage/openSourceArea/pressureTesteTool.vue" +// import interfaceTestTool from "../page/homepage/openSourceArea/interfaceTestTool.vue" +// import CNASsolution from "../page/homepage/solution/CNASsolution.vue" +// import GJB5000Bsolution from "../page/homepage/solution/GJB5000Bsolution.vue" +// import dynamics from "../page/homepage/industrydynamics/dynamics.vue" +// import industrydetails from "../page/homepage/industrydynamics/industrydetails.vue" +// import joinus from "../page/homepage/aboutus/joinus.vue" +// import imember from "../page/personalpage/home/imember.vue" +// import messagelist from "../page/personalpage/home/messagelist.vue" +// import toolmarket from "../page/personalpage/testtool/toolmarket.vue" +// import mytooldetails from "../page/personalpage/testtool/mytooldetails.vue" +// import myshopcart from "../page/personalpage/testtool/myshopcart.vue" +// import crowdmarket from "../page/personalpage/testcrowd/crowdmarket.vue" +// import currentcrowd from "../page/personalpage/testcrowd/currentcrowd.vue" +// import crowdinform from "../page/personalpage/testcrowd/crowdinform.vue" +// import mycrowd from "../page/personalpage/testcrowd/mycrowd.vue" +// import pendingtask from "../page/personalpage/testcrowd/pendingtask.vue" +// import accountoverview from "../page/personalpage/testtreasure/accountoverview.vue" +// import transaction from "../page/personalpage/testtreasure/transaction.vue" +// import tranpassword from "../page/personalpage/testtreasure/tranpassword.vue" Vue.use(Router) //为组件配置路径 @@ -65,80 +64,82 @@ const router = new Router({ // linkActiveClass:'is-active', routes: [ //首页 - {path:'',component:index, - redirect:'/', - children:[ - {path:'/',component:home,name:'home',}, - {path:'login',component:login,name:'login',}, - {path:'market',component:toolmarker,name:'market'}, - {path:'openSource', component: openSource, name:'openSource'}, - {path:'openSourceArea/safetyTesteTool',component:safetyTesteTool,name:'safetyTesteTool'}, - {path:'openSourceArea/codeScanningTool',component:codeScanningTool,name:'codeScanningTool'}, - {path:'openSourceArea/unitTesteTool',component:unitTesteTool,name:'unitTesteTool'}, - {path:'openSourceArea/functionTesteTool',component:functionTesteTool,name:'functionTesteTool'}, - {path:'openSourceArea/pressureTesteTool',component:pressureTesteTool,name:'pressureTesteTool'}, - {path:'openSourceArea/interfaceTestTool',component:interfaceTestTool,name:'interfaceTestTool'}, - {path:'solution/CNAS',component:CNASsolution,name:'CNASsolution'}, - {path:'solution/GJB5000B',component:GJB5000Bsolution,name:'GJB5000Bsolution'}, - {path:'market/tooldetails',component:tooldetails}, - {path:'openSource/openSourceTooldetails', component: openSourceTooldetails }, - {path:'crowdsourcing',component:crowd,name:'crowd',}, - {path:'crowdsourcing/crowddetails',component:crowddetails,}, - {path:'crowdsourcing/publishtasks',component:publishtasks,}, - {path:'college',component:train}, - {path:'ability',component:ability}, - {path:'news',component:dynamics,}, - {path:'news/detail',component:industrydetails,name:'industrydynamics',}, - {path:'employ',component:employ}, - {path:'cooperation',component:cooperation}, - {path:'about',component:aboutwo}, - {path:'aboutus/joinus',component:joinus,meta:{isAuth: true}}, + { + path: '', component: index, + redirect: '/', + children: [ + { path: '/', component: home, name: 'home', }, + { path: 'login', component: login, name: 'login', }, + { path: 'market', component: toolmarker, name: 'market' }, + // {path:'openSource', component: openSource, name:'openSource'}, + // {path:'openSourceArea/safetyTesteTool',component:safetyTesteTool,name:'safetyTesteTool'}, + // {path:'openSourceArea/codeScanningTool',component:codeScanningTool,name:'codeScanningTool'}, + // {path:'openSourceArea/unitTesteTool',component:unitTesteTool,name:'unitTesteTool'}, + // {path:'openSourceArea/functionTesteTool',component:functionTesteTool,name:'functionTesteTool'}, + // {path:'openSourceArea/pressureTesteTool',component:pressureTesteTool,name:'pressureTesteTool'}, + // {path:'openSourceArea/interfaceTestTool',component:interfaceTestTool,name:'interfaceTestTool'}, + // {path:'solution/CNAS',component:CNASsolution,name:'CNASsolution'}, + // {path:'solution/GJB5000B',component:GJB5000Bsolution,name:'GJB5000Bsolution'}, + { path: 'market/tooldetails', component: tooldetails }, + // {path:'openSource/openSourceTooldetails', component: openSourceTooldetails }, + { path: 'crowdsourcing', component: crowd, name: 'crowd', }, + { path: 'crowdsourcing/crowddetails', component: crowddetails, }, + { path: 'crowdsourcing/publishtasks', component: publishtasks, }, + { path: 'college', component: train }, + { path: 'ability', component: ability }, + // {path:'news',component:dynamics,}, + // {path:'news/detail',component:industrydetails,name:'industrydynamics',}, + { path: 'employ', component: employ }, + { path: 'cooperation', component: cooperation }, + { path: 'about', component: aboutwo }, + // {path:'aboutus/joinus',component:joinus,meta:{isAuth: true}}, ] }, // 登录相关 // {path:'/login',component:logpage, - // redirect:'/login', - // children:[ - // {path:'login',component:login}, - // ] + // redirect:'/login', + // children:[ + // {path:'login',component:login}, + // ] // }, // 工具市场： market // 众包市场：crowdsourcing // 培训学院：college // 行业动态：news // 关于我们：about - + //个人中心 - {path:'/console',component:personal, - redirect:'/', - children:[ - {path:'/',component:imember,meta: { title: '工作台', isAuth: true,type:1}}, - {path:'profile',component:personalcenter,meta: { title: '个人中心', isAuth: true,type:1}}, - {path:'message',component:stationmessage,meta: { title: '站内消息', isAuth: true,type:1}}, - {path:'messagelist',component:messagelist,meta: { title: '消息列表', isAuth: true,type:1}}, - {path:'toolsmarket',component:toolmarket,meta: { title: '工具市场', isAuth: true,type:2}}, - {path:'mytooldetails',component:mytooldetails,meta: { title: '测试工具详情', isAuth: true,type:2}}, - {path:'orders',component:myorder,meta: { title: '我的订单', isAuth: true,type:2}}, - {path:'cart',component:myshopcart,meta: { title: '我的购物车', isAuth: true,type:2}}, - {path:'mytasks',component:mytask,meta: { title: '我的任务', isAuth: true,type:3}}, - {path:'mytools',component:mytool,meta: { title: '我的工具', isAuth: true,type:3}}, - {path:'crowdmarket',component:crowdmarket,meta: { title: '众包市场', isAuth: true,type:4}}, - {path:'currentcrowd',component:currentcrowd,meta: { title: '任务详情', isAuth: true,type:4}}, - {path:'crowdinform',component:crowdinform,meta: { title: '测试众包详情', isAuth: true,type:4}}, - {path:'mycrowd',component:mycrowd,meta: { title: '我的众包', isAuth: true,type:4}}, - {path:'myparticipate',component:myparticipate,meta: { title: '我参与的', isAuth: true,type:4}}, - {path:'myrelease',component:myrelease,meta: { title: '我发布的', isAuth: true,type:4}}, - {path:'pendingtask',component:pendingtask,meta: { title: '待付款任务', isAuth: true,type:4}}, - {path:'edittasks',component:edittasks,meta: { title: '重新发布', isAuth: true,type:4}}, - {path:'edittasksFB',component:edittasks,meta: { title: '发布任务', isAuth: true,type:4}}, - {path:'account',component:testKit,meta: { title: '我的测试宝', isAuth: true,type:5}}, - {path:'accountoverview',component:accountoverview,meta: { title: '账户概览', isAuth: true,type:5}}, - {path:'transaction',component:transaction,meta: { title: '交易记录', isAuth: true,type:5}}, - {path:'tranpassword',component:tranpassword,meta: { title: '交易密码', isAuth: true,type:5}}, - {path:'demand',component:demand,meta: { title: '我要用人', isAuth: true,type:6}}, - {path:'myreview',component:myreview,meta: { title: '我的评价', isAuth: true,type:5}}, - {path:'myBm',component:myBm,meta: { title: '我的培训班', isAuth: true,type:5}}, + { + path: '/console', component: personal, + redirect: '/console/myparticipate', + children: [ + // {path:'/',component:imember,meta: { title: '工作台', isAuth: true,type:1}}, + { path: 'profile', component: personalcenter, meta: { title: '个人中心', isAuth: true, type: 1 } }, + { path: 'message', component: stationmessage, meta: { title: '站内消息', isAuth: true, type: 1 } }, + // {path:'messagelist',component:messagelist,meta: { title: '消息列表', isAuth: true,type:1}}, + // {path:'toolsmarket',component:toolmarket,meta: { title: '工具市场', isAuth: true,type:2}}, + // {path:'mytooldetails',component:mytooldetails,meta: { title: '测试工具详情', isAuth: true,type:2}}, + { path: 'orders', component: myorder, meta: { title: '我的订单', isAuth: true, type: 2 } }, + // {path:'cart',component:myshopcart,meta: { title: '我的购物车', isAuth: true,type:2}}, + { path: 'mytasks', component: mytask, meta: { title: '我的任务', isAuth: true, type: 3 } }, + { path: 'mytools', component: mytool, meta: { title: '我的工具', isAuth: true, type: 3 } }, + // {path:'crowdmarket',component:crowdmarket,meta: { title: '众包市场', isAuth: true,type:4}}, + // {path:'currentcrowd',component:currentcrowd,meta: { title: '任务详情', isAuth: true,type:4}}, + // {path:'crowdinform',component:crowdinform,meta: { title: '测试众包详情', isAuth: true,type:4}}, + // {path:'mycrowd',component:mycrowd,meta: { title: '我的众包', isAuth: true,type:4}}, + { path: 'myparticipate', component: myparticipate, meta: { title: '我参与的', isAuth: true, type: 4 } }, + { path: 'myrelease', component: myrelease, meta: { title: '我发布的', isAuth: true, type: 4 } }, + // {path:'pendingtask',component:pendingtask,meta: { title: '待付款任务', isAuth: true,type:4}}, + { path: 'edittasks', component: edittasks, meta: { title: '重新发布', isAuth: true, type: 4 } }, + { path: 'edittasksFB', component: edittasks, meta: { title: '发布任务', isAuth: true, type: 4 } }, + { path: 'account', component: testKit, meta: { title: '我的测试宝', isAuth: true, type: 5 } }, + // {path:'accountoverview',component:accountoverview,meta: { title: '账户概览', isAuth: true,type:5}}, + // {path:'transaction',component:transaction,meta: { title: '交易记录', isAuth: true,type:5}}, + // {path:'tranpassword',component:tranpassword,meta: { title: '交易密码', isAuth: true,type:5}}, + { path: 'demand', component: demand, meta: { title: '我要用人', isAuth: true, type: 6 } }, + { path: 'myreview', component: myreview, meta: { title: '我的评价', isAuth: true, type: 5 } }, + { path: 'myBm', component: myBm, meta: { title: '我的培训班', isAuth: true, type: 5 } }, ] }, @@ -150,16 +151,16 @@ const router = new Router({ router.beforeEach((to, from, next) => { // 百度统计 - const tjarr = ['/market', '/crowdsourcing', '/ability' ,'/college', '/about'] + const tjarr = ['/market', '/crowdsourcing', '/ability', '/college', '/about'] if (_hmt) { if (tjarr.some(it => it == to.path)) { - _hmt.push(['_trackPageview', '/' + to.fullPath]); + _hmt.push(['_trackPageview', '/' + to.fullPath]); } } // console.log(store.getters.companyStatus); - let token=store.getters.token; + let token = store.getters.token; // if(token){ // store.dispatch("SET_KEYSAASDICT") // } @@ -200,13 +201,13 @@ router.beforeEach((to, from, next) => { // // next() // // } // } else { - next() + next() // } }) // 解决这个报错：vue-router.esm.js?ac56:2065 Uncaught (in promise) NavigationDuplicated: Avoided redundant navigation to current location: "/login?type=log". // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 const originalPush = Router.prototype.push -Router.prototype.push = function push (location) { +Router.prototype.push = function push(location) { return originalPush.call(this, location).catch(err => err) } export default router; \ No newline at end of file