Commit 32f859792e39dd795206dd9ad6869e1a00f85b42

Authored by wangfan
1 parent 331ab3ff

C端调整

@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 <view class="seller"> 18 <view class="seller">
19 <view class="base flex-vc"> 19 <view class="base flex-vc">
20 <view class="name">{{seller.sellername}}</view> 20 <view class="name">{{seller.sellername}}</view>
  21 + <view class="slogan" wx:if="{{seller.slogan}}">“{{seller.slogan}}”</view>
21 <view class="ping flex-cc"> 22 <view class="ping flex-cc">
22 <view class="item flex-lr fen"> 23 <view class="item flex-lr fen">
23 <stat stat="{{seller.score}}"></stat> 24 <stat stat="{{seller.score}}"></stat>
@@ -32,20 +33,24 @@ @@ -32,20 +33,24 @@
32 </view> 33 </view>
33 </view> 34 </view>
34 <formids wx:if="{{seller.activity.length>0}}" url="/pages/reserve/activity?id={{seller.id}}"> 35 <formids wx:if="{{seller.activity.length>0}}" url="/pages/reserve/activity?id={{seller.id}}">
35 - <view class="activity flex-lr" >  
36 - <view class="activity-left">  
37 - <view class="activity-first flex-ll" style="align-items: flex-start">  
38 - <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>  
39 - {{seller.activity[0].desc}} 36 + <view class="activity-view" >
  37 + <view class="activity" >
  38 + <view class="flex-lr">
  39 + <view class="activity-left">
  40 + <view class="activity-first flex-ll" style="align-items: flex-start">
  41 + <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
  42 + {{seller.activity[0].desc}}
  43 + </view>
  44 + </view>
  45 + <view class="activity-right flex-rr Semibold">
  46 + <view>更多</view>
  47 + <view class="more"></view>
  48 + </view>
40 </view> 49 </view>
41 <view class="activity-text" wx:if="{{seller.activity[1]}}"> 50 <view class="activity-text" wx:if="{{seller.activity[1]}}">
42 - {{seller.activity[1].desc}} 51 + 该优惠仅适用于一键订平台预订客户
43 </view> 52 </view>
44 </view> 53 </view>
45 - <view class="activity-right flex-rr Semibold" wx:if="{{seller.activity.length>2}}">  
46 - <view>更多优惠</view>  
47 - <view class="more"></view>  
48 - </view>  
49 </view> 54 </view>
50 </formids> 55 </formids>
51 <view class="addr" bindtap="lookLocation"> 56 <view class="addr" bindtap="lookLocation">
@@ -34,6 +34,12 @@ @@ -34,6 +34,12 @@
34 margin-bottom: 10rpx; 34 margin-bottom: 10rpx;
35 overflow: hidden; 35 overflow: hidden;
36 } 36 }
  37 +.slogan{
  38 + font-size: 26rpx;
  39 + height: 36rpx;
  40 + line-height: 36rpx;
  41 + margin-top: 10rpx;
  42 +}
37 .base .ping,.base .peitao{ 43 .base .ping,.base .peitao{
38 height: 34rpx; 44 height: 34rpx;
39 line-height: 34rpx; 45 line-height: 34rpx;
@@ -231,18 +237,23 @@ @@ -231,18 +237,23 @@
231 display: inline-block; 237 display: inline-block;
232 border-radius: 6rpx; 238 border-radius: 6rpx;
233 } 239 }
  240 +.activity-view{
  241 + background-color: #FEF1EA;
  242 + width:110%;
  243 + margin: 0 -5%;
  244 +}
234 .activity{ 245 .activity{
235 - background-color: #F3F4F6;  
236 - width:100%; 246 + width:90%;
  247 + margin: 0 auto;
237 padding: 28rpx 0; 248 padding: 28rpx 0;
238 } 249 }
239 .activity-left{ 250 .activity-left{
240 width: 100%; 251 width: 100%;
241 } 252 }
242 .activity-right{ 253 .activity-right{
243 - min-width: 170rpx; 254 + min-width: 120rpx;
244 font-size: 28rpx; 255 font-size: 28rpx;
245 - color:#F05522; 256 + color: #C28C56;
246 } 257 }
247 .activity-first{ 258 .activity-first{
248 width: 100%; 259 width: 100%;
@@ -261,12 +272,11 @@ @@ -261,12 +272,11 @@
261 } 272 }
262 .activity-text{ 273 .activity-text{
263 margin-left: 60rpx; 274 margin-left: 60rpx;
264 - line-height: 42rpx;  
265 - height: 42rpx; 275 + line-height: 34rpx;
  276 + height: 34rpx;
266 margin-top: 10rpx; 277 margin-top: 10rpx;
267 - overflow: hidden;  
268 text-align: left; 278 text-align: left;
269 - height: 42rpx; 279 + color: #C28C56;
270 } 280 }
271 .more{ 281 .more{
272 background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png"); 282 background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png");
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 "list": [] 43 "list": []
44 }, 44 },
45 "miniprogram": { 45 "miniprogram": {
46 - "current": 8, 46 + "current": 39,
47 "list": [ 47 "list": [
48 { 48 {
49 "id": 0, 49 "id": 0,
@@ -346,7 +346,7 @@ @@ -346,7 +346,7 @@
346 "id": 39, 346 "id": 39,
347 "name": "pages/reserve/detail 在线订座 ", 347 "name": "pages/reserve/detail 在线订座 ",
348 "pathName": "pages/reserve/detail", 348 "pathName": "pages/reserve/detail",
349 - "query": "id=312", 349 + "query": "id=1",
350 "scene": null 350 "scene": null
351 }, 351 },
352 { 352 {