Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/concept/historicalTimeline/historicalTimeline.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js

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

@@ -1,42 +0,0 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "JiaZhiQianYan",
-  "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": true
-  },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pagesStock/stockCenterDetails/cwDetails",
-          "pathName": "pagesStock/stockCenterDetails/cwDetails",
-          "query": "index=0",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
-          "name": "pagesStock/stockCenterDetails/stockCenterDetails",
-          "pathName": "pagesStock/stockCenterDetails/stockCenterDetails",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/index/hotStock/hotStock",
-          "pathName": "pages/index/hotStock/hotStock",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/index/conceptCenter/conceptCenter",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  }
-}