xt / xcx-book · Commits

Go to a project

Commit f0cf46338bbc7ed46469a073b8eed11af04f8572

Authored by wangfan
1 parent 573bb02b
build: skipped

C端调整

Inline Side-by-side
Showing 4 changed files with 29 additions and 11 deletions
@@ -31,6 +31,10 @@ Component({ @@ -31,6 +31,10 @@ Component({
31 type:Boolean, 31 type:Boolean,
32 value:true, 32 value:true,
33 }, 33 },
  34 + sellerStyle:{//特殊样式
  35 + type:String,
  36 + value:'',
  37 + }
34 }, 38 },
35 39
36 /** 40 /**
1 <!--components/showModal/showModal.wxml--> 1 <!--components/showModal/showModal.wxml-->
2 -<view class="seller flex-ll" > 2 +<view class="seller flex-ll {{sellerStyle}}" >
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/custom/lite-online/image/seller-def.png'}}"></image> 5 src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://qn.colorcun.com/custom/lite-online/image/seller-def.png'}}"></image>
@@ -8,14 +8,13 @@ @@ -8,14 +8,13 @@
8 <view class="info flex-tb"> 8 <view class="info flex-tb">
9 <view> 9 <view>
10 <view class="name Semibold">{{seller.sellername}}</view> 10 <view class="name Semibold">{{seller.sellername}}</view>
11 - <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">  
12 - “{{seller.slogan}}”  
13 - </view> 11 + <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
14 <view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}距当前位置{{seller.distance}}</view> 12 <view class="text">{{seller.cate[0].name?seller.cate[0].name+' | ':''}}距当前位置{{seller.distance}}</view>
15 <view wx:if="{{hasStat}}" class="stat"> 13 <view wx:if="{{hasStat}}" class="stat">
16 <stat stat="{{seller.score}}"></stat> 14 <stat stat="{{seller.score}}"></stat>
17 </view> 15 </view>
18 - <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper"> 16 + <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper flex-ll">
  17 + <view class="icon-hui"></view>
19 <swiper 18 <swiper
20 indicator-dots="{{false}}" 19 indicator-dots="{{false}}"
21 autoplay 20 autoplay
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 border-radius: 6rpx; 9 border-radius: 6rpx;
10 box-shadow: 0 4rpx 8rpx 0 #E0E0E0; 10 box-shadow: 0 4rpx 8rpx 0 #E0E0E0;
11 } 11 }
  12 +.seller.noborder{
  13 + border-width: 0;
  14 + box-shadow: none;
  15 +}
12 .seller image{ 16 .seller image{
13 width: 100%; 17 width: 100%;
14 height: 100%; 18 height: 100%;
@@ -42,6 +46,8 @@ @@ -42,6 +46,8 @@
42 font-size: 32rpx; 46 font-size: 32rpx;
43 height: 44rpx; 47 height: 44rpx;
44 line-height: 44rpx; 48 line-height: 44rpx;
  49 + overflow: hidden;
  50 + white-space:nowrap;
45 } 51 }
46 .seller .slogan{ 52 .seller .slogan{
47 font-size: 26rpx; 53 font-size: 26rpx;
@@ -116,12 +122,12 @@ @@ -116,12 +122,12 @@
116 height: 32rpx; 122 height: 32rpx;
117 overflow: hidden; 123 overflow: hidden;
118 } 124 }
  125 +.activity-swiper swiper{
  126 + width: 100%;
  127 + height: 32rpx;
  128 +}
119 .activity-swiper .activity-item{ 129 .activity-swiper .activity-item{
120 - background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png");  
121 - background-size: auto 100%;  
122 - text-indent: 42rpx;  
123 - background-repeat: no-repeat;  
124 - 130 + text-indent: 10rpx;
125 height: 32rpx; 131 height: 32rpx;
126 width: 100%; 132 width: 100%;
127 line-height: 32rpx; 133 line-height: 32rpx;
@@ -130,6 +136,13 @@ @@ -130,6 +136,13 @@
130 overflow: hidden; 136 overflow: hidden;
131 white-space:nowrap; 137 white-space:nowrap;
132 } 138 }
  139 +.activity-swiper .icon-hui{
  140 + background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png");
  141 + background-size: 100% 100%;
  142 + height: 32rpx;
  143 + width: 32rpx;
  144 + min-width: 32rpx;
  145 +}
133 .reserve-text{ 146 .reserve-text{
134 text-shadow:0 2rpx 6rpx #505050; 147 text-shadow:0 2rpx 6rpx #505050;
135 } 148 }
@@ -6,7 +6,9 @@ @@ -6,7 +6,9 @@
6 <view class="follow"> 6 <view class="follow">
7 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key" 7 <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
8 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}"> 8 bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
9 - <sb-tr seller="{{item}}" hasActivity="{{true}}" hasAverage="{{false}}" hasSlogan="{{true}}"></sb-tr> 9 + <sb-tr seller="{{item}}"
  10 + hasActivity="{{true}}" hasAverage="{{false}}"
  11 + hasSlogan="{{true}}" sellerStyle="noborder"></sb-tr>
10 </view> 12 </view>
11 <view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view> 13 <view class="flex-vc" wx:if="{{!hasMore}}">没有更多了</view>
12 </view> 14 </view>