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({ @@ -54,24 +54,38 @@ Component({
54 */ 54 */
55 data: { 55 data: {
56 }, 56 },
  57 + lifetimes: {
  58 + attached: function () {this.init()},
  59 + moved: function () { },
  60 + detached: function () { },
  61 + },
57 attached(){ 62 attached(){
58 - this.init() 63 +
59 }, 64 },
60 /** 65 /**
61 * 组件的方法列表 66 * 组件的方法列表
62 */ 67 */
63 methods: { 68 methods: {
64 init(){ 69 init(){
65 - let seller=this.data.seller  
66 - seller.distance=parseInt(seller.distance);  
67 - if(seller.distance>1000){  
68 - seller.distance=(seller.distance/1000).toFixed(2)+'公里'  
69 - }else{  
70 - seller.distance+='米'; 70 + let seller=this.data.seller
  71 + if(seller.distance || seller.distance!=="") {
  72 + seller.distance = parseInt(seller.distance);
  73 + if (seller.distance > 1000) {
  74 + seller.distanceStr = (seller.distance / 1000).toFixed(2) + 'km'
  75 + } else {
  76 + seller.distanceStr = seller.distance+'m';
  77 + }
  78 + if(seller.label_c.length>0) {
  79 + let label_cstr=[];
  80 + seller.label_c.forEach(l=>{
  81 + label_cstr.push(l.name)
  82 + })
  83 + seller.label_cstr=label_cstr.join(' | ')
71 } 84 }
72 this.setData({ 85 this.setData({
73 - se:seller, 86 + se: seller,
74 }) 87 })
  88 + }
75 }, 89 },
76 tapButton(e){ 90 tapButton(e){
77 let type=util.attr(e,'type'); 91 let type=util.attr(e,'type');
@@ -7,16 +7,16 @@ @@ -7,16 +7,16 @@
7 <view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view> 7 <view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view>
8 </view> 8 </view>
9 <view class="info flex-tb"> 9 <view class="info flex-tb">
10 - <view style="max-width: 100%;"> 10 + <view style="max-width: 100%;width: 100%;">
11 <view class="name Semibold flex-ll"> 11 <view class="name Semibold flex-ll">
12 - <view class="sellername">{{seller.sellername}}{{seller.sellername}}</view> 12 + <view class="sellername">{{seller.sellername}}</view>
13 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}">惠</view> 13 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}">惠</view>
14 </view> 14 </view>
15 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view> 15 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
16 <view class="text flex-ll"> 16 <view class="text flex-ll">
17 <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view> 17 <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>
18 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> 18 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
19 - <view class="text-item" wx:if="{{seller.distance!==''}}">距您{{seller.distance}}</view> 19 + <view class="text-item" wx:if="{{se.distanceStr}}">距您{{se.distanceStr}}</view>
20 </view> 20 </view>
21 <view wx:if="{{hasStat}}" class="stat"> 21 <view wx:if="{{hasStat}}" class="stat">
22 <stat stat="{{seller.score}}"></stat> 22 <stat stat="{{seller.score}}"></stat>
@@ -46,8 +46,8 @@ @@ -46,8 +46,8 @@
46 <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll"> 46 <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll">
47 <text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text> 47 <text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text>
48 </view> 48 </view>
49 - <view wx:if="{{hasActivityTese && seller.activity.length>0}}" class="activity hasActivityTese flex-ll">  
50 - <text class="activity-item">满减 | 满赠 | 折扣</text> 49 + <view wx:if="{{hasActivityTese && se.label_cstr}}" class="activity hasActivityTese flex-ll">
  50 + <text class="activity-item">{{se.label_cstr}}</text>
51 </view> 51 </view>
52 </view> 52 </view>
53 <view class="price flex-lr"> 53 <view class="price flex-lr">
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
54 line-height: 44rpx; 54 line-height: 44rpx;
55 overflow: hidden; 55 overflow: hidden;
56 white-space:nowrap; 56 white-space:nowrap;
  57 + width: 100%;
57 } 58 }
58 .seller .slogan{ 59 .seller .slogan{
59 font-size: 26rpx; 60 font-size: 26rpx;
@@ -126,14 +126,14 @@ Page({ @@ -126,14 +126,14 @@ Page({
126 this.offset+=1 126 this.offset+=1
127 } 127 }
128 sellers.forEach((seller,si) => { 128 sellers.forEach((seller,si) => {
129 - if(seller.distance || seller.distance===0){  
130 - seller.distance = parseInt(seller.distance);  
131 - if (seller.distance > 1000) {  
132 - seller.distance = (seller.distance / 1000).toFixed(2) + 'km'  
133 - } else {  
134 - seller.distance += 'm';  
135 - }  
136 - } 129 + // if(seller.distance || seller.distance===0){
  130 + // seller.distance = parseInt(seller.distance);
  131 + // if (seller.distance > 1000) {
  132 + // seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
  133 + // } else {
  134 + // seller.distance += 'm';
  135 + // }
  136 + // }
137 if(seller.seller_tel){ 137 if(seller.seller_tel){
138 seller.seller_tel=seller.seller_tel.split(','); 138 seller.seller_tel=seller.seller_tel.split(',');
139 }else{ 139 }else{
@@ -109,14 +109,14 @@ Page({ @@ -109,14 +109,14 @@ Page({
109 this.offset+=1 109 this.offset+=1
110 } 110 }
111 sellers.forEach((seller,si) => { 111 sellers.forEach((seller,si) => {
112 - if(seller.distance || seller.distance===0) {  
113 - seller.distance = parseInt(seller.distance);  
114 - if (seller.distance > 1000) {  
115 - seller.distance = (seller.distance / 1000).toFixed(2) + 'km'  
116 - } else {  
117 - seller.distance += 'm';  
118 - }  
119 - } 112 + // if(seller.distance || seller.distance===0) {
  113 + // seller.distance = parseInt(seller.distance);
  114 + // if (seller.distance > 1000) {
  115 + // seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
  116 + // } else {
  117 + // seller.distance += 'm';
  118 + // }
  119 + // }
120 if(seller.seller_tel){ 120 if(seller.seller_tel){
121 seller.seller_tel=seller.seller_tel.split(','); 121 seller.seller_tel=seller.seller_tel.split(',');
122 }else{ 122 }else{
@@ -467,14 +467,14 @@ Page({ @@ -467,14 +467,14 @@ Page({
467 now_sid.push(seller.id); 467 now_sid.push(seller.id);
468 let hasMark=false; 468 let hasMark=false;
469 if(this.sellersIds._indexOf(seller.id)<0){ 469 if(this.sellersIds._indexOf(seller.id)<0){
470 - if(seller.distance || seller.distance===0){  
471 - seller.distance=parseInt(seller.distance);  
472 - if(seller.distance>1000){  
473 - seller.distance=(seller.distance/1000).toFixed(2)+'km'  
474 - }else{  
475 - seller.distance+='m';  
476 - }  
477 - } 470 + // if(seller.distance || seller.distance===0){
  471 + // seller.distance=parseInt(seller.distance);
  472 + // if(seller.distance>1000){
  473 + // seller.distance=(seller.distance/1000).toFixed(2)+'km'
  474 + // }else{
  475 + // seller.distance+='m';
  476 + // }
  477 + // }
478 if(this.hasSellerConcat){ 478 if(this.hasSellerConcat){
479 this.sellersIds.push(seller.id); 479 this.sellersIds.push(seller.id);
480 } 480 }
@@ -191,16 +191,16 @@ Page({ @@ -191,16 +191,16 @@ Page({
191 }) 191 })
192 }, 192 },
193 sellerFormat(sellers){ 193 sellerFormat(sellers){
194 - sellers.forEach((seller) => {  
195 - if(seller.distance || seller.distance===0) {  
196 - seller.distance = parseInt(seller.distance);  
197 - if (seller.distance > 1000) {  
198 - seller.distance = (seller.distance / 1000).toFixed(2) + 'km'  
199 - } else {  
200 - seller.distance += 'm';  
201 - }  
202 - }  
203 - }) 194 + // sellers.forEach((seller) => {
  195 + // if(seller.distance || seller.distance===0) {
  196 + // seller.distance = parseInt(seller.distance);
  197 + // if (seller.distance > 1000) {
  198 + // seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
  199 + // } else {
  200 + // seller.distance += 'm';
  201 + // }
  202 + // }
  203 + // })
204 return sellers; 204 return sellers;
205 } 205 }
206 }) 206 })