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

# Conflicts:
#	unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/assets.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/components/LCCalendar/LCCalendar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/geGuCenter/geGuCenter.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
#	unpackage/dist/dev/mp-weixin/common/assets.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/components/zysj-view/zysj-view.js
#	unpackage/dist/dev/mp-weixin/pages/geGuCenter/geGuCenter.wxml
#	unpackage/dist/dev/mp-weixin/pages/mine/mine.js
#	unpackage/dist/dev/mp-weixin/pages/ztfx/ztfx.js
#	unpackage/dist/dev/mp-weixin/pagesMine/vip/vip.js
#	unpackage/dist/dev/mp-weixin/pagesMine/vipMeal/vipMeal.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/bkydmx.wxml
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/cwDetails.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/stockCenterDetails.js
#	unpackage/dist/dev/mp-weixin/pagesStock/stockCenterDetails/ztfx.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>