Почетна Преглед Помоћ
Регистрација Пријавите се
zhangqi
/
yos_web
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

商品管理

zhangqiOMG пре 2 година
родитељ
aab77f54e1
комит
8022a7382f
2 измењених фајлова са 0 додато и 12 уклоњено
Подељен поглед Покажи статистику Diff
  1. 0 3
      src/router/HDrpManagement.js
  2. 0 9
      yos/index.html

+ 0 - 3
src/router/HDrpManagement.js
Прегледај датотеку 

@@ -17,7 +17,6 @@ const HDrpManagement = [
 
       keeproute: true
 
     },
 
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/unit/index')
 
-<<<<<<< HEAD
 
   },
 
   {
 
     path: '/productmag',
 
@@ -28,7 +27,6 @@ const HDrpManagement = [
 
       keeproute: true
 
     },
 
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/ProductMag/index')
 
-=======
 
   },{
 
     path: '/sm_saleclass',
 
     name: 'saleclass',
 
@@ -38,7 +36,6 @@ const HDrpManagement = [
 
       keeproute: true
 
     },
 
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/saleclass/index')
 
->>>>>>> 0377377c1e775e79720beb6795642eaf01041de6
 
   }
 
 ]
 
 export default HDrpManagement

+ 0 - 9
yos/index.html
Прегледај датотеку 

@@ -1,9 +0,0 @@
 
-<<<<<<< HEAD
 
-<<<<<<< HEAD
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.786cc5e8.js"></script><link href="css/app.09f1a246.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.a690b3f7.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
-=======
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.a721bc7e.js"></script><link href="css/app.1831ed6a.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.9a0c4174.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
->>>>>>> 826382b084a472a552e433bf7e55c86e4b05dca1
 
-=======
 
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.8ebba0b5.js"></script><link href="css/app.1831ed6a.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.d9087565.js" nomodule></script><script defer="defer" src="js/app-legacy.6b753e68.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
 
->>>>>>> 0377377c1e775e79720beb6795642eaf01041de6