Commit 2a6cf4c4d038df59af1660eae702f18d91d1a143

Authored by wangfan
1 parent f62355e2

C端调整

@@ -16,29 +16,30 @@ @@ -16,29 +16,30 @@
16 <view wx:if="{{hasStat}}" class="stat"> 16 <view wx:if="{{hasStat}}" class="stat">
17 <stat stat="{{seller.score}}"></stat> 17 <stat stat="{{seller.score}}"></stat>
18 </view> 18 </view>
19 - <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper flex-ll">  
20 - <view class="icon-hui"></view>  
21 - <swiper  
22 - indicator-dots="{{false}}"  
23 - autoplay  
24 - interval="3000"  
25 - duration="200"  
26 - vertical  
27 - circular  
28 - >  
29 - <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" >  
30 - <swiper-item>  
31 - <view class="activity-item">  
32 - {{item.title}}  
33 - </view>  
34 - </swiper-item>  
35 - </block>  
36 - </swiper> 19 + <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper">
  20 + <view class="flex-ll">
  21 + <view class="icon-hui"></view>
  22 + <swiper
  23 + indicator-dots="{{false}}"
  24 + autoplay
  25 + interval="3000"
  26 + duration="200"
  27 + vertical
  28 + circular
  29 + >
  30 + <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" >
  31 + <swiper-item>
  32 + <view class="activity-item">
  33 + {{item.title}}
  34 + </view>
  35 + </swiper-item>
  36 + </block>
  37 + </swiper>
  38 + </view>
  39 + <view class="activity-mask"></view>
37 </view> 40 </view>
38 <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll"> 41 <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll">
39 - <view wx:for="{{seller.activity}}" class="activity-item flex-vc" wx:key="seller.activity.key" wx:if="{{index<3}}">  
40 - {{['','满减','满赠','折扣','代金券','会员价'][item.type]}}  
41 - </view> 42 + <text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text>
42 </view> 43 </view>
43 </view> 44 </view>
44 <view class="price flex-lr"> 45 <view class="price flex-lr">
@@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
54 height: 36rpx; 54 height: 36rpx;
55 line-height: 36rpx; 55 line-height: 36rpx;
56 margin-top: 10rpx; 56 margin-top: 10rpx;
  57 + white-space:nowrap;
  58 + overflow: hidden;
57 } 59 }
58 .seller .text{ 60 .seller .text{
59 font-size: 28rpx; 61 font-size: 28rpx;
@@ -110,13 +112,13 @@ @@ -110,13 +112,13 @@
110 line-height: 24rpx; 112 line-height: 24rpx;
111 } 113 }
112 .activity{ 114 .activity{
113 - font-size: 24rpx;  
114 color: #F05522; 115 color: #F05522;
115 margin-top: 10rpx; 116 margin-top: 10rpx;
116 } 117 }
117 .activity .activity-item{ 118 .activity .activity-item{
  119 + font-size: 24rpx;
118 height: 36rpx; 120 height: 36rpx;
119 - padding: 0 10rpx; 121 + padding: 0 10rpx 0;
120 line-height: 36rpx; 122 line-height: 36rpx;
121 overflow: hidden; 123 overflow: hidden;
122 max-height: 36rpx; 124 max-height: 36rpx;
@@ -139,6 +141,14 @@ @@ -139,6 +141,14 @@
139 margin-top: 20rpx; 141 margin-top: 20rpx;
140 height: 32rpx; 142 height: 32rpx;
141 overflow: hidden; 143 overflow: hidden;
  144 + position: relative;
  145 +}
  146 +.activity-mask{
  147 + position: absolute;
  148 + top:0;
  149 + left: 0;
  150 + width: 100%;
  151 + height: 32rpx;
142 } 152 }
143 .activity-swiper swiper{ 153 .activity-swiper swiper{
144 width: 100%; 154 width: 100%;