boost + mapmenu

@@ -54,7 +54,7 @@
                 <text class="activity-item">{{se.label_cstr}}</text>
             </view>
             <view wx:if="{{hasActivityRed && se.label_carr.length>0}}" class="activity flex-ll">
-                <view wx:for="{{se.label_carr}}" class="activity-item flex-vc" wx:key="selleractivitykey">{{item.name}}</view>
+                <view wx:for="{{se.label_carr}}" class="activity-item flex-vc activity-item-{{item.type}}" wx:key="selleractivitykey">{{item.name}}</view>
             </view>
         </view>
         <view class="price flex-lr">
@@ -70,7 +70,7 @@
                 <text class="reserve-text" wx:else="">联系餐厅</text>
             </view>
             -->
-            <view class="reserve-button flex-vc" id="reserve-button" catchtap="tapButton">
+            <view class="reserve-button flex-vc" id="reserve-button" catchtap="tapButton" data-type="oncall">
                 订包间
             </view>
         </view>

@@ -138,6 +138,20 @@
   font-weight:500;
   color:rgba(240,85,34,1);
   padding: 0 10rpx;
+  box-sizing: border-box;
+}
+.activity .activity-item-1{
+  height:36rpx;
+  border-radius:6rpx;
+  border:2rpx solid rgba(225,183,127,1);
+  margin-left: 10rpx;
+
+
+  font-size:22rpx;
+  font-family:PingFangSC-Medium,PingFang SC;
+  font-weight:500;
+  color:rgba(225,183,127,1);
+  padding: 0 10rpx;
 }
 .activity .activity-item:first-child{
   margin-left: 0;

@@ -2,7 +2,7 @@
 <view class="tabBar flex-cc" >
     <block wx:for="{{list}}" wx:key="list">
         <view class="item flex-vc" bindtap="redirectTo" data-url="{{item.pagePath}}">
-            <view class="flex-tb {{(selected==index)?'checked':''}}" style="height: 82rpx;">
+            <view class="item-view {{(selected==index)?'checked':''}}">
                 <view class="icon tabicon{{index+1}}"></view>
                 <view class="text">{{item.text}}</view>
             </view>

@@ -6,11 +6,10 @@
   box-shadow:0rpx 0rpx 8rpx 0rpx rgba(224,224,224,1);
   width:100%;
   position: fixed;
-  bottom: 0;
   z-index: 9;
-
   box-sizing: border-box;
-  padding: 8rpx 0;
+  bottom: calc(0rpx + calc(env(safe-area-inset-bottom) mod 5));
+
 }
 .tabBar .text{
   height:32rpx;
@@ -26,6 +25,10 @@
 .tabBar .item{
   width: 33%;
   min-width: 20%;
+  height: 100%;
+}
+.tabBar .item-view{
+  height: 100%;
 }
 .dot{
   position: absolute;
@@ -51,6 +54,8 @@
   width: 46rpx;
   height: 46rpx;
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon1.png");
+  margin-top: 8rpx;
+  margin-bottom: 4rpx;
 }
 .tabBar .checked .tabicon1{
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon1.active.png");
@@ -60,6 +65,8 @@
   width:40rpx;
   height:38rpx;
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon2.png");
+  margin-top: 14rpx;
+  margin-bottom: 6rpx;
 }
 .tabBar .checked .tabicon2{
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon2.active.png");
@@ -69,6 +76,8 @@
   width:44rpx;
   height:40rpx;
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon3.png");
+  margin-top: 12rpx;
+  margin-bottom: 6rpx;
 }
 .tabBar .checked .tabicon3{
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon3.active.png");
@@ -78,6 +87,8 @@
   width:40rpx;
   height:40rpx;
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon4.png");
+  margin-top: 12rpx;
+  margin-bottom: 6rpx;
 }
 .tabBar .checked .tabicon4{
   background-image: url("http://nosqn.colorcun.com/mapmenu/tabicon4.active.png");

@@ -13,7 +13,7 @@
             <sb-tr seller="{{item}}"
                    hasActivityTags="{{false}}"
                    hasActivityShort="{{true}}"
-                   hasBrand="true" hasActivityTese="true"
+                   hasBrand="true" hasActivityRed="true"
                    hasSlogan="{{false}}"
                    sellerStyle="noborder"></sb-tr>
         </view>

@@ -177,18 +177,20 @@ page{
   height: 64rpx;
   background-color: #fefefe;
   line-height: 64rpx;
-  color:#999999;
-  font-size: 24rpx;
+  font-weight:400;
+  color:rgba(153,153,153,1);
+  font-size: 28rpx;
 
   border-radius:32rpx;
   border:2rpx solid rgba(204,204,204,1);
   width: 100%;
+  box-sizing: border-box;
 }
 .searchAddr .icon{
   min-width: 22rpx;
   width: 22rpx;
   height: 22rpx;
-  margin: 0 20rpx;
+  margin: 0 10rpx 0 40rpx;
 }
 .searchAddr .title{
   line-height: 60rpx;