merge: 合并

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

@@ -1,30 +1,30 @@
-{
+{
-    "description": "项目配置文件。",
+    "description": "项目配置文件。",
-    "packOptions": {
+    "packOptions": {
-        "ignore": [],
+        "ignore": [],
-        "include": []
+        "include": []
-    },
+    },
-    "setting": {
+    "setting": {
-        "urlCheck": false,
+        "urlCheck": false,
-        "es6": false,
+        "es6": false,
-        "postcss": false,
+        "postcss": false,
-        "minified": false,
+        "minified": false,
-        "newFeature": true,
+        "newFeature": true,
-        "bigPackageSizeSupport": true,
+        "bigPackageSizeSupport": true,
-        "babelSetting": {
+        "babelSetting": {
-            "ignore": [],
+            "ignore": [],
-            "disablePlugins": [],
+            "disablePlugins": [],
-            "outputPath": ""
+            "outputPath": ""
-        },
+        },
-        "ignoreUploadUnusedFiles": false
+        "ignoreUploadUnusedFiles": false
-    },
+    },
-    "compileType": "miniprogram",
+    "compileType": "miniprogram",
-    "libVersion": "3.4.5",
+    "libVersion": "3.4.5",
-    "appid": "touristappid",
+    "appid": "wx39c90de9a0620def",
-    "projectname": "xffxkh-app",
+    "projectname": "xffxkh-app",
-    "condition": {},
+    "condition": {},
-    "editorSetting": {
+    "editorSetting": {
-        "tabIndent": "insertSpaces",
+        "tabIndent": "insertSpaces",
-        "tabSize": 4
+        "tabSize": 4
-    }
+    }
 }

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

@@ -1,7 +1,7 @@
-{
+{
-    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "projectname": "xffxkh-app",
+    "projectname": "xffxkh-app",
-    "setting": {
+    "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": true
-    }
+    }
 }