11

src/router/index.js

@@ -63,15 +63,15 @@ const routes = [{
     component: () =>
       import('v/index/recruit/Index.vue')
   },
-  {
-    path: "/404",
-    name: "notFound",
-    component: () =>
-      import('v/index/notFound.vue'),
-  }, {
-    path: "*", // 此处需特别注意置于最底部
-    redirect: "/404"
-  }
+  // {
+  //   path: "/404",
+  //   name: "notFound",
+  //   component: () =>
+  //     import('v/index/notFound.vue'),
+  // }, {
+  //   path: "*", // 此处需特别注意置于最底部
+  //   redirect: "/404"
+  // }
 
 ]
 
@@ -160,7 +160,7 @@ function checkCam(code, cb) {
 }
 
 router.beforeEach((to, from, next) => {
-  // console.log(next, 'next')
+  console.log(to, 'to')
   let
     toLogin = "/login",
     toRegister = "/register",
@@ -191,6 +191,8 @@ router.beforeEach((to, from, next) => {
     });
   } else {
     code = to.params.code ? to.params.code : to.query.code;
+    // console.log(code);
+    //return next();
     let token = window.localStorage.getItem("index-token" + code);
     if (!token) {
       checkCam(code, (res) => {

src/router/index/camp.js

@@ -7,23 +7,21 @@ export default [{
     }
   },
   {
-    path: '/homework',
+    path: 'homework',
     name: 'index-homework',
     component: () => import('v/index/camp/Homework.vue'),
     meta: {
       title: '营地作业'
+    }
   },
-    children: [{
-        path: '/refer',
-        name: 'refer',
+  {
+    path: '/homework/refer',
+    name: 'homework-refer',
     component: () => import('v/index/camp/homework/refer.vue'),
     meta: {
       title: '提交作业'
     },
   },
-
-    ]
-  },
   {
     path: '/certificate',
     name: 'index-certificate',

src/router/index/personalInfo.js

 export default [{
     path: '/personalInfo',
     name: 'index-personalInfo',
-    component: () => import(/* webpackChunkName: "login" */ 'v/index/Info/personalInfo.vue'),
+    component: () => import('v/index/Info/personalInfo.vue'),
     meta: {
       title: '个人资料'
     }
@@ -9,11 +9,9 @@ export default [{
   {
     path: '/password',
     name: 'index-password',
-    component: () => import(/* webpackChunkName: "reset" */ 'v/index/Info/password.vue'),
+    component: () => import('v/index/Info/password.vue'),
     meta: {
       title: '修改密码'
     }
   },
- 
-  ]
-  
\ No newline at end of file
+]

src/views/index/camp/Index.vue

@@ -28,13 +28,7 @@
         </div>
 
         <div class="camp_right" ref="rightBox">
-          <router-view 
-     
-          @getStatus="getStatus"
-         
-          
-          
-           />
+          <router-view @getStatus="getStatus" />
         </div>
       </div>
     </div>
@@ -47,9 +41,9 @@
 import Cookie from "js-cookie";
 import Header from "@/components/index/SignUp/Header.vue";
 import Footer from "@/components/index/Footer.vue";
-import svg1 from '@/assets/img/signUp/icon.svg';
-import svg2 from '@/assets/img/signUp/icon-1.svg';
-import svg3 from '@/assets/img/signUp/icon-2.svg';
+import svg1 from "@/assets/img/signUp/icon.svg";
+import svg2 from "@/assets/img/signUp/icon-1.svg";
+import svg3 from "@/assets/img/signUp/icon-2.svg";
 
 export default {
   name: "campIndex",
@@ -69,19 +63,19 @@ export default {
           id: "0",
           desc: "营地报名",
           icon: "icon-icon1",
-          url: svg1
+          url: svg1,
         },
         {
           id: "1",
           desc: "营地作业",
           icon: "icon-icon-1",
-          url: svg2
+          url: svg2,
         },
         {
           id: "2",
           desc: "营地证书",
           icon: "icon-icon-2",
-          url: svg3
+          url: svg3,
         },
       ],