blue style

@@ -11,8 +11,11 @@
         <view style="max-width: 100%;width: 100%;">
         <view style="max-width: 100%;width: 100%;">
             <view class="name Semibold flex-ll">
             <view class="name Semibold flex-ll">
                 <view class="sellername">{{seller.sellername}}</view>
                 <view class="sellername">{{seller.sellername}}</view>
+                <!--
                 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}"></view>
                 <view class="ActivityShort" wx:if="{{hasActivityShort && seller.activity.length>0}}"></view>
+                -->
             </view>
             </view>
+            <view class="ActivityText" wx:if="{{hasActivityShort && seller.activity.length>0}}">此店有优惠</view>
             <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
             <view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</view>
             <view class="text flex-ll" wx:if="{{seller.cate.length>0}}">
             <view class="text flex-ll" wx:if="{{seller.cate.length>0}}">
                 <view class="text-item" wx:for="{{seller.cate}}" wx:key="seller.cate.key" wx:if="{{index<3}}">{{item.name}}</view>
                 <view class="text-item" wx:for="{{seller.cate}}" wx:key="seller.cate.key" wx:if="{{index<3}}">{{item.name}}</view>

@@ -226,4 +226,12 @@
   overflow: hidden;
   overflow: hidden;
   text-overflow:ellipsis;
   text-overflow:ellipsis;
   max-width: 320rpx;
   max-width: 320rpx;
+}
+.ActivityText{
+  height:34rpx;
+  font-size:24rpx;
+  font-weight:600;
+  color:rgba(34,137,243,1);
+  line-height:34rpx;
+  margin-top: 10rpx;
 }
 }

 <!--components/tips/add-to-lite.wxml-->
 <!--components/tips/add-to-lite.wxml-->
 <cover-view class="discount" style="top:{{statusBarHeightFull+a2lHeight}}px;width:{{hidden?'100rpx':'720rpx'}};" bindtap="gotoDiscount">
 <cover-view class="discount" style="top:{{statusBarHeightFull+a2lHeight}}px;width:{{hidden?'100rpx':'720rpx'}};" bindtap="gotoDiscount">
     <cover-view style="position: relative;height: 100%;">
     <cover-view style="position: relative;height: 100%;">
-        <cover-image class="discount-img" src="http://qn.colorcun.com/reserve/images/%E6%83%A03.png"></cover-image>
+        <cover-image class="discount-img" src="http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20191114115105.png"></cover-image>
         <cover-view style="position: relative;" wx:if="{{!hidden}}">
         <cover-view style="position: relative;" wx:if="{{!hidden}}">
-            <cover-image src="http://qn.colorcun.com/reserve/images/%E4%BC%98%E6%83%A0%E6%B4%BB%E5%8A%A83.png"></cover-image>
+            <cover-image src="http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911141151051.png"></cover-image>
             <cover-view class="discount-view">
             <cover-view class="discount-view">
-                <cover-view class="text">精选折扣，周到安排用户专享</cover-view>
+                <cover-view class="text">蓝色店铺有优惠</cover-view>
                 <cover-view class="close" catchtap="hide"></cover-view>
                 <cover-view class="close" catchtap="hide"></cover-view>
             </cover-view>
             </cover-view>
         </cover-view>
         </cover-view>

@@ -13,11 +13,12 @@
 .discount .text{
 .discount .text{
   position: absolute;
   position: absolute;
   font-size: 32rpx;
   font-size: 32rpx;
-  color: #F8E6C4;
+  color: #FFFFFF;
   left: 120rpx;
   left: 120rpx;
   top: 52rpx;
   top: 52rpx;
   height: 44rpx;
   height: 44rpx;
   line-height: 44rpx;
   line-height: 44rpx;
+  font-weight: bold;
 }
 }
 .discount .close{
 .discount .close{
   position: absolute;
   position: absolute;

@@ -521,6 +521,7 @@ Page({
               display:'BYCLICK',
               display:'BYCLICK',
             };
             };
             marker.calloutDisplay='BYCLICK';
             marker.calloutDisplay='BYCLICK';
+            let hasBigIcon=false
             if(seller.mode.length>0){
             if(seller.mode.length>0){
               seller.mode.forEach(x=>{
               seller.mode.forEach(x=>{
                 if(x.id==1){//大图标
                 if(x.id==1){//大图标
@@ -534,6 +535,7 @@ Page({
                   marker.iconPath+=cates_version
                   marker.iconPath+=cates_version
                   marker.width=20;
                   marker.width=20;
                   marker.height=25;
                   marker.height=25;
+                  hasBigIcon=true
                 }
                 }
                 if(x.id==2){//商家名
                 if(x.id==2){//商家名
                   marker.callout.display='ALWAYS';
                   marker.callout.display='ALWAYS';
@@ -541,6 +543,9 @@ Page({
                 }
                 }
               })
               })
             }
             }
+            if(!hasBigIcon && seller.activity.length>0){
+              marker.iconPath="http://qn.colorcun.com/custom/lite-online/cates/circle-bue.png"+cates_version
+            }
             markers.push(marker)
             markers.push(marker)
           }
           }
         })
         })