Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

custom-tab-bar/index.wxml

 <!--miniprogram/custom-tab-bar/index.wxml-->
-<view  class="tab-bar {{show?'':'hide'}}" style="--main-color : {{mainColor}}">
+<view class="tab-bar {{show?'':'hide'}} {{(componentData.scrollHide) && showFlag=='down'?'down':'up'}}" style="--main-color : {{mainColor}}">
 	<!-- <view class="antt ant-daipinglun"></view> -->
 	<!-- <view class="iconfont icon-fenzhi">3</view> -->
 
@@ -16,21 +16,21 @@
 		<!-- &&componentData['styleSelectionNum']==1 -->
 		<!-- 图标 -->
 		<view class="item">
-		<view >
-			<view  wx:if="{{item.iconType==0||!item.iconType}}">
-				<view class="antt {{item.icon}}" style="font-size:{{componentData.defaultIcon==1 ? '36rpx' : (componentData.defaultIconSize*2 + 'rpx')}};color:{{index==selected?componentData.selectIconColor:componentData.defaultIconColor}}"></view>
+			<view>
+				<view wx:if="{{item.iconType==0||!item.iconType}}">
+					<view class="antt {{item.icon}}" style="font-size:{{componentData.defaultIcon==1 ? '36rpx' : (componentData.defaultIconSize*2 + 'rpx')}};color:{{index==selected?componentData.selectIconColor:componentData.defaultIconColor}}"></view>
+				</view>
+				<view
+				 wx:elif="{{item.iconType==1}}"
+				 class="img-view"
+				 style="width:{{(index==selected?componentData.selectionIconSize*2:componentData.defaultIconSize*2)+'rpx'}};height:{{(index==selected?componentData.selectionIconSize*2:componentData.defaultIconSize*2)+'rpx'}}"
+				>
+					<image mode="aspectFit" src="{{selected === index ? item.selectImgUrl : item.imgUrl}}"></image>
+				</view>
 			</view>
-			<view
-			 wx:elif="{{item.iconType==1}}"
-			 class="img-view"
-			 style="width:{{(index==selected?componentData.selectionIconSize*2:componentData.defaultIconSize*2)+'rpx'}};height:{{(index==selected?componentData.selectionIconSize*2:componentData.defaultIconSize*2)+'rpx'}}"
-			>
-				<image mode="aspectFit" src="{{selected === index ? item.selectImgUrl : item.imgUrl}}"></image>
-			</view>
-		</view>
-		<!-- 名称 -->
-		<view class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? componentData.selectionTextNum*2 : componentData.defaultTextNum*2}}rpx">
-			{{item.title}}</view>
+			<!-- 名称 -->
+			<view class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? componentData.selectionTextNum*2 : componentData.defaultTextNum*2}}rpx">
+				{{item.title}}</view>
 		</view>
 	</view>
 </view>

custom-tab-bar/index.wxss

@@ -1468,3 +1468,27 @@
 .hide{
   display: none;
 }
+.down{
+  transition: all 0.3s;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  transform: translateY(150px);
+  -webkit-transform: translateY(150px);
+  -moz-transform: translateY(150px);
+  -ms-transform: translateY(150px);
+  -o-transform: translateY(150px);
+}
+.up{
+  transition: all 0.3s;
+  -webkit-transition: all 0.3s;
+  -moz-transition: all 0.3s;
+  -ms-transition: all 0.3s;
+  -o-transition: all 0.3s;
+  transform: translateY(0);
+  -webkit-transform: translateY(0);
+  -moz-transform: translateY(0);
+  -ms-transform: translateY(0);
+  -o-transform: translateY(0);
+}
\ No newline at end of file