Showing
5 changed files
with
63 additions
and
17 deletions
| @@ -19,7 +19,11 @@ Component({ | @@ -19,7 +19,11 @@ Component({ | ||
| 19 | type:Boolean, | 19 | type:Boolean, |
| 20 | value:true, | 20 | value:true, |
| 21 | }, | 21 | }, |
| 22 | - hasActivity:{ | 22 | + hasActivity:{//滚动优惠 |
| 23 | + type:Boolean, | ||
| 24 | + value:false, | ||
| 25 | + }, | ||
| 26 | + hasActivityTags:{//优惠标签 | ||
| 23 | type:Boolean, | 27 | type:Boolean, |
| 24 | value:false, | 28 | value:false, |
| 25 | }, | 29 | }, |
| @@ -15,9 +15,27 @@ | @@ -15,9 +15,27 @@ | ||
| 15 | <view wx:if="{{hasStat}}" class="stat"> | 15 | <view wx:if="{{hasStat}}" class="stat"> |
| 16 | <stat stat="{{seller.score}}"></stat> | 16 | <stat stat="{{seller.score}}"></stat> |
| 17 | </view> | 17 | </view> |
| 18 | - <view wx:if="{{hasActivity}}" class="activity flex-ll"> | 18 | + <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper"> |
| 19 | + <swiper | ||
| 20 | + indicator-dots="{{false}}" | ||
| 21 | + autoplay | ||
| 22 | + interval="3000" | ||
| 23 | + duration="200" | ||
| 24 | + vertical | ||
| 25 | + circular | ||
| 26 | + > | ||
| 27 | + <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" > | ||
| 28 | + <swiper-item> | ||
| 29 | + <view class="activity-item"> | ||
| 30 | + {{item.title}} | ||
| 31 | + </view> | ||
| 32 | + </swiper-item> | ||
| 33 | + </block> | ||
| 34 | + </swiper> | ||
| 35 | + </view> | ||
| 36 | + <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll"> | ||
| 19 | <view wx:for="{{seller.activity}}" class="activity-item flex-vc" wx:key="seller.activity.key" wx:if="{{index<3}}"> | 37 | <view wx:for="{{seller.activity}}" class="activity-item flex-vc" wx:key="seller.activity.key" wx:if="{{index<3}}"> |
| 20 | - {{item.title}} | 38 | + {{['','满减','满赠','折扣','代金券','会员价'][item.type]}} |
| 21 | </view> | 39 | </view> |
| 22 | </view> | 40 | </view> |
| 23 | </view> | 41 | </view> |
| @@ -85,27 +85,51 @@ | @@ -85,27 +85,51 @@ | ||
| 85 | height: 24rpx; | 85 | height: 24rpx; |
| 86 | line-height: 24rpx; | 86 | line-height: 24rpx; |
| 87 | } | 87 | } |
| 88 | - | ||
| 89 | .activity{ | 88 | .activity{ |
| 90 | - font-size: 22rpx; | 89 | + font-size: 24rpx; |
| 91 | color: #F05522; | 90 | color: #F05522; |
| 91 | + margin-top: 10rpx; | ||
| 92 | } | 92 | } |
| 93 | -.activity-item{ | ||
| 94 | - height: 34rpx; | ||
| 95 | - width: 104rpx; | ||
| 96 | - line-height: 34rpx; | 93 | +.activity .activity-item{ |
| 94 | + height: 36rpx; | ||
| 95 | + padding: 0 30rpx; | ||
| 96 | + line-height: 36rpx; | ||
| 97 | overflow: hidden; | 97 | overflow: hidden; |
| 98 | - max-height: 34rpx; | ||
| 99 | - border-radius: 4rpx; | ||
| 100 | - border: 2rpx solid #F8A990; | 98 | + max-height: 36rpx; |
| 99 | + border-radius: 6rpx; | ||
| 101 | margin-left: 10rpx; | 100 | margin-left: 10rpx; |
| 102 | text-align: center; | 101 | text-align: center; |
| 103 | overflow: hidden; | 102 | overflow: hidden; |
| 104 | white-space:nowrap; | 103 | white-space:nowrap; |
| 104 | + background: linear-gradient(to right, #F98E47, #F05522); | ||
| 105 | + text-shadow:0 2rpx 6rpx #C51B41; | ||
| 106 | + color:#F8E6C4; | ||
| 105 | } | 107 | } |
| 106 | -.activity-item:first-child{ | 108 | +.activity .activity-item:first-child{ |
| 107 | margin-left: 0; | 109 | margin-left: 0; |
| 108 | } | 110 | } |
| 111 | + | ||
| 112 | +.activity-swiper{ | ||
| 113 | + font-size: 28rpx; | ||
| 114 | + color: #F05025; | ||
| 115 | + margin-top: 20rpx; | ||
| 116 | + height: 32rpx; | ||
| 117 | + overflow: hidden; | ||
| 118 | +} | ||
| 119 | +.activity-swiper .activity-item{ | ||
| 120 | + background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png"); | ||
| 121 | + background-size: auto 100%; | ||
| 122 | + text-indent: 42rpx; | ||
| 123 | + background-repeat: no-repeat; | ||
| 124 | + | ||
| 125 | + height: 32rpx; | ||
| 126 | + width: 100%; | ||
| 127 | + line-height: 32rpx; | ||
| 128 | + overflow: hidden; | ||
| 129 | + max-height: 32rpx; | ||
| 130 | + overflow: hidden; | ||
| 131 | + white-space:nowrap; | ||
| 132 | +} | ||
| 109 | .reserve-text{ | 133 | .reserve-text{ |
| 110 | text-shadow:0 2rpx 6rpx #505050; | 134 | text-shadow:0 2rpx 6rpx #505050; |
| 111 | } | 135 | } |
| @@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
| 53 | <block wx:for="{{markers}}" wx:key="markers.key" > | 53 | <block wx:for="{{markers}}" wx:key="markers.key" > |
| 54 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> | 54 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> |
| 55 | <view class="seller" id="seller-{{item.id}}"> | 55 | <view class="seller" id="seller-{{item.id}}"> |
| 56 | - <sb-tr seller="{{item.seller}}" hasActivity="{{true}}"></sb-tr> | 56 | + <sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr> |
| 57 | </view> | 57 | </view> |
| 58 | </swiper-item> | 58 | </swiper-item> |
| 59 | </block> | 59 | </block> |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | "list": [] | 43 | "list": [] |
| 44 | }, | 44 | }, |
| 45 | "miniprogram": { | 45 | "miniprogram": { |
| 46 | - "current": 39, | 46 | + "current": 51, |
| 47 | "list": [ | 47 | "list": [ |
| 48 | { | 48 | { |
| 49 | "id": 0, | 49 | "id": 0, |
| @@ -427,10 +427,10 @@ | @@ -427,10 +427,10 @@ | ||
| 427 | "scene": null | 427 | "scene": null |
| 428 | }, | 428 | }, |
| 429 | { | 429 | { |
| 430 | - "id": -1, | 430 | + "id": 51, |
| 431 | "name": "pages/reserve/discount 在线订座 ", | 431 | "name": "pages/reserve/discount 在线订座 ", |
| 432 | "pathName": "pages/reserve/discount", | 432 | "pathName": "pages/reserve/discount", |
| 433 | - "query": "id=1", | 433 | + "query": "latitude=34.215637&longitude=108.891264&scale=16&height=397", |
| 434 | "scene": null | 434 | "scene": null |
| 435 | } | 435 | } |
| 436 | ] | 436 | ] |
-
Please register or login to post a comment