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({ @@ -27,10 +27,22 @@ Component({
27 type:Boolean, 27 type:Boolean,
28 value:false, 28 value:false,
29 }, 29 },
  30 + hasActivityShort:{//店铺名后面的惠字
  31 + type:Boolean,
  32 + value:false,
  33 + },
30 hasSlogan:{ 34 hasSlogan:{
31 type:Boolean, 35 type:Boolean,
32 value:true, 36 value:true,
33 }, 37 },
  38 + hasBrand:{//店铺品牌
  39 + type:Boolean,
  40 + value:false,
  41 + },
  42 + hasActivityTese:{//店铺特色
  43 + type:Boolean,
  44 + value:false,
  45 + },
34 sellerStyle:{//特殊样式 46 sellerStyle:{//特殊样式
35 type:String, 47 type:String,
36 value:'', 48 value:'',
@@ -3,15 +3,20 @@ @@ -3,15 +3,20 @@
3 <view class="image"> 3 <view class="image">
4 <image mode="aspectFill" 4 <image mode="aspectFill"
5 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> 5 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>
6 - <view class="room_num" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view> 6 + <view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
  7 + <view class="room_num hasBrand Semibold" wx:if="{{hasBrand}}">优选餐厅</view>
7 </view> 8 </view>
8 <view class="info flex-tb"> 9 <view class="info flex-tb">
9 - <view>  
10 - <view class="name Semibold">{{seller.sellername}}</view> 10 + <view style="max-width: 100%;">
  11 + <view class="name Semibold flex-ll">
  12 + <view class="sellername">{{seller.sellername}}{{seller.sellername}}</view>
  13 + <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}">惠</view>
  14 + </view>
11 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view> 15 <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
12 <view class="text flex-ll"> 16 <view class="text flex-ll">
13 <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>
14 - <view class="text-item" wx:if="{{seller.distance}}">距当前位置{{seller.distance}}</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>
15 </view> 20 </view>
16 <view wx:if="{{hasStat}}" class="stat"> 21 <view wx:if="{{hasStat}}" class="stat">
17 <stat stat="{{seller.score}}"></stat> 22 <stat stat="{{seller.score}}"></stat>
@@ -41,6 +46,9 @@ @@ -41,6 +46,9 @@
41 <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">
42 <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>
43 </view> 48 </view>
  49 + <view wx:if="{{hasActivityTese && seller.activity.length>0}}" class="activity hasActivityTese flex-ll">
  50 + <text class="activity-item">满减 | 满赠 | 折扣</text>
  51 + </view>
44 </view> 52 </view>
45 <view class="price flex-lr"> 53 <view class="price flex-lr">
46 <view class="number Semibold"> 54 <view class="number Semibold">
@@ -176,4 +176,49 @@ @@ -176,4 +176,49 @@
176 } 176 }
177 .reserve-text{ 177 .reserve-text{
178 text-shadow:0 2rpx 6rpx #505050; 178 text-shadow:0 2rpx 6rpx #505050;
  179 +}
  180 +
  181 +
  182 +/*2019-06-27*/
  183 +.ActivityShort{
  184 + font-size: 20rpx;
  185 + color: #F05824;
  186 + height: 32rpx;
  187 + width: 32rpx;
  188 + line-height: 32rpx;
  189 + text-align: center;
  190 + border: 2rpx solid #F8A487;
  191 + border-radius: 4rpx;
  192 + margin-left: 10rpx;
  193 + min-width: 32rpx;
  194 +}
  195 +.seller .image .room_num.hasBrand{
  196 + left:0;
  197 + top:0;
  198 + font-size: 20rpx;
  199 + background: repeating-linear-gradient(to bottom,#F98E47,#F05522);
  200 + border-radius: 4rpx 4rpx 16rpx 0;
  201 + height: 32rpx;
  202 + line-height: 32rpx;
  203 +}
  204 +.hasActivityTese .activity-item{
  205 + font-size: 24rpx;
  206 + height: 40rpx;
  207 + padding: 0 10rpx 0;
  208 + line-height: 40rpx;
  209 + max-height: 40rpx;
  210 + text-align: center;
  211 + overflow: hidden;
  212 + white-space:nowrap;
  213 + background: none;
  214 + color:#C0A369;
  215 + text-shadow:none;
  216 + background-color: #FFF5EB;
  217 + margin-left: 0;
  218 + border-radius: 0;
  219 +}
  220 +.sellername{
  221 + max-width: calc(100% - 45rpx);
  222 + overflow: hidden;
  223 + text-overflow:ellipsis;
179 } 224 }
@@ -126,12 +126,12 @@ Page({ @@ -126,12 +126,12 @@ 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){ 129 + if(seller.distance || seller.distance===0){
130 seller.distance = parseInt(seller.distance); 130 seller.distance = parseInt(seller.distance);
131 if (seller.distance > 1000) { 131 if (seller.distance > 1000) {
132 - seller.distance = (seller.distance / 1000).toFixed(2) + '公里' 132 + seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
133 } else { 133 } else {
134 - seller.distance += '米'; 134 + seller.distance += 'm';
135 } 135 }
136 } 136 }
137 if(seller.seller_tel){ 137 if(seller.seller_tel){
@@ -10,7 +10,12 @@ @@ -10,7 +10,12 @@
10 <view class="follow" wx:else=""> 10 <view class="follow" wx:else="">
11 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key" 11 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
12 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}"> 12 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
13 - <sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}" sellerStyle="noborder"></sb-tr> 13 + <sb-tr seller="{{item}}"
  14 + hasActivityTags="{{false}}"
  15 + hasActivityShort="{{true}}"
  16 + hasBrand="true" hasActivityTese="true"
  17 + hasSlogan="{{false}}"
  18 + sellerStyle="noborder"></sb-tr>
14 </view> 19 </view>
15 <hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr> 20 <hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
16 </view> 21 </view>
@@ -109,12 +109,12 @@ Page({ @@ -109,12 +109,12 @@ 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) { 112 + if(seller.distance || seller.distance===0) {
113 seller.distance = parseInt(seller.distance); 113 seller.distance = parseInt(seller.distance);
114 if (seller.distance > 1000) { 114 if (seller.distance > 1000) {
115 - seller.distance = (seller.distance / 1000).toFixed(2) + '公里' 115 + seller.distance = (seller.distance / 1000).toFixed(2) + 'km'
116 } else { 116 } else {
117 - seller.distance += '米'; 117 + seller.distance += 'm';
118 } 118 }
119 } 119 }
120 if(seller.seller_tel){ 120 if(seller.seller_tel){
@@ -467,12 +467,12 @@ Page({ @@ -467,12 +467,12 @@ 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){ 470 + if(seller.distance || seller.distance===0){
471 seller.distance=parseInt(seller.distance); 471 seller.distance=parseInt(seller.distance);
472 if(seller.distance>1000){ 472 if(seller.distance>1000){
473 - seller.distance=(seller.distance/1000).toFixed(2)+'公里' 473 + seller.distance=(seller.distance/1000).toFixed(2)+'km'
474 }else{ 474 }else{
475 - seller.distance+='米'; 475 + seller.distance+='m';
476 } 476 }
477 } 477 }
478 if(this.hasSellerConcat){ 478 if(this.hasSellerConcat){
@@ -135,7 +135,11 @@ @@ -135,7 +135,11 @@
135 <block wx:for="{{markers}}" wx:key="markers.key" wx:if="{{item.id!='location'}}"> 135 <block wx:for="{{markers}}" wx:key="markers.key" wx:if="{{item.id!='location'}}">
136 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> 136 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
137 <view class="seller" id="seller-{{item.id}}"> 137 <view class="seller" id="seller-{{item.id}}">
138 - <sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr> 138 + <sb-tr seller="{{item.seller}}"
  139 + hasActivityTags="{{false}}"
  140 + hasActivityShort="{{true}}"
  141 + hasBrand="true" hasActivityTese="true"
  142 + hasSlogan="{{false}}"></sb-tr>
139 </view> 143 </view>
140 </swiper-item> 144 </swiper-item>
141 </block> 145 </block>
@@ -348,7 +348,7 @@ @@ -348,7 +348,7 @@
348 "id": 39, 348 "id": 39,
349 "name": "pages/reserve/detail 在线订座 ", 349 "name": "pages/reserve/detail 在线订座 ",
350 "pathName": "pages/reserve/detail", 350 "pathName": "pages/reserve/detail",
351 - "query": "id=999&fromid=22222", 351 + "query": "id=1&fromid=",
352 "scene": null 352 "scene": null
353 }, 353 },
354 { 354 {