Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

config/proxyList.js

@@ -15,11 +15,11 @@ module.exports = {
         '^/haoban-manage3-web': ''
       }
     },
-    '/api/': {
-      target: 'https://www.gicdev.com/',
+    '/api-plug/': {
+      target: 'https://www.gicdev.com/api-plug/',
       changeOrigin: true,
       pathRewrite: {
-        '^/api': ''
+        '^/api-plug': ''
       }
     },
     '/haoban-app-customer-web/': {

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -334,7 +334,7 @@ export default {
       this.getStore();
     },
     async getStore() {
-      await postRequest(`/api/api-plug/query-store-by-code-name-new?requestProject=haoban-manage-web`, this.storeParam).then(res => {
+      await postRequest(`/api-plug/query-store-by-code-name-new?requestProject=haoban-manage-web`, this.storeParam).then(res => {
         if (res.data.errorCode == 0) {
           this.storeParam.total = res.data.totalCount;
           if (Array.isArray(res.data.result.result)) {
@@ -356,7 +356,7 @@ export default {
     },
     // 获取导购列表数据
     async getStraff() {
-      await postRequest(`/api/api-plug/search-clerk?type=2`, { name: this.name }).then(res => {
+      await postRequest(`/api-plug/search-clerk?type=2`, { name: this.name }).then(res => {
         if (res.data.errorCode == 0) {
           this.memberList = res.data.result || [];
         }