xt / xcx-book · Commits

Go to a project

Commit 89f2cec574c2fc3dca49ccab3ad3fb359566152f

Authored by pengye
1 parent be41af7a
build: skipped

邀请函、商家详情、商家有礼页面不能领的券不展示

Inline Side-by-side
Showing 24 changed files with 147 additions and 70 deletions
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <view class="publicModule couponBoxWrap" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}"> 74 <view class="publicModule couponBoxWrap" wx:if="{{hasValueCertificate && coupon_dataList.length>0}}">
75 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" /> 75 <image class="titleImg5" src="https://qn.colorcun.com/invitation10Title1.png" mode="" />
76 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 76 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
77 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 77 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
78 <view class="preferentialItems"> 78 <view class="preferentialItems">
79 <view class="purchase"> 79 <view class="purchase">
80 <view class="priceText" wx:if="{{item.price}}"> 80 <view class="priceText" wx:if="{{item.price}}">
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <view class="font24r couponBtn">立即抢购</view> 108 <view class="font24r couponBtn">立即抢购</view>
109 </view> 109 </view>
110 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 110 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
111 - <view class="font24r orderingFood">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 111 + <view class="font24r orderingFood">已领取</view>
112 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 112 <view class="grantNum" wx:if="{{item.receiveNumText}}">
113 <view class="font24r">已被领取</view> 113 <view class="font24r">已被领取</view>
114 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 114 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 <!-- 优惠券 --> 111 <!-- 优惠券 -->
112 <view class="regionItem couponBoxWrap" wx:if="{{activeTitle == '1'}}"> 112 <view class="regionItem couponBoxWrap" wx:if="{{activeTitle == '1'}}">
113 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 113 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
114 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 114 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
115 <view class="preferentialItems"> 115 <view class="preferentialItems">
116 <view class="purchase"> 116 <view class="purchase">
117 <view class="priceText" wx:if="{{item.price}}"> 117 <view class="priceText" wx:if="{{item.price}}">
@@ -145,7 +145,7 @@ @@ -145,7 +145,7 @@
145 <view class="font24r couponBtn">立即抢购</view> 145 <view class="font24r couponBtn">立即抢购</view>
146 </view> 146 </view>
147 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 147 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
148 - <view class="font24r orderingFood">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 148 + <view class="font24r orderingFood">已领取</view>
149 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 149 <view class="grantNum" wx:if="{{item.receiveNumText}}">
150 <view class="font24r">已被领取</view> 150 <view class="font24r">已被领取</view>
151 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 151 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 <block wx:if="{{modalType == '1'}}"> 155 <block wx:if="{{modalType == '1'}}">
156 <view class="regionItem couponBoxWrap" slot="modalContent"> 156 <view class="regionItem couponBoxWrap" slot="modalContent">
157 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 157 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
158 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 158 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
159 <view class="preferentialItems"> 159 <view class="preferentialItems">
160 <view class="purchase"> 160 <view class="purchase">
161 <view class="priceText" wx:if="{{item.price}}"> 161 <view class="priceText" wx:if="{{item.price}}">
@@ -189,7 +189,7 @@ @@ -189,7 +189,7 @@
189 <view class="font24r couponBtn">立即抢购</view> 189 <view class="font24r couponBtn">立即抢购</view>
190 </view> 190 </view>
191 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 191 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
192 - <view class="font24r orderingFood">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 192 + <view class="font24r orderingFood">已领取</view>
193 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 193 <view class="grantNum" wx:if="{{item.receiveNumText}}">
194 <view class="font24r">已被领取</view> 194 <view class="font24r">已被领取</view>
195 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 195 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -86,11 +86,11 @@ @@ -86,11 +86,11 @@
86 </block> 86 </block>
87 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 87 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
88 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 88 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
89 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 89 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
90 <view class="preferentialItems"> 90 <view class="preferentialItems">
91 <view class="itemLeft"> 91 <view class="itemLeft">
92 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 92 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
93 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 93 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
94 <view class="priceText" wx:if="{{item.price}}"> 94 <view class="priceText" wx:if="{{item.price}}">
95 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 95 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
96 </view> 96 </view>
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </block> 119 </block>
120 </view> 120 </view>
121 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 121 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
122 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 122 + <view class="font24r orderingFood orderingFood1">已领取</view>
123 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 123 <view class="grantNum" wx:if="{{item.receiveNumText}}">
124 <view class="font24r">已被领取</view> 124 <view class="font24r">已被领取</view>
125 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 125 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -424,18 +424,26 @@ @@ -424,18 +424,26 @@
424 424
425 .discountText1{ 425 .discountText1{
426 text-align: center; 426 text-align: center;
427 - color: #FD4D59;  
428 - border: 2rpx solid #FD4D59;  
429 border-radius: 6rpx; 427 border-radius: 6rpx;
430 font-family: PingFang SC; 428 font-family: PingFang SC;
431 background: transparent; 429 background: transparent;
432 width: max-content; 430 width: max-content;
433 - padding: 0 6rpx; 431 + padding: 2rpx 8rpx;
434 position: absolute; 432 position: absolute;
435 left: 16rpx; 433 left: 16rpx;
436 top: 12rpx; 434 top: 12rpx;
437 } 435 }
438 436
  437 +.discountText2{
  438 + background: #FD4D59;
  439 + color: #fff;
  440 +}
  441 +
  442 +.discountText3{
  443 + color: #FD4D59;
  444 + border: 2rpx solid #FD4D59;
  445 +}
  446 +
