Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

alias.config.js

@@ -0,0 +1,14 @@
+/**
+ * 由于 Vue CLI 3 不再使用传统的 webpack 配置文件，故 WebStorm 无法识别别名
+ * 本文件对项目无任何作用，仅作为 WebStorm 识别别名用
+ * 进入 WebStorm preferences -> Language & Framework -> JavaScript -> Webpack，选择这个文件即可
+ * */
+const resolve = dir => require('path').join(__dirname, dir);
+
+module.exports = {
+    resolve: {
+        alias: {
+            '@': resolve('src')
+        }
+    }
+};

src/router/index.js

@@ -133,6 +133,10 @@ const router = new Router({
               name: "IncreaseStaffManagerBatchAdd",
               component: IncreaseStaffManagerBatchAdd,
             },
+            {
+              path: "/shop/increase/welcome/list",
+              component: () => import('@/pages/shop/IncreaseWelcomeList'),
+            },
           ],
         },
         {
@@ -208,6 +212,24 @@ const router = new Router({
             },
           ],
         },
+        {
+          path: '/recruit',
+          component: IncreaseData,
+          children: [
+            {
+              path: '/recruit/bulletin/index',
+              component: () => import('@/pages/recruit/BulletinIndex'),
+            },
+            {
+              path: '/recruit/check/list',
+              component: () => import('@/pages/recruit/CheckList'),
+            },
+            {
+              path: '/recruit/promoter/list',
+              component: () => import('@/pages/recruit/PromoterList'),
+            },
+          ]
+        },
         {
           path: "/customer/view",
           name: "CustomerView",

vue.config.js

@@ -31,8 +31,8 @@ module.exports = {
     // proxy: 'http://192.168.1.123:8312/'
     // proxy: 'http://192.168.31.177:8312/'
     // proxy: 'http://localhost:8312/'
-    // proxy: "http://111.231.218.44:8080/",
-    proxy: 'http://localhost:8080/',
+    proxy: "http://111.231.218.44:8080/",
+    // proxy: 'http://localhost:8080/',
     // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
   },
   chainWebpack: (config) => {