Merge remote-tracking branch 'aliyun/feature/20251130-hhq' into test1206

# Conflicts:
#	src/router/index.js

src/components/PortalHeader.vue

@@ -419,9 +419,9 @@ export default {
     handleContributor(val) {
       let urlPre = window.location.protocol + "//" + window.location.host;
       let obj = {
-        one: urlPre + "/web/contributornew/index",
-        two: urlPre + "/web/contributor/index",
-        three: urlPre + "/web/contributor_2024/index",
+        one: urlPre + "/pc/contributornew/index",
+        two: urlPre + "/pc/contributor/index",
+        three: urlPre + "/pc/contributor_2024/index",
       };
       window.open(obj[val]);
     },

src/router/index.js

@@ -18,27 +18,27 @@ export const constantRoutes = [{
   path: '',
   redirect: '/study'
 },
-{
-  path: '/loading',
-  hidden: true,
-  component: (resolve) => require(['@/views/Loading'], resolve),
-  name: 'loading',
-  meta: { title: '正在进入学习中心', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/login',
-  hidden: true,
-  component: (resolve) => require(['@/views/Login'], resolve),
-  name: 'login',
-  meta: { title: '京东方大学堂登录', icon: 'dashboard', noCache: true, affix: false },
-},
-{
-  path: '/index',
-  hidden: true,
-  component: (resolve) => require(['@/views/Index'], resolve),
-  name: 'index',
-  meta: { title: '首页', icon: 'dashboard', noCache: true, affix: false },
-},
+  {
+    path: '/loading',
+    hidden: true,
+    component: (resolve) => require(['@/views/Loading'], resolve),
+    name: 'loading',
+    meta: {title: '正在进入学习中心', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/login',
+    hidden: true,
+    component: (resolve) => require(['@/views/Login'], resolve),
+    name: 'login',
+    meta: {title: '京东方大学堂登录', icon: 'dashboard', noCache: true, affix: false},
+  },
+  {
+    path: '/index',
+    hidden: true,
+    component: (resolve) => require(['@/views/Index'], resolve),
+    name: 'index',
+    meta: {title: '首页', icon: 'dashboard', noCache: true, affix: false},
+  },
 // {
 //   path: '/grateful/index',
 //   hidden: true,
@@ -382,7 +382,133 @@ export const constantRoutes = [{
   component: (resolve) => require(['@/views/new-employee/StudyPage'], resolve),
   name: 'NewEmployeeStudy',
   meta: { title: '社招新员工学习页面', icon: 'dashboard', noCache: true, affix: false },
-}
+  },
+  {
+    path: '/contributor/index',
+    component: (resolve) => require(['@/views/contributorConference/index'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor/colleage',
+    component: (resolve) => require(['@/views/contributorConference/colleage'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor/course',
+    component: (resolve) => require(['@/views/contributorConference/course'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor/project',
+    component: (resolve) => require(['@/views/contributorConference/project'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor/teacher',
+    component: (resolve) => require(['@/views/contributorConference/teacher'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor/example',
+    component: (resolve) => require(['@/views/contributorConference/example'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'projectDetail',
+    path: '/contributor/projectDetail/:id',
+    component: (resolve) => require(['@/views/contributorConference/detail/projectDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'contributorCourseDetail',
+    path: '/contributor/courseDetail/:id',
+    component: (resolve) => require(['@/views/contributorConference/detail/courseDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/index',
+    component: (resolve) => require(['@/views/contributorConferenceNew/index'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/colleage',
+    component: (resolve) => require(['@/views/contributorConferenceNew/colleage'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/course',
+    component: (resolve) => require(['@/views/contributorConferenceNew/course'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/project',
+    component: (resolve) => require(['@/views/contributorConferenceNew/project'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/teacher',
+    component: (resolve) => require(['@/views/contributorConferenceNew/teacher'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributornew/example',
+    component: (resolve) => require(['@/views/contributorConferenceNew/example'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'projectDetailnew',
+    path: '/contributornew/projectDetail/:id',
+    component: (resolve) => require(['@/views/contributorConferenceNew/detail/projectDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'courseDetailnew',
+    path: '/contributornew/courseDetail/:id',
+    component: (resolve) => require(['@/views/contributorConferenceNew/detail/courseDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/index',
+    component: (resolve) => require(['@/views/contributorConference2024/index'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/colleage',
+    component: (resolve) => require(['@/views/contributorConference2024/colleage'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/course',
+    component: (resolve) => require(['@/views/contributorConference2024/course'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/project',
+    component: (resolve) => require(['@/views/contributorConference2024/project'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/teacher',
+    component: (resolve) => require(['@/views/contributorConference2024/teacher'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    path: '/contributor_2024/example',
+    component: (resolve) => require(['@/views/contributorConference2024/example'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'projectDetail_2024',
+    path: '/contributor_2024/projectDetail/:id',
+    component: (resolve) => require(['@/views/contributorConference2024/detail/projectDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  },
+  {
+    name:'courseDetail_2024',
+    path: '/contributor_2024/courseDetail/:id',
+    component: (resolve) => require(['@/views/contributorConference2024/detail/courseDetail'], resolve),
+    meta: {title: '京东方大学堂', icon: 'dashboard', noCache: true, affix: true }
+  }
 
 ]
 
@@ -394,7 +520,7 @@ const router = new VueRouter({
     if (saveTop) {
       return saveTop;
     } else {
-      return { x: 0, y: 0 }
+      return {x: 0, y: 0}
     }
   },
 })