Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-weChat

project.private.config.json

@@ -8,5 +8,18 @@
     "preloadBackgroundData": false
   },
   "libVersion": "3.0.1",
-  "projectname": "sagacloud-sagacare-weChat"
+  "projectname": "sagacloud-sagacare-weChat",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "",
+          "pathName": "packagesEnv/pages/officehome/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
 }

src/api/user.js

@@ -71,8 +71,8 @@ function refreshToken(refreshToken) {
 // 获取用户空间权限
 function getUserControlSpace(params) {
   return $http({
-      url: `http://192.168.88.4:52009/userControlSpace/query`,
-      // url: `${config.setupService}userControlSpace/query`,
+      // url: `http://192.168.88.4:52009/userControlSpace/query`,
+      url: `${config.duoduoenvService}userControlSpace/query`,
       method: 'POST',
       data: JSON.stringify(params),
       isComParams: false    // 是否携带通用的参数

src/common/utils.js

@@ -1197,6 +1197,9 @@ function getMapSpaceIcon(type) {
     "空调机房": "map-icon18.svg",
 
   }
-  return obj[typeName]
+  return {
+    typeName: typeName,
+    icon: obj[typeName]
+  }
 }
 

src/packagesEnv/api/mapApi.js

@@ -24,8 +24,8 @@ function getFloorList(params) {
 // 获取地图数据
 function getMapInfo(params) {
     return $http({
-        url: `http://192.168.88.4:52015/map/queryMapInfo`,
-        // url: `${config.setupService}map/queryMapInfo`,
+        // url: `http://192.168.88.4:52015/map/queryMapInfo`,
+        url: `${config.setupService}map/queryMapInfo`,
         method: 'POST',
         data: JSON.stringify(params),
         isComParams: false    // 是否携带通用的参数