Showing
9 changed files
with
112 additions
and
16 deletions
| @@ -10,6 +10,11 @@ | @@ -10,6 +10,11 @@ | ||
| 10 | <view wx:if="{{hasStat}}" class="stat"> | 10 | <view wx:if="{{hasStat}}" class="stat"> |
| 11 | <stat stat="{{seller.score}}"></stat> | 11 | <stat stat="{{seller.score}}"></stat> |
| 12 | </view> | 12 | </view> |
| 13 | + <view wx:if="{{hasActivity}}" class="activity flex-ll"> | ||
| 14 | + <view wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}"> | ||
| 15 | + {{item.title}} | ||
| 16 | + </view> | ||
| 17 | + </view> | ||
| 13 | <view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}距当前位置{{seller.distance}}</view> | 18 | <view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}距当前位置{{seller.distance}}</view> |
| 14 | <view class="price flex-lr"> | 19 | <view class="price flex-lr"> |
| 15 | <view class="number Semibold"> | 20 | <view class="number Semibold"> |
| @@ -73,4 +73,23 @@ | @@ -73,4 +73,23 @@ | ||
| 73 | color:#999999; | 73 | color:#999999; |
| 74 | height: 24rpx; | 74 | height: 24rpx; |
| 75 | line-height: 24rpx; | 75 | line-height: 24rpx; |
| 76 | +} | ||
| 77 | + | ||
| 78 | +.activity{ | ||
| 79 | + font-size: 22rpx; | ||
| 80 | + color: #F05522; | ||
| 81 | +} | ||
| 82 | +.activity-item{ | ||
| 83 | + height: 34rpx; | ||
| 84 | + width: 100rpx; | ||
| 85 | + line-height: 34rpx; | ||
| 86 | + overflow: hidden; | ||
| 87 | + max-height: 34rpx; | ||
| 88 | + border-radius: 4rpx; | ||
| 89 | + border: 2rpx solid #F05522; | ||
| 90 | + margin-right: 10rpx; | ||
| 91 | + text-align: center; | ||
| 92 | +} | ||
| 93 | +.activity-item:last-child{ | ||
| 94 | + margin-right: 0; | ||
| 76 | } | 95 | } |
| @@ -31,6 +31,23 @@ | @@ -31,6 +31,23 @@ | ||
| 31 | <view class="icon car" wx:if="{{seller.is_parking==1}}">停车场</view> | 31 | <view class="icon car" wx:if="{{seller.is_parking==1}}">停车场</view> |
| 32 | </view> | 32 | </view> |
| 33 | </view> | 33 | </view> |
| 34 | + <formids wx:if="{{seller.activity.length>0}}" class="flex-lr"> | ||
| 35 | + <view class="activity flex-lr" > | ||
| 36 | + <view class="activity-left"> | ||
| 37 | + <view class="activity-first"> | ||
| 38 | + <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image> | ||
| 39 | + {{seller.activity[0].desc}} | ||
| 40 | + </view> | ||
| 41 | + <view class="activity-text" wx:if="{{seller.activity[1]}}"> | ||
| 42 | + {{seller.activity[1].desc}} | ||
| 43 | + </view> | ||
| 44 | + </view> | ||
| 45 | + <view class="activity-right flex-rr Semibold" wx:if="{{seller.activity.length>1}}"> | ||
| 46 | + <view>更多优惠</view> | ||
| 47 | + <view class="more"></view> | ||
| 48 | + </view> | ||
| 49 | + </view> | ||
| 50 | + </formids> | ||
| 34 | <view class="addr" bindtap="lookLocation"> | 51 | <view class="addr" bindtap="lookLocation"> |
| 35 | <view class="addr-text flex-ll"> | 52 | <view class="addr-text flex-ll"> |
| 36 | <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> | 53 | <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image> |
| @@ -230,4 +230,45 @@ | @@ -230,4 +230,45 @@ | ||
| 230 | margin-bottom: 20rpx; | 230 | margin-bottom: 20rpx; |
| 231 | display: inline-block; | 231 | display: inline-block; |
| 232 | border-radius: 6rpx; | 232 | border-radius: 6rpx; |
| 233 | +} | ||
| 234 | +.activity{ | ||
| 235 | + background-color: #F3F4F6; | ||
| 236 | + width:100%; | ||
| 237 | + padding: 28rpx 0; | ||
| 238 | +} | ||
| 239 | +.activity-left{ | ||
| 240 | + width: 100%; | ||
| 241 | +} | ||
| 242 | +.activity-right{ | ||
| 243 | + min-width: 170rpx; | ||
| 244 | + font-size: 28rpx; | ||
| 245 | + color:#F05522; | ||
| 246 | +} | ||
| 247 | +.activity-first{ | ||
| 248 | + width: 100%; | ||
| 249 | + line-height: 42rpx; | ||
| 250 | + height: 42rpx; | ||
| 251 | + overflow: hidden; | ||
| 252 | + text-align: left; | ||
| 253 | +} | ||
| 254 | +.activity-first image{ | ||
| 255 | + width: 30rpx; | ||
| 256 | + height: 28rpx; | ||
| 257 | + margin-right: 20rpx; | ||
| 258 | + min-width: 30rpx; | ||
| 259 | + margin-left: 8rpx; | ||
| 260 | +} | ||
| 261 | +.activity-text{ | ||
| 262 | + margin-left: 60rpx; | ||
| 263 | + line-height: 42rpx; | ||
| 264 | + height: 42rpx; | ||
| 265 | + margin-top: 10rpx; | ||
| 266 | + overflow: hidden; | ||
| 267 | + text-align: left; | ||
| 268 | +} | ||
| 269 | +.more{ | ||
| 270 | + background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png"); | ||
| 271 | + margin-left: 20rpx; | ||
| 272 | + margin-right: 20rpx; | ||
| 273 | + height: 24rpx; | ||
| 233 | } | 274 | } |
| @@ -12,6 +12,7 @@ const renNum=function(){ | @@ -12,6 +12,7 @@ const renNum=function(){ | ||
| 12 | } | 12 | } |
| 13 | return arr; | 13 | return arr; |
| 14 | } | 14 | } |
| 15 | +const cates_version='?1.1'; | ||
| 15 | Page({ | 16 | Page({ |
| 16 | 17 | ||
| 17 | /** | 18 | /** |
| @@ -254,9 +255,13 @@ Page({ | @@ -254,9 +255,13 @@ Page({ | ||
| 254 | m.width=20; | 255 | m.width=20; |
| 255 | m.height=25; | 256 | m.height=25; |
| 256 | } | 257 | } |
| 257 | - if(m.width==9){ | ||
| 258 | - m.width=7; | ||
| 259 | - m.height=7; | 258 | + if(m.width==12){ |
| 259 | + m.width=8; | ||
| 260 | + m.height=8; | ||
| 261 | + } | ||
| 262 | + if(m.callout){ | ||
| 263 | + m.callout.borderColor= '#838383'; | ||
| 264 | + m.callout.bgColor= '#838383'; | ||
| 260 | } | 265 | } |
| 261 | if(m.id==e.markerId){ | 266 | if(m.id==e.markerId){ |
| 262 | current=i; | 267 | current=i; |
| @@ -265,10 +270,14 @@ Page({ | @@ -265,10 +270,14 @@ Page({ | ||
| 265 | m.width=20*bl; | 270 | m.width=20*bl; |
| 266 | m.height=25*bl; | 271 | m.height=25*bl; |
| 267 | }else{ | 272 | }else{ |
| 268 | - m.width=9; | ||
| 269 | - m.height=9; | 273 | + m.width=12; |
| 274 | + m.height=12; | ||
| 270 | } | 275 | } |
| 271 | m.zIndex=9999 | 276 | m.zIndex=9999 |
| 277 | + if(m.callout){ | ||
| 278 | + m.callout.borderColor= '#F05522'; | ||
| 279 | + m.callout.bgColor= '#F05522'; | ||
| 280 | + } | ||
| 272 | } | 281 | } |
| 273 | }) | 282 | }) |
| 274 | let obj={ | 283 | let obj={ |
| @@ -356,11 +365,11 @@ Page({ | @@ -356,11 +365,11 @@ Page({ | ||
| 356 | let namelength = seller.sellername.replace(/[^\x00-\xff]/g, "01").length + 8; | 365 | let namelength = seller.sellername.replace(/[^\x00-\xff]/g, "01").length + 8; |
| 357 | let marker={ | 366 | let marker={ |
| 358 | id: seller.id, | 367 | id: seller.id, |
| 359 | - iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png", | 368 | + iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version, |
| 360 | latitude: seller.lat, | 369 | latitude: seller.lat, |
| 361 | longitude: seller.long, | 370 | longitude: seller.long, |
| 362 | - width: 7, | ||
| 363 | - height: 7, | 371 | + width: 8, |
| 372 | + height: 8, | ||
| 364 | //title:seller.seller_name, | 373 | //title:seller.seller_name, |
| 365 | zIndex:sellersLength-si, | 374 | zIndex:sellersLength-si, |
| 366 | zIndexBak:sellersLength-si, | 375 | zIndexBak:sellersLength-si, |
| @@ -375,6 +384,7 @@ Page({ | @@ -375,6 +384,7 @@ Page({ | ||
| 375 | marker.iconPath=marker.iconPath.replace(/\/cates\/(.*)\.png/,function ($0,$1) { | 384 | marker.iconPath=marker.iconPath.replace(/\/cates\/(.*)\.png/,function ($0,$1) { |
| 376 | return '/cates/'+encodeURI($1)+'.png' | 385 | return '/cates/'+encodeURI($1)+'.png' |
| 377 | }) | 386 | }) |
| 387 | + marker.iconPath+=cates_version | ||
| 378 | marker.width=20; | 388 | marker.width=20; |
| 379 | marker.height=25; | 389 | marker.height=25; |
| 380 | } | 390 | } |
| @@ -383,10 +393,10 @@ Page({ | @@ -383,10 +393,10 @@ Page({ | ||
| 383 | content: ' ' + seller.sellername + ' ', | 393 | content: ' ' + seller.sellername + ' ', |
| 384 | color: '#fefefe', | 394 | color: '#fefefe', |
| 385 | fontSize: 12, | 395 | fontSize: 12, |
| 386 | - borderWidth: 1, | ||
| 387 | - borderColor: '#4C4C4C', | 396 | + borderWidth: 0, |
| 397 | + borderColor: '#838383', | ||
| 388 | borderRadius: 50, | 398 | borderRadius: 50, |
| 389 | - bgColor: '#626262', | 399 | + bgColor: '#838383', |
| 390 | padding: 5, | 400 | padding: 5, |
| 391 | textAlign: 'left', | 401 | textAlign: 'left', |
| 392 | display:'ALWAYS', | 402 | display:'ALWAYS', |
| @@ -53,7 +53,7 @@ | @@ -53,7 +53,7 @@ | ||
| 53 | <block wx:for="{{sellers}}" wx:key="sellers.key"> | 53 | <block wx:for="{{sellers}}" wx:key="sellers.key"> |
| 54 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}"> | 54 | <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}"> |
| 55 | <view class="seller" id="seller-{{item.id}}"> | 55 | <view class="seller" id="seller-{{item.id}}"> |
| 56 | - <sb-tr seller="{{item}}"></sb-tr> | 56 | + <sb-tr seller="{{item}}" hasActivity="{{true}}"></sb-tr> |
| 57 | </view> | 57 | </view> |
| 58 | </swiper-item> | 58 | </swiper-item> |
| 59 | </block> | 59 | </block> |
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | "list": [] | 31 | "list": [] |
| 32 | }, | 32 | }, |
| 33 | "miniprogram": { | 33 | "miniprogram": { |
| 34 | - "current": 8, | 34 | + "current": 39, |
| 35 | "list": [ | 35 | "list": [ |
| 36 | { | 36 | { |
| 37 | "id": 0, | 37 | "id": 0, |
| @@ -334,7 +334,7 @@ | @@ -334,7 +334,7 @@ | ||
| 334 | "id": 39, | 334 | "id": 39, |
| 335 | "name": "pages/reserve/detail 在线订座 ", | 335 | "name": "pages/reserve/detail 在线订座 ", |
| 336 | "pathName": "pages/reserve/detail", | 336 | "pathName": "pages/reserve/detail", |
| 337 | - "query": "id=154", | 337 | + "query": "id=1", |
| 338 | "scene": null | 338 | "scene": null |
| 339 | }, | 339 | }, |
| 340 | { | 340 | { |
-
Please register or login to post a comment