xt / xcx-book · Commits

Go to a project

Commit 64d1cafe1546306ded1cac0115392986b862b855

Authored by vking
1 parent afbe185d
build: skipped

列表样式调整

Inline Side-by-side
Showing 9 changed files with 90 additions and 16 deletions
... ... @@ -27,10 +27,22 @@ Component({
type:Boolean,
value:false,
},
hasActivityShort:{//店铺名后面的惠字
type:Boolean,
value:false,
},
hasSlogan:{
type:Boolean,
value:true,
},
hasBrand:{//店铺品牌
type:Boolean,
value:false,
},
hasActivityTese:{//店铺特色
type:Boolean,
value:false,
},
sellerStyle:{//特殊样式
type:String,
value:'',
... ...
... ... @@ -3,15 +3,20 @@
<view class="image">
<image mode="aspectFill"
src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}"></image>
<view class="room_num" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
<view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
<view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view>
</view>
<view class="info flex-tb">
<view>
<view class="name Semibold">{{seller.sellername}}</view>
<view style="max-width: 100%;">
<view class="name Semibold flex-ll">
<view class="sellername">{{seller.sellername}}{{seller.sellername}}</view>
<view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}">惠</view>
</view>
<view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
<view class="text flex-ll">
<view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>
<view class="text-item" wx:if="{{seller.distance}}">距当前位置{{seller.distance}}</view>
<view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
<view class="text-item" wx:if="{{seller.distance!==''}}">距您{{seller.distance}}</view>
</view>
<view wx:if="{{hasStat}}" class="stat">
<stat stat="{{seller.score}}"></stat>
... ... @@ -41,6 +46,9 @@
<view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll">
<text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text>
</view>
<view wx:if="{{hasActivityTese && seller.activity.length>0}}" class="activity hasActivityTese flex-ll">
<text class="activity-item">满减 | 满赠 | 折扣</text>
</view>
</view>
<view class="price flex-lr">
<view class="number Semibold">
... ...
... ... @@ -176,4 +176,49 @@
}
.reserve-text{
text-shadow:0 2rpx 6rpx #505050;
}
/*2019-06-27*/
.ActivityShort{
font-size: 20rpx;
color: #F05824;
height: 32rpx;
width: 32rpx;
line-height: 32rpx;
text-align: center;
border: 2rpx solid #F8A487;
border-radius: 4rpx;
margin-left: 10rpx;
min-width: 32rpx;
}
.seller .image .room_num.hasBrand{
left:0;
top:0;
font-size: 20rpx;
background: repeating-linear-gradient(to bottom,#F98E47,#F05522);
border-radius: 4rpx 4rpx 16rpx 0;
height: 32rpx;
line-height: 32rpx;
}
.hasActivityTese .activity-item{
font-size: 24rpx;
height: 40rpx;
padding: 0 10rpx 0;
line-height: 40rpx;
max-height: 40rpx;
text-align: center;
overflow: hidden;
white-space:nowrap;
background: none;
color:#C0A369;
text-shadow:none;
background-color: #FFF5EB;
margin-left: 0;
border-radius: 0;
}
.sellername{
max-width: calc(100% - 45rpx);
overflow: hidden;
text-overflow:ellipsis;
}
\ No newline at end of file
... ...
... ... @@ -126,12 +126,12 @@ Page({
this.offset+=1
}
sellers.forEach((seller,si) => {
if(seller.distance){
if(seller.distance || seller.distance===0){
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + '公里'
seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distance += '米';
seller.distance += 'm';
}
}
if(seller.seller_tel){
... ...
... ... @@ -10,7 +10,12 @@
<view class="follow" wx:else="">
<view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}" sellerStyle="noborder"></sb-tr>
<sb-tr seller="{{item}}"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityTese="true"
hasSlogan="{{false}}"
sellerStyle="noborder"></sb-tr>
</view>
<hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
</view>
... ...
... ... @@ -109,12 +109,12 @@ Page({
this.offset+=1
}
sellers.forEach((seller,si) => {
if(seller.distance) {
if(seller.distance || seller.distance===0) {
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + '公里'
seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distance += '米';
seller.distance += 'm';
}
}
if(seller.seller_tel){
... ...
... ... @@ -467,12 +467,12 @@ Page({
now_sid.push(seller.id);
let hasMark=false;
if(this.sellersIds._indexOf(seller.id)<0){
if(seller.distance){
if(seller.distance || seller.distance===0){
seller.distance=parseInt(seller.distance);
if(seller.distance>1000){
seller.distance=(seller.distance/1000).toFixed(2)+'公里'
seller.distance=(seller.distance/1000).toFixed(2)+'km'
}else{
seller.distance+='米';
seller.distance+='m';
}
}
if(this.hasSellerConcat){
... ...
... ... @@ -135,7 +135,11 @@
<block wx:for="{{markers}}" wx:key="markers.key" wx:if="{{item.id!='location'}}">
<swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
<view class="seller" id="seller-{{item.id}}">
<sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr>
<sb-tr seller="{{item.seller}}"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityTese="true"
hasSlogan="{{false}}"></sb-tr>
</view>
</swiper-item>
</block>
... ...
... ... @@ -348,7 +348,7 @@
"id": 39,
"name": "pages/reserve/detail 在线订座 ",
"pathName": "pages/reserve/detail",
"query": "id=999&fromid=22222",
"query": "id=1&fromid=",
"scene": null
},
{
... ...