C端调整

@@ -16,29 +16,30 @@
             <view wx:if="{{hasStat}}" class="stat">
                 <stat stat="{{seller.score}}"></stat>
             </view>
-            <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper flex-ll">
-                <view class="icon-hui"></view>
-                <swiper
-                        indicator-dots="{{false}}"
-                        autoplay
-                        interval="3000"
-                        duration="200"
-                        vertical
-                        circular
-                >
-                    <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" >
-                        <swiper-item>
-                            <view class="activity-item">
-                                {{item.title}}
-                            </view>
-                        </swiper-item>
-                    </block>
-                </swiper>
+            <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper">
+                <view class="flex-ll">
+                    <view class="icon-hui"></view>
+                    <swiper
+                            indicator-dots="{{false}}"
+                            autoplay
+                            interval="3000"
+                            duration="200"
+                            vertical
+                            circular
+                    >
+                        <block wx:for="{{seller.activity}}" wx:key="seller.activity.key" >
+                            <swiper-item>
+                                <view class="activity-item">
+                                    {{item.title}}
+                                </view>
+                            </swiper-item>
+                        </block>
+                    </swiper>
+                </view>
+                <view class="activity-mask"></view>
             </view>
             <view wx:if="{{hasActivityTags && seller.activity.length>0}}" class="activity flex-ll">
-                <view wx:for="{{seller.activity}}" class="activity-item flex-vc" wx:key="seller.activity.key" wx:if="{{index<3}}">
-                    {{['','满减','满赠','折扣','代金券','会员价'][item.type]}}
-                </view>
+                <text wx:for="{{seller.activity}}" class="activity-item" wx:key="seller.activity.key" wx:if="{{index<3}}">{{['','满减','满赠','折扣','代金券','会员价'][item.type]}}</text>
             </view>
         </view>
         <view class="price flex-lr">

@@ -54,6 +54,8 @@
   height: 36rpx;
   line-height: 36rpx;
   margin-top: 10rpx;
+  white-space:nowrap;
+  overflow: hidden;
 }
 .seller .text{
   font-size: 28rpx;
@@ -110,13 +112,13 @@
   line-height: 24rpx;
 }
 .activity{
-  font-size: 24rpx;
   color: #F05522;
   margin-top: 10rpx;
 }
 .activity .activity-item{
+  font-size: 24rpx;
   height: 36rpx;
-  padding: 0 10rpx;
+  padding: 0 10rpx 0;
   line-height: 36rpx;
   overflow: hidden;
   max-height: 36rpx;
@@ -139,6 +141,14 @@
   margin-top: 20rpx;
   height: 32rpx;
   overflow: hidden;
+  position: relative;
+}
+.activity-mask{
+  position: absolute;
+  top:0;
+  left: 0;
+  width: 100%;
+  height: 32rpx;
 }
 .activity-swiper swiper{
   width: 100%;