deatil style

@@ -4,7 +4,7 @@
         <image mode="aspectFill"
         <image mode="aspectFill"
                src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}"></image>
                src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}"></image>
         <view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
         <view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
-        <view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view>
+        <view class="room_num hasBrand Semibold" wx:if="{{hasBrand && seller.brand}}">{{seller.brand.name}}</view>
     </view>
     </view>
     <view class="info flex-tb">
     <view class="info flex-tb">
         <view style="max-width: 100%;width: 100%;">
         <view style="max-width: 100%;width: 100%;">

@@ -25,9 +25,9 @@
     <view class="seller">
     <view class="seller">
         <view class="base">
         <view class="base">
             <view class="name Semibold flex-lr">
             <view class="name Semibold flex-lr">
-                <view class="name-info flex-ll">
-                    <view>{{seller.sellername}}</view>
-                    <view class="flex-ll broad" wx:if="{{seller.brand}}">
+                <view class="name-info">
+                    {{seller.sellername}}
+                    <view class="broad" wx:if="{{true||seller.brand}}">
                         <view class="broad-1"></view>
                         <view class="broad-1"></view>
                         <view class="broad-2">{{seller.brand.name}}</view>
                         <view class="broad-2">{{seller.brand.name}}</view>
                         <view class="broad-3"></view>
                         <view class="broad-3"></view>

@@ -30,7 +30,6 @@
 }
 }
 .base .name{
 .base .name{
   font-size: 36rpx;
   font-size: 36rpx;
-  height: 50rpx;
   line-height: 50rpx;
   line-height: 50rpx;
   margin-bottom: 20rpx;
   margin-bottom: 20rpx;
   overflow: hidden;
   overflow: hidden;
@@ -382,15 +381,22 @@
 .average{
 .average{
   color: #C0A369;
   color: #C0A369;
   min-width: 135rpx;
   min-width: 135rpx;
+  margin-left: 120rpx;
+}
+.name-info-text{
+  margin-right: 20rpx;
+  float: left;
 }
 }
 .broad{
 .broad{
-  margin: 4rpx 0 0 20rpx;
+  display: inline-block;
+  height: 28rpx;
 }
 }
 .broad-1{
 .broad-1{
   background-image: url("https://qn.colorcun.com/reserve/images/p0.png");
   background-image: url("https://qn.colorcun.com/reserve/images/p0.png");
   width: 14rpx;
   width: 14rpx;
   height: 34rpx;
   height: 34rpx;
   background-size: 100% 100%;
   background-size: 100% 100%;
+  float: left;
 }
 }
 .broad-2{
 .broad-2{
   background-image: url("https://qn.colorcun.com/reserve/images/p2.png");
   background-image: url("https://qn.colorcun.com/reserve/images/p2.png");
@@ -398,15 +404,15 @@
   background-size: 100% 100%;
   background-size: 100% 100%;
   font-size: 20rpx;
   font-size: 20rpx;
   color: #FFFFFF;
   color: #FFFFFF;
-  line-height: 28rpx;
-  background-repeat: no-repeat;
-  background-repeat: repeat-x;
+  line-height: 34rpx;
+  float: left;
 }
 }
 .broad-3{
 .broad-3{
   background-image: url("https://qn.colorcun.com/reserve/images/p3.png");
   background-image: url("https://qn.colorcun.com/reserve/images/p3.png");
   width: 14rpx;
   width: 14rpx;
   height: 34rpx;
   height: 34rpx;
   background-size: 100% 100%;
   background-size: 100% 100%;
+  float: left;
 }
 }
 
 
 .label_c{
 .label_c{

@@ -111,6 +111,9 @@ Page({
         cai_jiu_bao.push(seller.cate[0])
         cai_jiu_bao.push(seller.cate[0])
       }
       }
       cai_jiu_bao.push(seller.is_belt_wine==1?'不可带酒水':'可自带酒水');
       cai_jiu_bao.push(seller.is_belt_wine==1?'不可带酒水':'可自带酒水');
+      if(seller.is_parking==1){
+        cai_jiu_bao.push('停车场')
+      }
       if(seller.room_num>0){
       if(seller.room_num>0){
         cai_jiu_bao.push(seller.room_num+'个包间')
         cai_jiu_bao.push(seller.room_num+'个包间')
       }
       }
@@ -121,7 +124,7 @@ Page({
           tags.push(l.name)
           tags.push(l.name)
         })
         })
       }
       }
-      tags=tags.join('　|　')
+      tags=tags.join(' | ')
       if(!tags){
       if(!tags){
         ph=ph-tagsHeight/2
         ph=ph-tagsHeight/2
         tagsHeight=0
         tagsHeight=0