blue ui other

@@ -77,20 +77,18 @@
             </view>
             </view>
         </view>
         </view>
     </view>
     </view>
-    <view class="padding-lg bg-white text-black margin-top-sm" wx:if="{{activityStr || seller.card_info.length>0}}">
+    <view class="padding-lg bg-white text-black margin-top-sm" wx:if="{{seller.activityStr || seller.card_info.length>0}}">
         <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
         <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
-            <view class="activity-view-easy flex-lr">
-                <view class="activity-left flex-ll">
+            <view class="activity-view-easy flex view align-center justify-between">
+                <view class="activity-left flex view">
                     <view class="activity-view-tit">优惠</view>
                     <view class="activity-view-tit">优惠</view>
                     <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>
                     <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>
                     <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>
                     <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>
                     <view class="activity-view-blk" wx:if="{{seller.isopen_md==1 && hasPTactivity}}">平台红包</view>
                     <view class="activity-view-blk" wx:if="{{seller.isopen_md==1 && hasPTactivity}}">平台红包</view>
                 </view>
                 </view>
-                <view class="flex-rr activity-right">
-                    <view class="more"></view>
-                </view>
+                <view class="more"></view>
             </view>
             </view>
-            <view class="activityStr" wx:if="{{seller.activityStr}}">
+            <view class="activityStr view" wx:if="{{seller.activityStr}}">
                 {{seller.activityStr}}
                 {{seller.activityStr}}
             </view>
             </view>
         </view>
         </view>

@@ -153,4 +153,94 @@ page{
   left:30rpx;
   left:30rpx;
   top:40rpx;
   top:40rpx;
   z-index: 9;
   z-index: 9;
+}
+
+.activity-view-easy{
+
+}
+.activity-view-easy .activity-left{
+
+}
+.activity-view-easy .icon{
+  background-image: url("http://nosqn.colorcun.com/reserve/images/ad2.png");
+  width: 30rpx;
+  height: 32rpx;
+  background-size: 100% 100%;
+}
+.activity-view-easy .discount{
+  border-right: 2rpx #C0A369 solid;
+  height: 30rpx;
+  line-height: 30rpx;
+  font-size: 30rpx;
+  padding-right: 20rpx;
+  padding-left: 20rpx;
+  margin-right: 0;
+  font-weight:500;
+}
+.activity-view-easy .discount:last-child{
+  border-right-width: 0;
+}
+.activity-view-easy-old .activity-right{
+  min-width: 100rpx;
+}
+.activity-view-tit{
+  height:42rpx;
+  font-size:30rpx;
+  font-family:PingFangSC-Medium,PingFang SC;
+  font-weight:500;
+  color:rgba(53,53,53,1);
+  line-height:42rpx;
+  margin-right: 42rpx;
+  min-width: 60rpx;
+}
+.activity-view-activityStr{
+  white-space:nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 26rpx;
+}
+.activity-view-blk{
+  height:34rpx;
+  border-top:2rpx solid rgba(240,88,36,1);
+  border-bottom:2rpx solid rgba(240,88,36,1);
+  box-sizing: border-box;
+  font-size:24rpx;
+  font-family:PingFangSC-Medium,PingFang SC;
+  font-weight:500;
+  color:rgba(240,88,36,1);
+  line-height:30rpx;
+  margin-right: 22rpx;
+  padding: 0 12rpx;
+  position: relative;
+  border-radius: 6rpx;
+}
+.activity-view-blk:before,.activity-view-blk:after{
+  background-size: 100% 100%;
+  width: 12rpx;
+  height: 34rpx;
+  background-image: url("http://nosqn.colorcun.com/sellerbaobao/left-1.png");
+  content: "";
+  position: absolute;
+  left:0;
+  top:-2rpx;
+}
+.activity-view-blk:after{
+  background-image: url("http://nosqn.colorcun.com/sellerbaobao/right-1.png");
+  right:0;
+  left:auto;
+}
+.activityStr{
+  width: calc(100% - 140rpx);
+  padding-left: 100rpx;
+
+  height: 36rpx;
+  font-size: 26rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #353535;
+  line-height: 36rpx;
+
+  white-space:nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 }

@@ -599,7 +599,7 @@
         {
         {
           "name": "pages/reserve/detail",
           "name": "pages/reserve/detail",
           "pathName": "pages/reserve/detail",
           "pathName": "pages/reserve/detail",
-          "query": "id=1&_activeTab=reserve&_date=2020-02-16&_pnum=6",
+          "query": "id=1001&_activeTab=reserve&_date=2020-02-16&_pnum=6",
           "scene": null
           "scene": null
         },
         },
         {
         {