C端调整

@@ -19,7 +19,11 @@ Component({
       type:Boolean,
       value:true,
     },
-    hasActivity:{
+    hasActivity:{//滚动优惠
+      type:Boolean,
+      value:false,
+    },
+    hasActivityTags:{//优惠标签
       type:Boolean,
       value:false,
     },

@@ -15,9 +15,27 @@
             <view wx:if="{{hasStat}}" class="stat">
                 <stat stat="{{seller.score}}"></stat>
             </view>
-            <view wx:if="{{hasActivity}}" class="activity flex-ll">
+            <view wx:if="{{hasActivity && seller.activity.length>0}}" class="activity-swiper">
+                <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 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.title}}
+                    {{['','满减','满赠','折扣','代金券','会员价'][item.type]}}
                 </view>
             </view>
         </view>

@@ -85,27 +85,51 @@
   height: 24rpx;
   line-height: 24rpx;
 }
-
 .activity{
-  font-size: 22rpx;
+  font-size: 24rpx;
   color: #F05522;
+  margin-top: 10rpx;
 }
-.activity-item{
-  height: 34rpx;
-  width: 104rpx;
-  line-height: 34rpx;
+.activity .activity-item{
+  height: 36rpx;
+  padding: 0 30rpx;
+  line-height: 36rpx;
   overflow: hidden;
-  max-height: 34rpx;
-  border-radius: 4rpx;
-  border: 2rpx solid #F8A990;
+  max-height: 36rpx;
+  border-radius: 6rpx;
   margin-left: 10rpx;
   text-align: center;
   overflow: hidden;
   white-space:nowrap;
+  background: linear-gradient(to right, #F98E47, #F05522);
+  text-shadow:0 2rpx 6rpx #C51B41;
+  color:#F8E6C4;
 }
-.activity-item:first-child{
+.activity .activity-item:first-child{
   margin-left: 0;
 }
+
+.activity-swiper{
+  font-size: 28rpx;
+  color: #F05025;
+  margin-top: 20rpx;
+  height: 32rpx;
+  overflow: hidden;
+}
+.activity-swiper .activity-item{
+  background-image: url("http://qn.colorcun.com/reserve/images/%E6%83%A0.png");
+  background-size: auto 100%;
+  text-indent: 42rpx;
+  background-repeat: no-repeat;
+
+  height: 32rpx;
+  width: 100%;
+  line-height: 32rpx;
+  overflow: hidden;
+  max-height: 32rpx;
+  overflow: hidden;
+  white-space:nowrap;
+}
 .reserve-text{
   text-shadow:0 2rpx 6rpx #505050;
 }
\ No newline at end of file

@@ -53,7 +53,7 @@
                 <block wx:for="{{markers}}" wx:key="markers.key" >
                     <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
                         <view class="seller" id="seller-{{item.id}}">
-                            <sb-tr seller="{{item.seller}}" hasActivity="{{true}}"></sb-tr>
+                            <sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr>
                         </view>
                     </swiper-item>
                 </block>

@@ -43,7 +43,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 39,
+			"current": 51,
 			"list": [
 				{
 					"id": 0,
@@ -427,10 +427,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 51,
 					"name": "pages/reserve/discount 在线订座  ",
 					"pathName": "pages/reserve/discount",
-					"query": "id=1",
+					"query": "latitude=34.215637&longitude=108.891264&scale=16&height=397",
 					"scene": null
 				}
 			]