merge解决冲突

src/router/router.js

@@ -63,6 +63,8 @@ const createLive = r => require.ensure([], () => r(require('../views/yqrange/cre
 
 const shopList = r => require.ensure([], () => r(require('../views/shop/shop-list.vue')), 'shop-list')
 const createShop = r => require.ensure([], () => r(require('../views/shop/create-shop.vue')), 'create-shop')
+const goodsManage = r => require.ensure([], () => r(require('../views/goods/goods-manage.vue')), 'goods-manage')
+const createGood = r => require.ensure([], () => r(require('../views/goods/create-good.vue')), 'create-good')
 const orderManage = r => require.ensure([], () => r(require('../views/shop/order-manage.vue')), 'order-manage')
 
 
@@ -271,6 +273,16 @@ export default [{
             path: '/order-manage',
             component: orderManage,
         },
+        {
+            path: '/goods-manage',
+            component: goodsManage,
+        },
+        {
+            path: '/create-good',
+            component: createGood,
+        },
+
+
       // {
       //   path: '/followup',
       //   name: 'followUp',

src/views/layout/slidebar.vue

@@ -425,6 +425,12 @@
           index: 'shop-list'
         };
         vm.items.push(shop);
+        const shop1 = {
+          title: '商品管理',
+          icon: 'el-icon-first-aid-kit',
+          index: 'goods-manage'
+        };
+        vm.items.push(shop1);
       },
 
       goToMessageSendPage(checkAuth) {