439 .famousChefBox .labelBox, 447 .famousChefBox .labelBox,
440 .stopBox .labelBox { 448 .stopBox .labelBox {
441 border-bottom: none; 449 border-bottom: none;
@@ -92,11 +92,11 @@ @@ -92,11 +92,11 @@
92 </view> 92 </view>
93 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 93 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
94 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 94 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
95 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 95 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
96 <view class="preferentialItems"> 96 <view class="preferentialItems">
97 <view class="itemLeft"> 97 <view class="itemLeft">
98 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 98 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
99 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 99 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
100 <view class="priceText" wx:if="{{item.price}}"> 100 <view class="priceText" wx:if="{{item.price}}">
101 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 101 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
102 </view> 102 </view>
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 </block> 125 </block>
126 </view> 126 </view>
127 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 127 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
128 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 128 + <view class="font24r orderingFood orderingFood1">已领取</view>
129 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 129 <view class="grantNum" wx:if="{{item.receiveNumText}}">
130 <view class="font24r">已被领取</view> 130 <view class="font24r">已被领取</view>
131 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 131 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -452,18 +452,26 @@ @@ -452,18 +452,26 @@
452 452
453 .discountText1{ 453 .discountText1{
454 text-align: center; 454 text-align: center;
455 - color: #FD4D59;  
456 - border: 2rpx solid #FD4D59;  
457 border-radius: 6rpx; 455 border-radius: 6rpx;
458 font-family: PingFang SC; 456 font-family: PingFang SC;
459 background: transparent; 457 background: transparent;
460 width: max-content; 458 width: max-content;
461 - padding: 0 6rpx; 459 + padding: 2rpx 8rpx;
462 position: absolute; 460 position: absolute;
463 left: 16rpx; 461 left: 16rpx;
464 top: 12rpx; 462 top: 12rpx;
465 } 463 }
466 464
  465 +.discountText2{
  466 + background: #FD4D59;
  467 + color: #fff;
  468 +}
  469 +
  470 +.discountText3{
  471 + color: #FD4D59;
  472 + border: 2rpx solid #FD4D59;
  473 +}
  474 +
467 .famousChefBox .labelBox, 475 .famousChefBox .labelBox,
468 .stopBox .labelBox { 476 .stopBox .labelBox {
469 border-bottom: none; 477 border-bottom: none;
@@ -75,11 +75,11 @@ @@ -75,11 +75,11 @@
75 </view> 75 </view>
76 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 76 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
77 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 77 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
78 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 78 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
79 <view class="preferentialItems"> 79 <view class="preferentialItems">
80 <view class="itemLeft"> 80 <view class="itemLeft">
81 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 81 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
82 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 82 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
83 <view class="priceText" wx:if="{{item.price}}"> 83 <view class="priceText" wx:if="{{item.price}}">
84 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 84 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
85 </view> 85 </view>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 </block> 108 </block>
109 </view> 109 </view>
110 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 110 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
111 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 111 + <view class="font24r orderingFood orderingFood1">已领取</view>
112 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 112 <view class="grantNum" wx:if="{{item.receiveNumText}}">
113 <view class="font24r">已被领取</view> 113 <view class="font24r">已被领取</view>
114 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 114 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -442,18 +442,26 @@ @@ -442,18 +442,26 @@
442 442
443 .discountText1{ 443 .discountText1{
444 text-align: center; 444 text-align: center;
445 - color: #FD4D59;  
446 - border: 2rpx solid #FD4D59;  
447 border-radius: 6rpx; 445 border-radius: 6rpx;
448 font-family: PingFang SC; 446 font-family: PingFang SC;
449 background: transparent; 447 background: transparent;
450 width: max-content; 448 width: max-content;
451 - padding: 0 6rpx; 449 + padding: 2rpx 8rpx;
452 position: absolute; 450 position: absolute;
453 left: 16rpx; 451 left: 16rpx;
454 top: 12rpx; 452 top: 12rpx;
455 } 453 }
456 454
  455 +.discountText2{
  456 + background: #FD4D59;
  457 + color: #fff;
  458 +}
  459 +
  460 +.discountText3{
  461 + color: #FD4D59;
  462 + border: 2rpx solid #FD4D59;
  463 +}
  464 +
457 .famousChefBox .labelBox, 465 .famousChefBox .labelBox,
458 .stopBox .labelBox { 466 .stopBox .labelBox {
459 border-bottom: none; 467 border-bottom: none;
@@ -73,11 +73,11 @@ @@ -73,11 +73,11 @@
73 </view> 73 </view>
74 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 74 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
75 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 75 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
76 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 76 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
77 <view class="preferentialItems"> 77 <view class="preferentialItems">
78 <view class="itemLeft"> 78 <view class="itemLeft">
79 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 79 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
80 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 80 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
81 <view class="priceText" wx:if="{{item.price}}"> 81 <view class="priceText" wx:if="{{item.price}}">
82 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 82 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
83 </view> 83 </view>
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 </block> 106 </block>
107 </view> 107 </view>
108 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 108 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
109 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 109 + <view class="font24r orderingFood orderingFood1">已领取</view>
110 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 110 <view class="grantNum" wx:if="{{item.receiveNumText}}">
111 <view class="font24r">已被领取</view> 111 <view class="font24r">已被领取</view>
112 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 112 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -441,18 +441,26 @@ @@ -441,18 +441,26 @@
441 441
442 .discountText1{ 442 .discountText1{
443 text-align: center; 443 text-align: center;
444 - color: #FD4D59;  
445 - border: 2rpx solid #FD4D59;  
446 border-radius: 6rpx; 444 border-radius: 6rpx;
447 font-family: PingFang SC; 445 font-family: PingFang SC;
448 background: transparent; 446 background: transparent;
449 width: max-content; 447 width: max-content;
450 - padding: 0 6rpx; 448 + padding: 2rpx 8rpx;
451 position: absolute; 449 position: absolute;
452 left: 16rpx; 450 left: 16rpx;
453 top: 12rpx; 451 top: 12rpx;
454 } 452 }
455 453
  454 +.discountText2{
  455 + background: #FD4D59;
  456 + color: #fff;
  457 +}
  458 +
  459 +.discountText3{
  460 + color: #FD4D59;
  461 + border: 2rpx solid #FD4D59;
  462 +}
  463 +
456 .famousChefBox .labelBox, 464 .famousChefBox .labelBox,
457 .stopBox .labelBox { 465 .stopBox .labelBox {
458 border-bottom: none; 466 border-bottom: none;
@@ -95,11 +95,11 @@ @@ -95,11 +95,11 @@
95 </view> 95 </view>
96 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 96 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
97 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 97 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
98 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 98 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
99 <view class="preferentialItems"> 99 <view class="preferentialItems">
100 <view class="itemLeft"> 100 <view class="itemLeft">
101 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 101 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
102 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 102 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
103 <view class="priceText" wx:if="{{item.price}}"> 103 <view class="priceText" wx:if="{{item.price}}">
104 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 104 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
105 </view> 105 </view>
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 </block> 128 </block>
129 </view> 129 </view>
130 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 130 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
131 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 131 + <view class="font24r orderingFood orderingFood1">已领取</view>
132 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 132 <view class="grantNum" wx:if="{{item.receiveNumText}}">
133 <view class="font24r">已被领取</view> 133 <view class="font24r">已被领取</view>
134 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 134 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -605,18 +605,25 @@ @@ -605,18 +605,25 @@
605 605
606 .preferentialItems .discountText1{ 606 .preferentialItems .discountText1{
607 text-align: center; 607 text-align: center;
608 - color: #FD4D59;  
609 - border: 2rpx solid #FD4D59;  
610 border-radius: 6rpx; 608 border-radius: 6rpx;
611 font-family: PingFang SC; 609 font-family: PingFang SC;
612 - background: transparent;  
613 width: max-content; 610 width: max-content;
614 - padding: 0 6rpx; 611 + padding: 2rpx 8rpx;
615 position: absolute; 612 position: absolute;
616 left: 16rpx; 613 left: 16rpx;
617 top: 12rpx; 614 top: 12rpx;
618 } 615 }
619 616
  617 +.discountText2{
  618 + background: #FD4D59;
  619 + color: #fff;
  620 +}
  621 +
  622 +.discountText3{
  623 + color: #FD4D59;
  624 + border: 2rpx solid #FD4D59;
  625 +}
  626 +
620 .preferentialItems .itemRight { 627 .preferentialItems .itemRight {
621 width: 70%; 628 width: 70%;
622 padding-right: 10rpx; 629 padding-right: 10rpx;
@@ -88,11 +88,11 @@ @@ -88,11 +88,11 @@
88 </view> 88 </view>
89 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 89 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
90 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 90 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
91 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 91 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
92 <view class="preferentialItems"> 92 <view class="preferentialItems">
93 <view class="itemLeft"> 93 <view class="itemLeft">
94 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 94 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
95 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 95 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
96 <view class="priceText" wx:if="{{item.price}}"> 96 <view class="priceText" wx:if="{{item.price}}">
97 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 97 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
98 </view> 98 </view>
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 </block> 121 </block>
122 </view> 122 </view>
123 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 123 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
124 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 124 + <view class="font24r orderingFood orderingFood1">已领取</view>
125 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 125 <view class="grantNum" wx:if="{{item.receiveNumText}}">
126 <view class="font24r">已被领取</view> 126 <view class="font24r">已被领取</view>
127 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 127 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -445,18 +445,26 @@ @@ -445,18 +445,26 @@
445 445
446 .discountText1{ 446 .discountText1{
447 text-align: center; 447 text-align: center;
448 - color: #FD4D59;  
449 - border: 2rpx solid #FD4D59;  
450 border-radius: 6rpx; 448 border-radius: 6rpx;
451 font-family: PingFang SC; 449 font-family: PingFang SC;
452 background: transparent; 450 background: transparent;
453 width: max-content; 451 width: max-content;
454 - padding: 0 6rpx; 452 + padding: 2rpx 8rpx;
455 position: absolute; 453 position: absolute;
456 left: 16rpx; 454 left: 16rpx;
457 top: 12rpx; 455 top: 12rpx;
458 } 456 }
459 457
  458 +.discountText2{
  459 + background: #FD4D59;
  460 + color: #fff;
  461 +}
  462 +
  463 +.discountText3{
  464 + color: #FD4D59;
  465 + border: 2rpx solid #FD4D59;
  466 +}
  467 +
460 .famousChefBox .labelBox, 468 .famousChefBox .labelBox,
461 .stopBox .labelBox { 469 .stopBox .labelBox {
462 border-bottom: none; 470 border-bottom: none;
@@ -85,11 +85,11 @@ @@ -85,11 +85,11 @@
85 </view> 85 </view>
86 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 86 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
87 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 87 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
88 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 88 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
89 <view class="preferentialItems"> 89 <view class="preferentialItems">
90 <view class="itemLeft"> 90 <view class="itemLeft">
91 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 91 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
92 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 92 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
93 <view class="priceText" wx:if="{{item.price}}"> 93 <view class="priceText" wx:if="{{item.price}}">
94 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 94 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
95 </view> 95 </view>
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 </block> 118 </block>
119 </view> 119 </view>
120 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 120 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
121 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 121 + <view class="font24r orderingFood orderingFood1">已领取</view>
122 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 122 <view class="grantNum" wx:if="{{item.receiveNumText}}">
123 <view class="font24r">已被领取</view> 123 <view class="font24r">已被领取</view>
124 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 124 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -440,18 +440,26 @@ @@ -440,18 +440,26 @@
440 440
441 .discountText1{ 441 .discountText1{
442 text-align: center; 442 text-align: center;
443 - color: #FD4D59;  
444 - border: 2rpx solid #FD4D59;  
445 border-radius: 6rpx; 443 border-radius: 6rpx;
446 font-family: PingFang SC; 444 font-family: PingFang SC;
447 background: transparent; 445 background: transparent;
448 width: max-content; 446 width: max-content;
449 - padding: 0 6rpx; 447 + padding: 2rpx 8rpx;
450 position: absolute; 448 position: absolute;
451 left: 16rpx; 449 left: 16rpx;
452 top: 12rpx; 450 top: 12rpx;
453 } 451 }
454 452
  453 +.discountText2{
  454 + background: #FD4D59;
  455 + color: #fff;
  456 +}
  457 +
  458 +.discountText3{
  459 + color: #FD4D59;
  460 + border: 2rpx solid #FD4D59;
  461 +}
  462 +
455 .famousChefBox .labelBox, 463 .famousChefBox .labelBox,
456 .stopBox .labelBox { 464 .stopBox .labelBox {
457 border-bottom: none; 465 border-bottom: none;
@@ -90,11 +90,11 @@ @@ -90,11 +90,11 @@
90 </view> 90 </view>
91 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 91 <view class="preferentialCoupon" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
92 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 92 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
93 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 93 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
94 <view class="preferentialItems"> 94 <view class="preferentialItems">
95 <view class="itemLeft"> 95 <view class="itemLeft">
96 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 96 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
97 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 97 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
98 <view class="priceText" wx:if="{{item.price}}"> 98 <view class="priceText" wx:if="{{item.price}}">
99 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 99 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
100 </view> 100 </view>
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </block> 123 </block>
124 </view> 124 </view>
125 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 125 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
126 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 126 + <view class="font24r orderingFood orderingFood1">已领取</view>
127 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 127 <view class="grantNum" wx:if="{{item.receiveNumText}}">
128 <view class="font24r">已被领取</view> 128 <view class="font24r">已被领取</view>
129 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 129 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -381,18 +381,26 @@ @@ -381,18 +381,26 @@
381 381
382 .discountText1{ 382 .discountText1{
383 text-align: center; 383 text-align: center;
384 - color: #FD4D59;  
385 - border: 2rpx solid #FD4D59;  
386 border-radius: 6rpx; 384 border-radius: 6rpx;
387 font-family: PingFang SC; 385 font-family: PingFang SC;
388 background: transparent; 386 background: transparent;
389 width: max-content; 387 width: max-content;
390 - padding: 0 6rpx; 388 + padding: 2rpx 8rpx;
391 position: absolute; 389 position: absolute;
392 left: 16rpx; 390 left: 16rpx;
393 top: 12rpx; 391 top: 12rpx;
394 } 392 }
395 393
  394 +.discountText2{
  395 + background: #FD4D59;
  396 + color: #fff;
  397 +}
  398 +
  399 +.discountText3{
  400 + color: #FD4D59;
  401 + border: 2rpx solid #FD4D59;
  402 +}
  403 +
396 .priceText { 404 .priceText {
397 font-family: 'Abel'; 405 font-family: 'Abel';
398 color: #E34D59; 406 color: #E34D59;
@@ -6,11 +6,11 @@ @@ -6,11 +6,11 @@
6 <view class="sign"></view><text class="font32r">专属优惠券</text> 6 <view class="sign"></view><text class="font32r">专属优惠券</text>
7 </view> 7 </view>
8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 8 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
9 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover"> 9 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.name}}&use={{item.stringifyUse}}&sid={{seller.sid}}&oid={{options.id}}&types=1&StyleType={{StyleType}}" hover-class="navigator-hover">
10 <view class="couponWrap"> 10 <view class="couponWrap">
11 <view class="itemLeft"> 11 <view class="itemLeft">
12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 12 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
13 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 13 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
14 <view class="priceText" wx:if="{{item.price}}"> 14 <view class="priceText" wx:if="{{item.price}}">
15 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 15 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
16 </view> 16 </view>
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 </block> 39 </block>
40 </view> 40 </view>
41 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 41 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
42 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 42 + <view class="font24r orderingFood orderingFood1">已领取</view>
43 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 43 <view class="grantNum" wx:if="{{item.receiveNumText}}">
44 <view class="font24r">已被领取</view> 44 <view class="font24r">已被领取</view>
45 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 45 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -159,18 +159,25 @@ page { @@ -159,18 +159,25 @@ page {
159 159
160 .couponWrap .discountText1{ 160 .couponWrap .discountText1{
161 text-align: center; 161 text-align: center;
162 - color: #FD4D59;  
163 - border: 2rpx solid #FD4D59;  
164 border-radius: 6rpx; 162 border-radius: 6rpx;
165 font-family: PingFang SC; 163 font-family: PingFang SC;
166 - background: transparent;  
167 width: max-content; 164 width: max-content;
168 - padding: 0 6rpx; 165 + padding: 2rpx 8rpx;
169 position: absolute; 166 position: absolute;
170 left: 16rpx; 167 left: 16rpx;
171 top: 12rpx; 168 top: 12rpx;
172 } 169 }
173 170
  171 +.discountText2{
  172 + background: #FD4D59;
  173 + color: #fff;
  174 +}
  175 +
  176 +.discountText3{
  177 + color: #FD4D59;
  178 + border: 2rpx solid #FD4D59;
  179 +}
  180 +
174 .itemLeft { 181 .itemLeft {
175 width: 30%; 182 width: 30%;
176 display: flex; 183 display: flex;
@@ -357,7 +357,7 @@ Page({ @@ -357,7 +357,7 @@ Page({
357 let str = arr.flatMap(item => Array(item.number).fill(item.id)).join(','); 357 let str = arr.flatMap(item => Array(item.number).fill(item.id)).join(',');
358 App.Activity.ActivityListByOpenid({ 358 App.Activity.ActivityListByOpenid({
359 aid: str, 359 aid: str,
360 - sellerid:this.data.seller.sid, 360 + sellerid:this.data.sid,
361 }).then(res => { 361 }).then(res => {
362 if (res.ret == 200) { 362 if (res.ret == 200) {
363 let couponArr = []; 363 let couponArr = [];
@@ -21,11 +21,11 @@ @@ -21,11 +21,11 @@
21 </view> 21 </view>
22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}"> 22 <view class="preferential" wx:if="{{hasValueCertificate && marketing && coupon_dataList.length>0}}">
23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 23 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
24 - <navigator url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover"> 24 + <navigator wx:if="{{item.resultCoupon == '1'}}" url="/pack-activity/pack/{{item.is_type == '3'?'receiveCoupon':'buyCoupon'}}?id={{item.id}}&name={{seller.sellName}}&use={{item.stringifyUse}}&sid={{sid}}&types=3&StyleType={{StyleType}}" hover-class="navigator-hover">
25 <view class="couponWrap"> 25 <view class="couponWrap">
26 <view class="itemLeft"> 26 <view class="itemLeft">
27 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text> 27 <text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
28 - <view class="discountText1 font20r" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view> 28 + <view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
29 <view class="priceText" wx:if="{{item.price}}"> 29 <view class="priceText" wx:if="{{item.price}}">
30 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text> 30 <view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
31 </view> 31 </view>
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 </block> 54 </block>
55 </view> 55 </view>
56 <view class="btnBox" wx:if="{{item.is_type == '3'}}" > 56 <view class="btnBox" wx:if="{{item.is_type == '3'}}" >
57 - <view class="font24r orderingFood orderingFood1">{{item.resultCoupon == '1'?'已领取':'立即领取'}}</view> 57 + <view class="font24r orderingFood orderingFood1">已领取</view>
58 <view class="grantNum" wx:if="{{item.receiveNumText}}"> 58 <view class="grantNum" wx:if="{{item.receiveNumText}}">
59 <view class="font24r">已被领取</view> 59 <view class="font24r">已被领取</view>
60 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view> 60 <view class="font24r"><text>{{item.receiveNumText}}</text>张</view>
@@ -460,18 +460,25 @@ @@ -460,18 +460,25 @@
460 460
461 .couponWrap .discountText1{ 461 .couponWrap .discountText1{
462 text-align: center; 462 text-align: center;
463 - color: #FD4D59;  
464 - border: 2rpx solid #FD4D59;  
465 border-radius: 6rpx; 463 border-radius: 6rpx;
466 font-family: PingFang SC; 464 font-family: PingFang SC;
467 - background: transparent;  
468 width: max-content; 465 width: max-content;
469 - padding: 0 6rpx; 466 + padding: 2rpx 8rpx;
470 position: absolute; 467 position: absolute;
471 left: 16rpx; 468 left: 16rpx;
472 top: 12rpx; 469 top: 12rpx;
473 } 470 }
474 471
  472 +.discountText2{
  473 + background: #FD4D59;
  474 + color: #fff;
  475 +}
  476 +
  477 +.discountText3{
  478 + color: #FD4D59;
  479 + border: 2rpx solid #FD4D59;
  480 +}
  481 +
475 #couponModal .titleModal { 482 #couponModal .titleModal {
476 margin-top: 30%; 483 margin-top: 30%;
477 position: relative; 484 position: relative;