xt / xcx-book · Commits

Go to a project

Commit 07407ae0bf5ff61add39047d334d9f9b5880821d

Authored by vking
1 parent f1aee74f
build: skipped

deatil style

Inline Side-by-side
Showing 7 changed files with 62 additions and 47 deletions
... ... @@ -54,24 +54,38 @@ Component({
*/
data: {
},
lifetimes: {
attached: function () {this.init()},
moved: function () { },
detached: function () { },
},
attached(){
this.init()
},
/**
* 组件的方法列表
*/
methods: {
init(){
let seller=this.data.seller
seller.distance=parseInt(seller.distance);
if(seller.distance>1000){
seller.distance=(seller.distance/1000).toFixed(2)+'公里'
}else{
seller.distance+='米';
let seller=this.data.seller
if(seller.distance || seller.distance!=="") {
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distanceStr = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distanceStr = seller.distance+'m';
}
if(seller.label_c.length>0) {
let label_cstr=[];
seller.label_c.forEach(l=>{
label_cstr.push(l.name)
})
seller.label_cstr=label_cstr.join(' | ')
}
this.setData({
se:seller,
se: seller,
})
}
},
tapButton(e){
let type=util.attr(e,'type');
... ...
... ... @@ -7,16 +7,16 @@
<view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view>
</view>
<view class="info flex-tb">
<view style="max-width: 100%;">
<view style="max-width: 100%;width: 100%;">
<view class="name Semibold flex-ll">
<view class="sellername">{{seller.sellername}}{{seller.sellername}}</view>
<view class="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.room_num>0}}">{{seller.room_num}}个包间</view>
<view class="text-item" wx:if="{{seller.distance!==''}}">距您{{seller.distance}}</view>
<view class="text-item" wx:if="{{se.distanceStr}}">距您{{se.distanceStr}}</view>
</view>
<view wx:if="{{hasStat}}" class="stat">
<stat stat="{{seller.score}}"></stat>
... ... @@ -46,8 +46,8 @@
<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 wx:if="{{hasActivityTese && se.label_cstr}}" class="activity hasActivityTese flex-ll">
<text class="activity-item">{{se.label_cstr}}</text>
</view>
</view>
<view class="price flex-lr">
... ...
... ... @@ -54,6 +54,7 @@
line-height: 44rpx;
overflow: hidden;
white-space:nowrap;
width: 100%;
}
.seller .slogan{
font-size: 26rpx;
... ...
... ... @@ -126,14 +126,14 @@ Page({
this.offset+=1
}
sellers.forEach((seller,si) => {
if(seller.distance || seller.distance===0){
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distance += 'm';
}
}
// if(seller.distance || seller.distance===0){
// seller.distance = parseInt(seller.distance);
// if (seller.distance > 1000) {
// seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
// } else {
// seller.distance += 'm';
// }
// }
if(seller.seller_tel){
seller.seller_tel=seller.seller_tel.split(',');
}else{
... ...
... ... @@ -109,14 +109,14 @@ Page({
this.offset+=1
}
sellers.forEach((seller,si) => {
if(seller.distance || seller.distance===0) {
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distance += 'm';
}
}
// if(seller.distance || seller.distance===0) {
// seller.distance = parseInt(seller.distance);
// if (seller.distance > 1000) {
// seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
// } else {
// seller.distance += 'm';
// }
// }
if(seller.seller_tel){
seller.seller_tel=seller.seller_tel.split(',');
}else{
... ...
... ... @@ -467,14 +467,14 @@ Page({
now_sid.push(seller.id);
let hasMark=false;
if(this.sellersIds._indexOf(seller.id)<0){
if(seller.distance || seller.distance===0){
seller.distance=parseInt(seller.distance);
if(seller.distance>1000){
seller.distance=(seller.distance/1000).toFixed(2)+'km'
}else{
seller.distance+='m';
}
}
// if(seller.distance || seller.distance===0){
// seller.distance=parseInt(seller.distance);
// if(seller.distance>1000){
// seller.distance=(seller.distance/1000).toFixed(2)+'km'
// }else{
// seller.distance+='m';
// }
// }
if(this.hasSellerConcat){
this.sellersIds.push(seller.id);
}
... ...
... ... @@ -191,16 +191,16 @@ Page({
})
},
sellerFormat(sellers){
sellers.forEach((seller) => {
if(seller.distance || seller.distance===0) {
seller.distance = parseInt(seller.distance);
if (seller.distance > 1000) {
seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
} else {
seller.distance += 'm';
}
}
})
// sellers.forEach((seller) => {
// if(seller.distance || seller.distance===0) {
// seller.distance = parseInt(seller.distance);
// if (seller.distance > 1000) {
// seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
// } else {
// seller.distance += 'm';
// }
// }
// })
return sellers;
}
})
\ No newline at end of file
... ...