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/build/mp-weixin/pagesStock/stockCenterDetails/stockCenterDetails.json

@@ -1,13 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {
-    "nav-bar": "../../components/navBar/navBar",
-    "gqjg-view": "../../components/gqjg-view/gqjg-view",
-    "ywjg-view": "../../components/ywjg-view/ywjg-view",
-    "cyl-view": "../../components/cyl-view/cyl-view",
-    "fzlc-view": "../../components/fzlc-view/fzlc-view",
-    "zysj-view": "../../components/zysj-view/zysj-view",
-    "news-view": "../../components/news-view/news-view",
-    "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup"
-  }
-}