discount and activity

@@ -16,6 +16,7 @@
   max-height: 792rpx;
   max-height: 792rpx;
   overflow-y: auto;
   overflow-y: auto;
   overflow-x: visible;
   overflow-x: visible;
+  padding-bottom: 10rpx;
 }
 }
 .discount.discountHide{
 .discount.discountHide{
   animation: discountHide 0.3s;
   animation: discountHide 0.3s;

@@ -98,25 +98,17 @@
                     </view>
                     </view>
                     <view class="black20line"></view>
                     <view class="black20line"></view>
                 </view>
                 </view>
-                <block wx:else="">
-                    <view class="seller" wx:if="{{seller.activity.length>0}}">
-                        <formids bindclick="showDiscount">
-                            <view class="activity-view-easy activity-view-easy-old flex-lr" >
-                                <view class="activity-left flex-ll">
-                                    <view class="icon"></view>
-                                    <block wx:for="{{seller.activity}}"
-                                           wx:key="seller.activity.key"
-                                           wx:if="{{index<2}}">
-                                        <view class="discount" >{{item.title}}</view>
-                                    </block>
-                                </view>
-                                <view class="flex-rr activity-right">
-                                    <view class="more-text">更多</view>
-                                    <view class="more"></view>
-                                </view>
-                            </view>
-                        </formids>
+                <block wx:elif="{{seller.activityStr}}">
+                    <view class="activity-view-easy flex-lr" bindtap="showDiscount">
+                        <view class="activity-left flex-ll">
+                            <view class="activity-view-tit">优惠</view>
+                            <view class="activity-view-activityStr">{{seller.activityStr}}</view>
+                        </view>
+                        <view class="flex-rr activity-right">
+                            <view class="more"></view>
+                        </view>
                     </view>
                     </view>
+                    <view class="black20line"></view>
                 </block>
                 </block>
                 <block wx:if="{{seller.isopen_md!=1}}">
                 <block wx:if="{{seller.isopen_md!=1}}">
                     <view class="seller" >
                     <view class="seller" >

@@ -330,7 +330,7 @@
   color: #C28C56;
   color: #C28C56;
 }
 }
 .more{
 .more{
-  background-image: url("http://nosqn.colorcun.com/reserve/images/m713.png");
+  /*background-image: url("http://nosqn.colorcun.com/reserve/images/m713.png");*/
   margin-left: 20rpx;
   margin-left: 20rpx;
   height: 26rpx;
   height: 26rpx;
   width: 14rpx;
   width: 14rpx;
@@ -575,6 +575,13 @@
   color:rgba(53,53,53,1);
   color:rgba(53,53,53,1);
   line-height:42rpx;
   line-height:42rpx;
   margin-right: 42rpx;
   margin-right: 42rpx;
+  min-width: 60rpx;
+}
+.activity-view-activityStr{
+  white-space:nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 26rpx;
 }
 }
 .activity-view-blk{
 .activity-view-blk{
   height:34rpx;
   height:34rpx;