From dce67cb7d1d499002bc4e7ad28b9d3efa74c8987 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Wed, 22 Sep 2021 09:29:07 +0800
Subject: [PATCH] tabbar样式调整

---
 custom-tab-bar/index.wxml | 35 ++++++++++++++++++-----------------
 custom-tab-bar/index.wxss | 35 +++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 498596d..4b549a4 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,28 +1,29 @@
 <!-- 如果是自定义的话 -->
-<view  class="main_bar" style=" background: {{backgroundColor}}; font-size: 23rpx;">
+<view  class="main_bar {{is_custum?'custom':''}}" style=" background: {{backgroundColor}}; font-size: 22rpx;">
        <block wx:for="{{list}}" wx:for-index="idx"> 	  
-		   <block wx:if="{{item.nav_name!='分销' || is_custum}}">
-				<view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}" 
-				   style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};">
-				   <view wx:if="{{item.nav_name=='购物车'}}"  class="cart_num" >{{cartGoodsNum}} </view>
-				   <view class="tab_img" style="margin-top: 6rpx;">
+		   <block wx:if="{{item.nav_name !== '分销' || is_custum}}">
+				 <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
+				    style="color: {{active==idx?fontcolor_sele:fontcolor}};">
+				<!-- <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}" 
+				   style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};"> -->
+				   
+				   <view class="tab_img">
+						 <view wx:if="{{item.nav_name=='购物车' && cartGoodsNum != 0}}"  class="cart_num" >{{cartGoodsNum}}</view>
 					   <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
 				   </view>
-				   <view style="height:20px;line-height:15px; margin-top: 2rpx;">
-					  {{item.nav_name}}
-				   </view>
+				   <view>{{item.nav_name}}</view>
 				</view>
 			</block>
-			<!-- 是分销商，且不是自定义，且可以显示 -->
-			 <block wx:if="{{item.nav_name=='分销' && !is_custum  && !is_no_distri}}">
-				   <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
-				      style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};">
-				      <view class="tab_img" style="margin-top: 6rpx;">
+			<!-- 是分销商且没有关闭，可以显示 -->
+			 <block wx:if="{{((item.nav_name === '分销') && (item.weappurl === '/pages/distribution/distribution'))  && (is_no_distri == 0)}}">
+					<view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
+					   style="color: {{active==idx?fontcolor_sele:fontcolor}};">
+				   <!-- <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
+				      style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};"> -->
+				      <view class="tab_img">
 				   	   <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
 				      </view>
-				      <view style="height:20px;line-height:15px; margin-top: 2rpx;">
-				   	  {{item.nav_name}}
-				      </view>
+				      <view>{{item.nav_name}}</view>
 				   </view>
 			 </block>	 			
       </block>
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index a48f6ac..71558c6 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -7,40 +7,51 @@
 	z-index: 10000;
 	display: flex;
 	justify-content: space-around;
+	height: 100rpx;
+}
+.main_bar.custom {
+	border-top: none;
 }
 
 .tabbar_item {
 	position: relative;
-	height: 100%;
-	float: left;
+	/* height: 100%; */
+	/* float: left; */
 	text-align: center;
-	padding: 0px 0;
+	padding: 0;
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	justify-content: center;
 }
 
 .tab_img {
 	display: flex;
 	justify-content: center;
-	align-items: center
+	position: relative;
 }
 
 .nav_imgage {
-	height: 52rpx;
-	width: 52rpx;
-	background-position: center;
+	display: block;
+	height: 48rpx;
+	width: 48rpx;
 	background-repeat: no-repeat;
+	/* background-position: center;
+	background-repeat: no-repeat; */
 	background-size: 100%;
 }
 
 .cart_num {
-	top: 0;
+	/* top: 8rpx; */
 	background-color: red;
 	color: #fff;
 	font-size: 20rpx;
 	border-radius: 50%;
-	width: 40rpx;
-	line-height: 40rpx;
-	height: 40rpx;
+	width: 36rpx;
+	line-height: 36rpx;
+	height: 36rpx;
 	position: absolute;
 	z-index: 100;
-	right: 30rpx;
+	right: 34rpx;
+	/* margin-right: -70rpx; */
 }
--
libgit2 0.21.4