Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/router/index.js

@@ -304,6 +304,12 @@ export default new Router({
           path: '/usersCoupon',
           name: 'usersCoupon',
           component: resolve => require(['@/components/UserMan/usersCoupon'], resolve),
+        },
+         // 用户管理 微店的基础设置
+         {
+          path: '/tinyMerchantSet',
+          name: 'tinyMerchantSet',
+          component: resolve => require(['@/components/UserMan/tinyMerchant/tinyMerchantSet'], resolve),
         },
         // 商品管理 素材管理
         {