Commit 3f8a8a3f2d304699f7c48cc9735099940e000117

Authored by vking
1 parent 208f0066

距离展示调整

@@ -14,10 +14,12 @@ @@ -14,10 +14,12 @@
14 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}"></view> 14 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}"></view>
15 </view> 15 </view>
16 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view> 16 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
  17 + <view class="text flex-ll" wx:if="{{seller.cate.length>0}}">
  18 + <view class="text-item" wx:for="{{seller.cate}}" wx:if="{{index<3}}">{{item.name}}</view>
  19 + </view>
17 <view class="text flex-ll"> 20 <view class="text flex-ll">
18 - <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>  
19 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> 21 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
20 - <view class="text-item" wx:if="{{seller.distance>=0 && seller.distance!==''}}">{{hasSuggestion?'距搜索地':''}}{{util.distance(seller.distance_centre||seller.distance)}}</view> 22 + <view class="text-item" wx:if="{{seller.distance>=0 && seller.distance!==''}}">{{hasSuggestion?'距搜索地':'距您'}}{{util.distance(seller.distance_centre||seller.distance)}}</view>
21 </view> 23 </view>
22 <view wx:if="{{hasStat}}" class="stat"> 24 <view wx:if="{{hasStat}}" class="stat">
23 <stat stat="{{seller.score}}"></stat> 25 <stat stat="{{seller.score}}"></stat>
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
52 overflow: hidden; 52 overflow: hidden;
53 } 53 }
54 .seller .name{ 54 .seller .name{
55 - font-size: 32rpx;  
56 - height: 44rpx;  
57 - line-height: 44rpx; 55 + font-size: 34rpx;
  56 + height: 48rpx;
  57 + line-height: 48rpx;
58 overflow: hidden; 58 overflow: hidden;
59 white-space:nowrap; 59 white-space:nowrap;
60 width: 100%; 60 width: 100%;
@@ -68,10 +68,10 @@ @@ -68,10 +68,10 @@
68 overflow: hidden; 68 overflow: hidden;
69 } 69 }
70 .seller .text{ 70 .seller .text{
71 - font-size: 28rpx; 71 + font-size: 24rpx;
72 color: #999999; 72 color: #999999;
73 - height: 40rpx;  
74 - line-height: 40rpx; 73 + height: 34rpx;
  74 + line-height: 34rpx;
75 margin-top: 10rpx; 75 margin-top: 10rpx;
76 overflow: hidden; 76 overflow: hidden;
77 white-space:nowrap; 77 white-space:nowrap;
@@ -80,8 +80,8 @@ @@ -80,8 +80,8 @@
80 text-indent: 10rpx; 80 text-indent: 10rpx;
81 border-left: 2rpx solid #999999; 81 border-left: 2rpx solid #999999;
82 padding-right: 10rpx; 82 padding-right: 10rpx;
83 - height: 30rpx;  
84 - line-height: 30rpx; 83 + height: 24rpx;
  84 + line-height: 24rpx;
85 overflow: hidden; 85 overflow: hidden;
86 white-space:nowrap; 86 white-space:nowrap;
87 } 87 }
@@ -124,12 +124,14 @@ @@ -124,12 +124,14 @@
124 .activity{ 124 .activity{
125 color: #F05522; 125 color: #F05522;
126 margin-top: 10rpx; 126 margin-top: 10rpx;
  127 + height: 34rpx;
  128 + line-height: 34rpx;
127 } 129 }
128 .activity .activity-item{ 130 .activity .activity-item{
129 font-size: 24rpx; 131 font-size: 24rpx;
130 - height: 36rpx; 132 + height: 24rpx;
131 padding: 0 10rpx 0; 133 padding: 0 10rpx 0;
132 - line-height: 36rpx; 134 + line-height: 24rpx;
133 overflow: hidden; 135 overflow: hidden;
134 max-height: 36rpx; 136 max-height: 36rpx;
135 border-radius: 6rpx; 137 border-radius: 6rpx;