55

src/router/index.js

@@ -98,18 +98,6 @@ router.beforeEach((to, from, next) => {
           next();
         });
     } else {
-      // // 判断外链并跳转
-      // if (to.meta) {
-      //   if (to.meta.source && to.meta.source == 2) {
-      //     // console.log(to, 99999);
-      //     next({
-      //       path: `/source`,
-      //       query: { link: to.meta.iframe }
-      //     });
-      //     return;
-      //   }
-      // }
-      // console.log(router.getRoutes(), 'router', routes);
       if (routes.length >= router.getRoutes()?.length) {
         router.addRoute(
           getMenuRoutes([

src/router/routes.js

@@ -64,11 +64,6 @@ export function getMenuRoutes(menus, homePath) {
       path: REDIRECT_PATH + '/:path(.*)',
       component: RedirectLayout,
       meta: { hideFooter: true }
-    },
-    {
-      path: '/source',
-      component: () => import('@/views/source/index.vue'),
-      meta: { hideFooter: true }
     }
   ];
   // 路由铺平处理

src/store/modules/user.js

@@ -30,7 +30,6 @@ const formatRouter = (list) => {
         path: p.path
       };
       arr.push(p);
-      // }
     }
 
     return arr;

vue.config.js

@@ -34,11 +34,7 @@ module.exports = {
         target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.147:18086',
         // target: 'http://192.168.1.176:18086',
-<<<<<<< HEAD
-        target: 'http://192.168.1.251:18086',
-=======
-        // target: 'http://192.168.1.105:18086',
->>>>>>> 866dc168fc57299028e59132d401fbaac491d42b
+
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {