xt / xcx-book · Commits

Go to a project

Commit f1aee74f568b0a6c1254e03c965a59a5a3374baf

Authored by vking
1 parent 8084509b
build: skipped

deatil style

Inline Side-by-side
Showing 3 changed files with 89 additions and 34 deletions
@@ -59,6 +59,13 @@ Page({ @@ -59,6 +59,13 @@ Page({
59 if(seller.envi_image.length<1){ 59 if(seller.envi_image.length<1){
60 seller.envi_image=['http://qn.colorcun.com/custom/lite-online/image/def-banner.png'] 60 seller.envi_image=['http://qn.colorcun.com/custom/lite-online/image/def-banner.png']
61 } 61 }
  62 + if(seller.label_c.length>0) {
  63 + let label_cstr=[];
  64 + seller.label_c.forEach(l=>{
  65 + label_cstr.push(l.name)
  66 + })
  67 + seller.label_cstr=label_cstr.join(' | ')
  68 + }
62 this.setData({ 69 this.setData({
63 seller:seller, 70 seller:seller,
64 }) 71 })
@@ -41,16 +41,40 @@ @@ -41,16 +41,40 @@
41 <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view> 41 <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>
42 <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>
43 </view> 43 </view>
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> 44 + <view class="label_c" wx:if="{{seller.label_cstr}}">
  45 + <text class="label_text" >{{seller.label_cstr}}</text>
  46 + </view>
  47 + </view>
  48 + <view class="addr flex-lr" bindtap="lookLocation">
  49 + <view class="addr-view">
  50 + <view class="addr-text flex-ll">
  51 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  52 + <view class="text">{{seller.real_address||seller.map_address}}</view>
51 </view> 53 </view>
  54 + <view class="addr-long">{{seller.distanceStr?'距您当前位置'+seller.distanceStr:''}}</view>
52 </view> 55 </view>
  56 + <view class="more more-addr"></view>
53 </view> 57 </view>
  58 + </view>
  59 + <view class="black20line"></view>
  60 + <view class="seller">
  61 + <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
  62 + <view class="activity-view-easy flex-lr" >
  63 + <view class="activity-left flex-ll">
  64 + <view class="icon"></view>
  65 + <view class="flex-ll discount" wx:for="{{seller.activity}}"
  66 + wx:key="seller.activity.key"
  67 + wx:if="{{index<2}}">
  68 + {{item.title}}
  69 + </view>
  70 + </view>
  71 + <view class="flex-rr activity-right">
  72 + <view class="more-text">更多</view>
  73 + <view class="more"></view>
  74 + </view>
  75 + </view>
  76 + </formids>
  77 + <!--
54 <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount"> 78 <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
55 <view class="activity-view" > 79 <view class="activity-view" >
56 <view class="activity" > 80 <view class="activity" >
@@ -78,16 +102,7 @@ @@ -78,16 +102,7 @@
78 </view> 102 </view>
79 </view> 103 </view>
80 </formids> 104 </formids>
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>  
88 - </view>  
89 - <view class="more more-addr"></view>  
90 - </view> 105 + -->
91 </view> 106 </view>
92 <view class="black20line"></view> 107 <view class="black20line"></view>
93 <view class="block" wx:if="{{seller.room_image.length>0}}"> 108 <view class="block" wx:if="{{seller.room_image.length>0}}">
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 margin: 0 auto; 4 margin: 0 auto;
5 font-size: 30rpx; 5 font-size: 30rpx;
6 color:#353535; 6 color:#353535;
7 - padding-bottom: 200rpx; 7 + padding-bottom: 100rpx;
8 } 8 }
9 .seller-banner{ 9 .seller-banner{
10 width: 100%; 10 width: 100%;
@@ -26,13 +26,13 @@ @@ -26,13 +26,13 @@
26 } 26 }
27 27
28 .seller .base{ 28 .seller .base{
29 - padding: 40rpx 0; 29 + padding: 40rpx 0 18rpx;
30 } 30 }
31 .base .name{ 31 .base .name{
32 font-size: 36rpx; 32 font-size: 36rpx;
33 height: 50rpx; 33 height: 50rpx;
34 line-height: 50rpx; 34 line-height: 50rpx;
35 - margin-bottom: 10rpx; 35 + margin-bottom: 20rpx;
36 overflow: hidden; 36 overflow: hidden;
37 } 37 }
38 .base .ping,.base .peitao{ 38 .base .ping,.base .peitao{
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 } 126 }
127 127
128 .block{ 128 .block{
129 - padding: 80rpx 0 60rpx; 129 + padding: 60rpx 0 60rpx;
130 border-bottom: 2rpx solid #F5F5F5; 130 border-bottom: 2rpx solid #F5F5F5;
131 } 131 }
132 .block:last-child{ 132 .block:last-child{
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 .block .header{ 135 .block .header{
136 height: 44rpx; 136 height: 44rpx;
137 line-height: 44rpx; 137 line-height: 44rpx;
138 - margin-bottom: 60rpx; 138 + margin-bottom: 40rpx;
139 } 139 }
140 .block .line{ 140 .block .line{
141 height: 44rpx; 141 height: 44rpx;
@@ -200,21 +200,22 @@ @@ -200,21 +200,22 @@
200 } 200 }
201 201
202 .baos{ 202 .baos{
203 - height: 282rpx; 203 + height: 324rpx;
204 width: 100%; 204 width: 100%;
205 white-space: nowrap; 205 white-space: nowrap;
206 } 206 }
207 .baos .image{ 207 .baos .image{
208 - width: 400rpx; 208 + width: 500rpx;
209 border-radius: 10rpx; 209 border-radius: 10rpx;
210 margin-right: 20rpx; 210 margin-right: 20rpx;
211 display: inline-block; 211 display: inline-block;
212 overflow: hidden; 212 overflow: hidden;
213 - height: 100%; 213 + height: 320rpx;
  214 + box-shadow:0px 4rpx 4rpx 0px rgba(198,198,198,1);
214 } 215 }
215 .baos .image image{ 216 .baos .image image{
216 - width: 100%;  
217 - height: 100%; 217 + width: 500rpx;
  218 + height: 320rpx;
218 } 219 }
219 220
220 .cais{ 221 .cais{
@@ -226,12 +227,13 @@ @@ -226,12 +227,13 @@
226 margin-right: 20rpx; 227 margin-right: 20rpx;
227 border-radius: 10rpx; 228 border-radius: 10rpx;
228 border: 2rpx solid #F5F5F5; 229 border: 2rpx solid #F5F5F5;
  230 + box-shadow:0px 4px 4px 0px rgba(198,198,198,1);
229 } 231 }
230 .cais .image{ 232 .cais .image{
231 - width: 400rpx; 233 + width: 500rpx;
232 border-radius: 10rpx 10rpx 0 0; 234 border-radius: 10rpx 10rpx 0 0;
233 overflow: hidden; 235 overflow: hidden;
234 - height: 206rpx; 236 + height: 320rpx;
235 } 237 }
236 .cais .image image{ 238 .cais .image image{
237 width: 100%; 239 width: 100%;
@@ -239,9 +241,9 @@ @@ -239,9 +241,9 @@
239 } 241 }
240 .cais .text{ 242 .cais .text{
241 font-size: 30rpx; 243 font-size: 30rpx;
242 - height: 62rpx;  
243 - line-height: 62rpx;  
244 - padding: 0 20rpx; 244 + height: 80rpx;
  245 + line-height: 80rpx;
  246 + padding-left: 20rpx;
245 white-space: nowrap; 247 white-space: nowrap;
246 overflow: hidden; 248 overflow: hidden;
247 } 249 }
@@ -408,9 +410,40 @@ @@ -408,9 +410,40 @@
408 } 410 }
409 411
410 .label_c{ 412 .label_c{
411 - background-color: #FFF5EB; 413 + font-size: 24rpx;
412 color: #C0A369; 414 color: #C0A369;
  415 + margin-top: 20rpx;
  416 +}
  417 +.label_text{
  418 + height: 40rpx;
  419 + line-height: 40rpx;
  420 + background-color: #FFF5EB;
  421 + padding: 0 8rpx;
413 } 422 }
414 -.label_conent{  
415 423
  424 +.activity-view-easy{
  425 + height: 120rpx;
  426 + line-height: 120rpx;
  427 +}
  428 +.activity-view-easy .activity-left{
  429 + height: 120rpx;
  430 + line-height: 120rpx;
  431 +}
  432 +.activity-view-easy .icon{
  433 + background-image: url("https://qn.colorcun.com/reserve/images/ad.png");
  434 + width: 30rpx;
  435 + height: 32rpx;
  436 + background-size: 100% 100%;
  437 + margin-top: 10rpx;
  438 + margin-right: 20rpx;
  439 +}
  440 +.activity-view-easy .discount{
  441 + border-right: 2rpx #C0A369 solid;
  442 + height: 30rpx;
  443 + line-height: 30rpx;
  444 + font-size: 30rpx;
  445 + padding-right: 18rpx;
  446 +}
  447 +.activity-view-easy .discount:last-child{
  448 + border-right-width: 0;
416 } 449 }