Commit aafdba952d48cd60426997fd2a6845ebc340bbcc

Authored by vking
1 parent 47fbf8f7

fix list & detail ui

@@ -15,6 +15,9 @@ @@ -15,6 +15,9 @@
15 .seller.noshadow{ 15 .seller.noshadow{
16 box-shadow: none; 16 box-shadow: none;
17 } 17 }
  18 +.seller.noradius{
  19 + border-radius: 0;
  20 +}
18 .seller.noborder.noshadow{ 21 .seller.noborder.noshadow{
19 width: 100%; 22 width: 100%;
20 } 23 }
@@ -90,8 +93,8 @@ @@ -90,8 +93,8 @@
90 padding-right: 0; 93 padding-right: 0;
91 } 94 }
92 .seller .price{ 95 .seller .price{
93 - font-size: 30rpx;  
94 - color: #F05522; 96 + font-size: 28rpx;
  97 + color: #353535;
95 height: 50rpx; 98 height: 50rpx;
96 line-height: 50rpx; 99 line-height: 50rpx;
97 width: 100%; 100 width: 100%;
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> 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> 52 <view class="text">{{seller.real_address||seller.map_address}}</view>
53 </view> 53 </view>
54 - <view class="addr-long">{{seller.distanceStr?'距您当前位置'+seller.distanceStr:''}}</view> 54 + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
55 </view> 55 </view>
56 <view class="more more-addr"></view> 56 <view class="more more-addr"></view>
57 </view> 57 </view>
@@ -137,17 +137,17 @@ @@ -137,17 +137,17 @@
137 scroll-into-view="{{toView}}" 137 scroll-into-view="{{toView}}"
138 scroll-top="{{scrollTop}}" 138 scroll-top="{{scrollTop}}"
139 > 139 >
140 -  
141 <block wx:for="{{seller.dishes}}" wx:key="sellers.key"> 140 <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
142 - <view class="image-view" wx:if="{{item.image}}"> 141 + <view class="cais-views" wx:if="{{item.image}}">
  142 + <view class="image-view" >
143 <view class="image"> 143 <view class="image">
144 <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}" 144 <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
145 src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image> 145 src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
146 </view> 146 </view>
147 <view class="text Semibold">{{item.name}}</view> 147 <view class="text Semibold">{{item.name}}</view>
148 </view> 148 </view>
  149 + </view>
149 </block> 150 </block>
150 -  
151 </scroll-view> 151 </scroll-view>
152 <view class="cais-text"> 152 <view class="cais-text">
153 <block wx:for="{{seller.dishes}}" wx:key="sellers.key"> 153 <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 } 125 }
126 126
127 .block{ 127 .block{
128 - padding: 60rpx 0 60rpx; 128 + padding: 60rpx 0 50rpx;
129 border-bottom: 2rpx solid #F5F5F5; 129 border-bottom: 2rpx solid #F5F5F5;
130 } 130 }
131 .block:last-child{ 131 .block:last-child{
@@ -199,31 +199,46 @@ @@ -199,31 +199,46 @@
199 } 199 }
200 200
201 .baos{ 201 .baos{
202 - height: 324rpx;  
203 - width: 100%; 202 + height: 330rpx;
  203 + width: 110%;
204 white-space: nowrap; 204 white-space: nowrap;
  205 + margin-left: -5%;
205 } 206 }
206 .baos .image{ 207 .baos .image{
207 width: 500rpx; 208 width: 500rpx;
208 - border-radius: 10rpx;  
209 - margin-right: 20rpx;  
210 display: inline-block; 209 display: inline-block;
211 - overflow: hidden;  
212 - height: 320rpx;  
213 - box-shadow:0px 4rpx 4rpx 0px rgba(198,198,198,1); 210 + margin-right: 20rpx;
  211 +}
  212 +.baos .image:first-child{
  213 + margin-left: 5%;
  214 +}
  215 +.baos .image:last-child{
  216 + margin-right: 5%;
214 } 217 }
215 .baos .image image{ 218 .baos .image image{
  219 + border-radius: 10rpx;
216 width: 500rpx; 220 width: 500rpx;
217 height: 320rpx; 221 height: 320rpx;
  222 + box-shadow:0px 4rpx 4rpx 0px rgba(198,198,198,1);
218 } 223 }
219 224
220 .cais{ 225 .cais{
221 - width: 100%; 226 + width: 110%;
222 white-space: nowrap; 227 white-space: nowrap;
  228 + height: 460rpx;
  229 + margin-left: -5%;
223 } 230 }
224 -.cais .image-view{ 231 +.cais-views{
225 display: inline-block; 232 display: inline-block;
226 margin-right: 20rpx; 233 margin-right: 20rpx;
  234 +}
  235 +.cais-views:first-child{
  236 + margin-left: 5%;
  237 +}
  238 +.cais-views:last-child{
  239 + margin-right: 5%;
  240 +}
  241 +.cais .image-view{
227 border-radius: 10rpx; 242 border-radius: 10rpx;
228 border: 2rpx solid #F5F5F5; 243 border: 2rpx solid #F5F5F5;
229 box-shadow:0px 4px 4px 0px rgba(198,198,198,1); 244 box-shadow:0px 4px 4px 0px rgba(198,198,198,1);
@@ -247,7 +262,6 @@ @@ -247,7 +262,6 @@
247 overflow: hidden; 262 overflow: hidden;
248 } 263 }
249 .cais-text{ 264 .cais-text{
250 - margin-top: 60rpx;  
251 font-size: 28rpx; 265 font-size: 28rpx;
252 } 266 }
253 .cais-text view{ 267 .cais-text view{
@@ -276,7 +290,7 @@ @@ -276,7 +290,7 @@
276 } 290 }
277 .activity-right{ 291 .activity-right{
278 min-width: 120rpx; 292 min-width: 120rpx;
279 - color: #C28C56; 293 + color: #C0A369;
280 } 294 }
281 .activity-first{ 295 .activity-first{
282 width: 100%; 296 width: 100%;
@@ -304,7 +318,6 @@ @@ -304,7 +318,6 @@
304 .more{ 318 .more{
305 background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%B3%E7%AE%AD%E5%A4%B4.png"); 319 background-image: url("http://qn.colorcun.com/reserve/images/%E5%8F%B3%E7%AE%AD%E5%A4%B4.png");
306 margin-left: 20rpx; 320 margin-left: 20rpx;
307 - margin-right: 20rpx;  
308 height: 24rpx; 321 height: 24rpx;
309 } 322 }
310 .discount{ 323 .discount{
@@ -382,6 +395,7 @@ @@ -382,6 +395,7 @@
382 color: #C0A369; 395 color: #C0A369;
383 min-width: 135rpx; 396 min-width: 135rpx;
384 margin-left: 120rpx; 397 margin-left: 120rpx;
  398 + text-align: right;
385 } 399 }
386 .name-info-text{ 400 .name-info-text{
387 margin-right: 20rpx; 401 margin-right: 20rpx;
@@ -440,7 +454,7 @@ @@ -440,7 +454,7 @@
440 width: 30rpx; 454 width: 30rpx;
441 height: 32rpx; 455 height: 32rpx;
442 background-size: 100% 100%; 456 background-size: 100% 100%;
443 - margin-top: 10rpx; 457 + margin-top: 8rpx;
444 margin-right: 20rpx; 458 margin-right: 20rpx;
445 } 459 }
446 .activity-view-easy .discount{ 460 .activity-view-easy .discount{
@@ -448,7 +462,7 @@ @@ -448,7 +462,7 @@
448 height: 30rpx; 462 height: 30rpx;
449 line-height: 30rpx; 463 line-height: 30rpx;
450 font-size: 30rpx; 464 font-size: 30rpx;
451 - padding-right: 18rpx; 465 + padding-right: 20rpx;
452 } 466 }
453 .activity-view-easy .discount:last-child{ 467 .activity-view-easy .discount:last-child{
454 border-right-width: 0; 468 border-right-width: 0;
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 hasActivityShort="{{true}}" 30 hasActivityShort="{{true}}"
31 hasBrand="true" hasActivityTese="true" 31 hasBrand="true" hasActivityTese="true"
32 hasSlogan="{{false}}" 32 hasSlogan="{{false}}"
33 - sellerStyle="noborder noshadow"></sb-tr> 33 + sellerStyle="noborder noshadow noradius"></sb-tr>
34 </view> 34 </view>
35 <hr class="flex-vc nomore" wx:if="{{!hasMore}}" bgColor="#f5f5f5">我是有底线的</hr> 35 <hr class="flex-vc nomore" wx:if="{{!hasMore}}" bgColor="#f5f5f5">我是有底线的</hr>
36 </view> 36 </view>
@@ -66,7 +66,6 @@ page{ @@ -66,7 +66,6 @@ page{
66 } 66 }
67 .follow .seller{ 67 .follow .seller{
68 background-color: #ffffff; 68 background-color: #ffffff;
69 - border-radius: 6rpx;  
70 overflow: hidden; 69 overflow: hidden;
71 margin: 0 0 20rpx; 70 margin: 0 0 20rpx;
72 } 71 }