Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/common/axios.js

@@ -11,6 +11,7 @@ let instance = axios.create({
 instance.interceptors.request.use(config => {
   store.commit('initWaterMarker')
   if (/AppCountryAlbum/.test(location.pathname)) {
+    config.baseURL = '/aca'
     config.url = config.url.replace(/(app|auth|admin)\//, "api/")
   }
   if (/\/grid\//.test(location.pathname)) {
@@ -18,6 +19,7 @@ instance.interceptors.request.use(config => {
   }
   if (/\/project\/police\//.test(location.pathname)) {
     config.baseURL = '/hnjc'
+    config.url = config.url.replace(/(app|auth|admin)\//, "api/")
   }
   if (sessionStorage.getItem("prj") == "saas") {
     config.url = config.url.replace(/(app|auth|admin)\//, "api/")

src/manifest.json

@@ -42,11 +42,11 @@
             "^/online": "/"
           }
         },
-        "/api": {
+        "/aca": {
           "target": "https://test87xcxc.cunwuyun.cn",
           "changeOrigin": true,
           "pathRewrite": {
-            "^/api": "/api"
+            "^/aca": "/"
           }
         },
         "/tmap": {