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/custom-tab-bar/index.wxml

@@ -1,8 +0,0 @@
-<!--components/custom-tab-bar/index.wxml-->
-<view class="tab-bar">
-    <view wx:for="{{list}}" wx:key="index" class="tab-bar-item {{item.bulge?'bulge':''}}" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="{{item.jump=='nav'?'navigateTo':'switchTab'}}">
-    <image class="image" src="{{selected == index ? item.selectedIconPath : item.iconPath}}" mode="heightFix"></image>
-    <view wx:if="{{item.text}}" class="tab-bar-view"
-     style="color: {{selected==index?selectedColor:color}};">{{item.text}}</view>
-    </view>
-</view>