bug修改

config/dev.env.js

@@ -6,11 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-<<<<<<< .mine
-  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', //http://api.xt.test.sgjyun.com
-=======
   BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
->>>>>>> .theirs
-  // PATIENT_SIT: '"http://test1.sgjyun.com"',
-  // MIRCOMALL_SIT: '"http://mall.test.sgjyun.com"'
 }

src/router/index.js

@@ -125,17 +125,6 @@ export const xt_constantRouterMap = [
   // ////////////////////////////
   // 本地开始
   // /////////////////////////////
-  {
-    path: '/sign',
-    component: Layout,
-    redirect: '/sign/index',
-    name: 'sign',
-    alwaysShow: true,
-    meta: { title: 'signWeight', icon: 'table' },
-    children: [
-      { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-    ]
-  },
   {
     path: '/qcd',
     component: Layout,
@@ -163,7 +152,6 @@ export const xt_constantRouterMap = [
     ]
   },
   {
-<<<<<<< .mine
     path: 'statistics',
     component: Layout,
     redirect: '/statistics/index',
@@ -185,17 +173,6 @@ export const xt_constantRouterMap = [
       meta: {title:'signWeight',icon:'table',noCache:true}
     }]
   },
-  // {
-  //   path: '/sign',
-  //   component: Layout,
-  //   redirect: '/sign/index',
-  //   name: 'sign',
-  //   alwaysShow: true,
-  //   meta: { title: 'signWeight', icon: 'table' },
-  //   children: [
-  //     { path: '/sign/index', component: () => import('@/xt_pages/sign/index'), name: 'signWeight', meta: { title: 'signWeight' }}
-  //   ]
-  // },
   {
     path: '/qcd',
     component: Layout,
@@ -234,78 +211,6 @@ export const xt_constantRouterMap = [
     ]
   },
   {
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
     path: '/patients',
     component: Layout,
     redirect: 'noredirect',