merge

.gitignore

@@ -6,5 +6,9 @@ vue-dist
 dist
 dist.zip
 client-dist
+<<<<<<< HEAD
+=======
+
+>>>>>>> dev
 # code protect - prevent submit code below
 .vscode

src/router/routes.js

 import viewerRoutes from '@/modules/viewer/routes.js'
 
 export default [
+  { path: '*', redirect: '/' },
   { path: '/', redirect: '/login/is-login' },
   {
     path: '/login/index',
@@ -24,7 +25,7 @@ export default [
     path: '/login/is-login',
     name: 'login-isLogin',
     component: () => import('@/pages/login/isLogin.vue'),
-    props: (route) => ({ query: route.query, params: route.params })
+    props: route => ({ query: route.query, params: route.params })
   },
   {
     path: '/login/register',
@@ -103,20 +104,20 @@ export default [
           { path: 'feedback-list', component: () => import('../pages/feedback/feedbackList.vue') },
           { path: 'feedback-create', component: () => import('../pages/feedback/feedbackCreate.vue') }
         ]
-      // },
-      // {
-      //   path: 'service-hall',
-      //   redirect: 'error/404',
-      //   component: () => import('@/components/learnSysLayout/container.vue'),
-      //   children: [
-      //     // { path: 'hall', component: () => import('../pages/serviceHall/hall.vue') },
-      //     // { path: 'learning-add/:rid', component: () => import('../pages/serviceHall/learningAdd.vue'), props: true },
-      //     // { path: 'share-add/:rid', component: () => import('../pages/serviceHall/shareAdd.vue'), props: true },
-      //     // { path: 'again-add/:rid', component: () => import('../pages/serviceHall/againAdd.vue'), props: true },
-      //     // { path: 'my-apply', component: () => import('../pages/serviceHall/myApply.vue'), props: true },
-      //     // { path: 'upload-report/:rid/:reid', component: () => import('../pages/serviceHall/uploadReport.vue'), props: true },
-      //     // { path: 'view-report/:rid', component: () => import('../pages/serviceHall/viewReport.vue'), props: true }
-      //   ]
+        // },
+        // {
+        //   path: 'service-hall',
+        //   redirect: 'error/404',
+        //   component: () => import('@/components/learnSysLayout/container.vue'),
+        //   children: [
+        //     // { path: 'hall', component: () => import('../pages/serviceHall/hall.vue') },
+        //     // { path: 'learning-add/:rid', component: () => import('../pages/serviceHall/learningAdd.vue'), props: true },
+        //     // { path: 'share-add/:rid', component: () => import('../pages/serviceHall/shareAdd.vue'), props: true },
+        //     // { path: 'again-add/:rid', component: () => import('../pages/serviceHall/againAdd.vue'), props: true },
+        //     // { path: 'my-apply', component: () => import('../pages/serviceHall/myApply.vue'), props: true },
+        //     // { path: 'upload-report/:rid/:reid', component: () => import('../pages/serviceHall/uploadReport.vue'), props: true },
+        //     // { path: 'view-report/:rid', component: () => import('../pages/serviceHall/viewReport.vue'), props: true }
+        //   ]
       },
       {
         path: 'tips',
@@ -260,11 +261,11 @@ export default [
       }
     ]
   },
-  /* mobileLive 移动端 */
+  /* mobile 移动端 */
   {
     path: '/mobile',
     redirect: '/mobile/0/0/error/404',
-    component: () => import('@/pages/mobileLive/index.vue'),
+    component: () => import('@/pages/mobile/index.vue'),
     props: true,
     children: [
       {
@@ -274,18 +275,18 @@ export default [
       {
         path: 'list',
         name: 'mobileIndex',
-        component: () => import('@/pages/mobileLive/list.vue'),
+        component: () => import('@/pages/mobile/list.vue'),
         props: true
       },
       {
         path: 'help/student',
         name: 'studentHelp',
-        component: () => import('@/pages/mobileLive/studentHelp.vue')
+        component: () => import('@/pages/mobile/studentHelp.vue')
       },
       {
         path: 'help/teacher',
         name: 'teacherHelp',
-        component: () => import('@/pages/mobileLive/teacherHelp.vue')
+        component: () => import('@/pages/mobile/teacherHelp.vue')
       }
     ]
   },
@@ -305,8 +306,6 @@ export default [
   // },
   // /* survey-phone 内未找到页面时 - 指向 */
   // { path: '/survey-phone/*', redirect: '/learn-error/learn-error' },
-  /* 如果所有页面都没找到 - 指向 */
-  { path: '*', component: () => import('@/components/errorPages/404.vue') },
   // viewer module routes
   ...viewerRoutes
 ]