Merge branch 'hcb' of SH-Arbitrate/miniapp into dev

config.js

@@ -1,8 +1,9 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapi',
+	baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
 	// baseUrl: 'http://121.40.189.20:9001',
-	baseUrl: 'http://121.40.189.20:8001',
+	// baseUrl: 'http://121.40.189.20:8001',
 	// baseUrl: 'http://192.168.3.77:8080',
 	// baseUrl: 'http://localhost:8080',
 	// baseUrl: 'http://192.168.3.18:9001',
@@ -27,4 +28,4 @@ module.exports = {
 			}
 		]
 	}
-}
+}

unpackage/dist/dev/mp-weixin/app.json

@@ -5,6 +5,8 @@
     "pages/work/index",
     "pages/handlecase/index",
     "pages/handlecase/component/uploadEvidence",
+    "pages/handlecase/component/evidenceList",
+    "pages/handlecase/component/obligations",
     "pages/expressDelivery/index",
     "pages/expressDelivery/component/expressDelivery",
     "pages/signature/index",
@@ -15,7 +17,9 @@
     "mp_ecard_sdk/protocol/service/service",
     "mp_ecard_sdk/protocol/userAccredit/userAccredit",
     "pages/im/index",
-    "pages/realName"
+    "pages/realName",
+    "pages/personalInfoCollection",
+    "pages/im/component/imHome"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.0.1",
   "appid": "wx91cb8459dca561b4",
   "projectname": "智慧仲裁",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }