Merge branch 'newer-branch'

# Conflicts:
#	pages/index/index.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/mp-weixin/project.config.json

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

 {
 {
   "description": "项目配置文件。",
   "description": "项目配置文件。",
   "packOptions": {
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   },
   "setting": {
   "setting": {
     "urlCheck": false,
     "urlCheck": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "es6": false,
+    "postcss": false,
+    "minified": false,
+    "newFeature": true,
+    "bigPackageSizeSupport": true
   },
   },
   "compileType": "miniprogram",
   "compileType": "miniprogram",
-  "libVersion": "3.3.4",
+  "libVersion": "",
   "appid": "wx3a8c6fc90ee21b81",
   "appid": "wx3a8c6fc90ee21b81",
   "projectname": "mindEpoch",
   "projectname": "mindEpoch",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 0,
+      "list": [
+        {
+          "name": "",
+          "path": "",
+          "query": "",
+          "id": 0
+        }
+      ]
+    }
   }
   }
 }
 }
\ No newline at end of file