Commit 8084509b4f419e9e229dc650e11b59a8c37da3f9

Authored by vking
1 parent df623957

deatil style

@@ -23,28 +23,31 @@ @@ -23,28 +23,31 @@
23 </view> 23 </view>
24 <view class="pages" style="height: {{pagesHeight}};overflow:{{pagesHeight=='auto'?'visible':'hidden'}}"> 24 <view class="pages" style="height: {{pagesHeight}};overflow:{{pagesHeight=='auto'?'visible':'hidden'}}">
25 <view class="seller"> 25 <view class="seller">
26 - <view class="base flex-vc">  
27 - <view class="name">{{seller.sellername}}</view>  
28 - <view class="ping flex-cc">  
29 - <view class="item flex-lr fen">  
30 - <stat stat="{{seller.score}}"></stat> 26 + <view class="base">
  27 + <view class="name Semibold flex-lr">
  28 + <view class="name-info flex-ll">
  29 + <view>{{seller.sellername}}</view>
  30 + <view class="flex-ll broad" wx:if="{{seller.brand}}">
  31 + <view class="broad-1"></view>
  32 + <view class="broad-2">{{seller.brand.name}}</view>
  33 + <view class="broad-3"></view>
  34 + </view>
31 </view> 35 </view>
  36 + <view class="average" wx:if="{{seller.average>0}}">¥{{seller.average}}/人</view>
  37 + </view>
  38 + <view class="ping flex-ll">
32 <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view> 39 <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>
33 - <view class="item" wx:if="{{seller.average>0}}">人均{{seller.average}}元</view> 40 + <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>
  41 + <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>
34 <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> 42 <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
35 </view> 43 </view>
36 - <view class="peitao flex-cc">  
37 - <view class="icon meal_fee" wx:if="{{seller.is_meal_fee!=0}}">  
38 - {{seller.is_meal_fee==1?'无餐位费':'有餐位费'}}  
39 - </view>  
40 - <view class="icon unsubscribe" wx:if="{{seller.is_unsubscribe!=0}}">  
41 - {{seller.is_unsubscribe==1?'不可退':'随时退'}}  
42 - </view>  
43 - <view class="icon minimum" wx:if="{{seller.is_minimum_consumption!=0}}">  
44 - {{seller.is_minimum_consumption==1?'无最低消费':'有最低消费'}}  
45 - </view>  
46 - <view class="icon belt" wx:if="{{seller.is_belt_wine!=0}}">  
47 - {{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}} 44 +
  45 + <view class="ping label_c">
  46 + <view class="label_conent flex-ll">
  47 + <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>
  48 + <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>
  49 + <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>
  50 + <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
48 </view> 51 </view>
49 </view> 52 </view>
50 </view> 53 </view>
@@ -75,12 +78,15 @@ @@ -75,12 +78,15 @@
75 </view> 78 </view>
76 </view> 79 </view>
77 </formids> 80 </formids>
78 - <view class="addr" bindtap="lookLocation">  
79 - <view class="addr-text flex-ll">  
80 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
81 - <view class="text">{{seller.real_address||seller.map_address}}</view> 81 + <view class="addr flex-lr" bindtap="lookLocation">
  82 + <view class="addr-view">
  83 + <view class="addr-text flex-ll">
  84 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  85 + <view class="text">{{seller.real_address||seller.map_address}}</view>
  86 + </view>
  87 + <view class="addr-long">{{seller.distanceStr?'距您当前位置'+seller.distanceStr:''}}</view>
82 </view> 88 </view>
83 - <view class="addr-long">{{seller.distanceStr?'距您当前位置'+seller.distanceStr:''}}</view> 89 + <view class="more more-addr"></view>
84 </view> 90 </view>
85 </view> 91 </view>
86 <view class="black20line"></view> 92 <view class="black20line"></view>
@@ -107,6 +107,7 @@ @@ -107,6 +107,7 @@
107 .addr-text .text{ 107 .addr-text .text{
108 white-space: nowrap; 108 white-space: nowrap;
109 overflow: hidden; 109 overflow: hidden;
  110 + text-overflow:ellipsis;
110 } 111 }
111 .addr-text image{ 112 .addr-text image{
112 width: 24rpx; 113 width: 24rpx;
@@ -366,4 +367,50 @@ @@ -366,4 +367,50 @@
366 line-height: 40rpx; 367 line-height: 40rpx;
367 padding: 0 15rpx; 368 padding: 0 15rpx;
368 border-radius: 20rpx; 369 border-radius: 20rpx;
  370 +}
  371 +
  372 +.addr-view{
  373 + max-width: calc(100%-20rpx);
  374 + overflow: hidden;
  375 + text-overflow:ellipsis;
  376 +}
  377 +.more-addr{
  378 + background-image: url("https://qn.colorcun.com/reserve/images/m2.png");
  379 +}
  380 +.average{
  381 + color: #C0A369;
  382 + min-width: 135rpx;
  383 +}
  384 +.broad{
  385 + margin: 4rpx 0 0 20rpx;
  386 +}
  387 +.broad-1{
  388 + background-image: url("https://qn.colorcun.com/reserve/images/p0.png");
  389 + width: 14rpx;
  390 + height: 34rpx;
  391 + background-size: 100% 100%;
  392 +}
  393 +.broad-2{
  394 + background-image: url("https://qn.colorcun.com/reserve/images/p2.png");
  395 + height: 34rpx;
  396 + background-size: 100% 100%;
  397 + font-size: 20rpx;
  398 + color: #FFFFFF;
  399 + line-height: 28rpx;
  400 + background-repeat: no-repeat;
  401 + background-repeat: repeat-x;
  402 +}
  403 +.broad-3{
  404 + background-image: url("https://qn.colorcun.com/reserve/images/p3.png");
  405 + width: 14rpx;
  406 + height: 34rpx;
  407 + background-size: 100% 100%;
  408 +}
  409 +
  410 +.label_c{
  411 + background-color: #FFF5EB;
  412 + color: #C0A369;
  413 +}
  414 +.label_conent{
  415 +
369 } 416 }
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 "list": [] 45 "list": []
46 }, 46 },
47 "miniprogram": { 47 "miniprogram": {
48 - "current": 52, 48 + "current": 39,
49 "list": [ 49 "list": [
50 { 50 {
51 "id": 0, 51 "id": 0,