合并

src/router/index.js

@@ -2,7 +2,10 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 Vue.use(VueRouter)
-
+const originalPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
 const routes = [{
         path: '/',
         redirect: '/projectApplication'
@@ -86,20 +89,20 @@ const routes = [{
                 meta: { isAuth: true }
 
             },
-            { //学分登记
-                name: 'credit',
-                path: '/credit',
-                component: () =>import ('@/views/credit/credit.vue'),
-                meta: { isAuth: true }
-
-            },
-            { //学分登记
-                name: 'credit1',
-                path: '/credit1',
-                component: () =>import ('@/views/credit/credit1.vue'),
-                meta: { isAuth: true }
-
-            },
+            // { //学分登记
+            //     name: 'credit',
+            //     path: '/credit',
+            //     component: () =>import ('@/views/credit/credit.vue'),
+            //     meta: { isAuth: true }
+
+            // },
+            // { //学分登记
+            //     name: 'credit1',
+            //     path: '/credit1',
+            //     component: () =>import ('@/views/credit/credit1.vue'),
+            //     meta: { isAuth: true }
+
+            // },
             { //创业公司登记
                 name: 'firm',
                 path: '/firm',

src/views/home.vue

@@ -34,7 +34,7 @@
             {id:3,label:"资金使用管理",goto:"/makerfund",icon:"iconfont icon-zijinguanli"},
             {id:4,label:"项目管理",goto:"/ProjectManagement",icon:"el-icon-receiving"},
             {id:5,label:"项目结项",goto:"/projectSettlement",icon:"iconfont icon-_yuanhuanchong"},
-            {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
+            // {id:6,label:"学分登记",goto:"/credit",icon:"iconfont icon-yonghu"},
             {id:7,label:"成果展示",goto:"/resultsShow",icon:"iconfont icon-xiangmuguanli2"},
             {id:8,label:"创业公司登记",goto:"/firm",icon:"iconfont icon-zuzhijiegou"},
             {id:9,label:"消息通知",goto:"/messageNotification",icon:"iconfont icon-xiaoxitongzhi3"},