xt / xcx-book · Commits

Go to a project

Commit fa7dd6b1c6317f2f17a39730406d5d78b62e5be8

Authored by wangfan
1 parent 46881609
build: skipped

activity

Inline Side-by-side
Showing 9 changed files with 112 additions and 16 deletions
... ... @@ -28,6 +28,7 @@
background-color: #199095;
font-size: 34rpx;
color: #fefefe;
margin: 0 auto;
}
.radio-group{
margin: 44rpx 5% 0rpx;
... ...
... ... @@ -18,8 +18,11 @@ Component({
hasAverage:{
type:Boolean,
value:true,
}
},
hasActivity:{
type:Boolean,
value:false,
},
},
/**
... ...
... ... @@ -10,6 +10,11 @@
<view wx:if="{{hasStat}}" class="stat">
<stat stat="{{seller.score}}"></stat>
</view>
<view wx:if="{{hasActivity}}" class="activity flex-ll">
<view wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">
{{item.title}}
</view>
</view>
<view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}距当前位置{{seller.distance}}</view>
<view class="price flex-lr">
<view class="number Semibold">
... ...
... ... @@ -73,4 +73,23 @@
color:#999999;
height: 24rpx;
line-height: 24rpx;
}
.activity{
font-size: 22rpx;
color: #F05522;
}
.activity-item{
height: 34rpx;
width: 100rpx;
line-height: 34rpx;
overflow: hidden;
max-height: 34rpx;
border-radius: 4rpx;
border: 2rpx solid #F05522;
margin-right: 10rpx;
text-align: center;
}
.activity-item:last-child{
margin-right: 0;
}
\ No newline at end of file
... ...
... ... @@ -31,6 +31,23 @@
<view class="icon car" wx:if="{{seller.is_parking==1}}">停车场</view>
</view>
</view>
<formids wx:if="{{seller.activity.length>0}}" class="flex-lr">
<view class="activity flex-lr" >
<view class="activity-left">
<view class="activity-first">
<image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
{{seller.activity[0].desc}}
</view>
<view class="activity-text" wx:if="{{seller.activity[1]}}">
{{seller.activity[1].desc}}
</view>
</view>
<view class="activity-right flex-rr Semibold" wx:if="{{seller.activity.length>1}}">
<view>更多优惠</view>
<view class="more"></view>
</view>
</view>
</formids>
<view class="addr" bindtap="lookLocation">
<view class="addr-text flex-ll">
<image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
... ...
... ... @@ -230,4 +230,45 @@
margin-bottom: 20rpx;
display: inline-block;
border-radius: 6rpx;
}
.activity{
background-color: #F3F4F6;
width:100%;
padding: 28rpx 0;
}
.activity-left{
width: 100%;
}
.activity-right{
min-width: 170rpx;
font-size: 28rpx;
color:#F05522;
}
.activity-first{
width: 100%;
line-height: 42rpx;
height: 42rpx;
overflow: hidden;
text-align: left;
}
.activity-first image{
width: 30rpx;
height: 28rpx;
margin-right: 20rpx;
min-width: 30rpx;
margin-left: 8rpx;
}
.activity-text{
margin-left: 60rpx;
line-height: 42rpx;
height: 42rpx;
margin-top: 10rpx;
overflow: hidden;
text-align: left;
}
.more{
background-image: url("http://qn.colorcun.com/custom/lite-online/image%E6%9B%B4%E5%A4%9A.png");
margin-left: 20rpx;
margin-right: 20rpx;
height: 24rpx;
}
\ No newline at end of file
... ...
... ... @@ -12,6 +12,7 @@ const renNum=function(){
}
return arr;
}
const cates_version='?1.1';
Page({
/**
... ... @@ -254,9 +255,13 @@ Page({
m.width=20;
m.height=25;
}
if(m.width==9){
m.width=7;
m.height=7;
if(m.width==12){
m.width=8;
m.height=8;
}
if(m.callout){
m.callout.borderColor= '#838383';
m.callout.bgColor= '#838383';
}
if(m.id==e.markerId){
current=i;
... ... @@ -265,10 +270,14 @@ Page({
m.width=20*bl;
m.height=25*bl;
}else{
m.width=9;
m.height=9;
m.width=12;
m.height=12;
}
m.zIndex=9999
if(m.callout){
m.callout.borderColor= '#F05522';
m.callout.bgColor= '#F05522';
}
}
})
let obj={
... ... @@ -356,11 +365,11 @@ Page({
let namelength = seller.sellername.replace(/[^\x00-\xff]/g, "01").length + 8;
let marker={
id: seller.id,
iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png",
iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version,
latitude: seller.lat,
longitude: seller.long,
width: 7,
height: 7,
width: 8,
height: 8,
//title:seller.seller_name,
zIndex:sellersLength-si,
zIndexBak:sellersLength-si,
... ... @@ -375,6 +384,7 @@ Page({
marker.iconPath=marker.iconPath.replace(/\/cates\/(.*)\.png/,function ($0,$1) {
return '/cates/'+encodeURI($1)+'.png'
})
marker.iconPath+=cates_version
marker.width=20;
marker.height=25;
}
... ... @@ -383,10 +393,10 @@ Page({
content: '　' + seller.sellername + '　',
color: '#fefefe',
fontSize: 12,
borderWidth: 1,
borderColor: '#4C4C4C',
borderWidth: 0,
borderColor: '#838383',
borderRadius: 50,
bgColor: '#626262',
bgColor: '#838383',
padding: 5,
textAlign: 'left',
display:'ALWAYS',
... ...
... ... @@ -53,7 +53,7 @@
<block wx:for="{{sellers}}" wx:key="sellers.key">
<swiper-item bindtap="gotoDetail" data-sid="{{item.id}}">
<view class="seller" id="seller-{{item.id}}">
<sb-tr seller="{{item}}"></sb-tr>
<sb-tr seller="{{item}}" hasActivity="{{true}}"></sb-tr>
</view>
</swiper-item>
</block>
... ...
... ... @@ -31,7 +31,7 @@
"list": []
},
"miniprogram": {
"current": 8,
"current": 39,
"list": [
{
"id": 0,
... ... @@ -334,7 +334,7 @@
"id": 39,
"name": "pages/reserve/detail 在线订座 ",
"pathName": "pages/reserve/detail",
"query": "id=154",
"query": "id=1",
"scene": null
},
{
... ...