xt / xcx-book · Commits

Go to a project

Commit 8adcbd2aa711e04d4e5715302c038c195ef0fe38

Authored by pengye
1 parent 89f2cec5
build: skipped

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

Inline Side-by-side
Showing 24 changed files with 24 additions and 13 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 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 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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}}">
@@ -655,6 +655,7 @@ @@ -655,6 +655,7 @@
655 } 655 }
656 656
657 .shareItem { 657 .shareItem {
  658 + padding: 0;
658 margin-right: 0; 659 margin-right: 0;
659 background: #cc9b6a; 660 background: #cc9b6a;
660 color: #fff; 661 color: #fff;
@@ -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 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"> 114 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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}}">
@@ -749,6 +749,7 @@ @@ -749,6 +749,7 @@
749 } 749 }
750 750
751 .shareItem { 751 .shareItem {
  752 + padding: 0;
752 margin-right: 0; 753 margin-right: 0;
753 background: #ae2d2d; 754 background: #ae2d2d;
754 color: #fff; 755 color: #fff;
@@ -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 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"> 158 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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}}">
@@ -766,6 +766,7 @@ @@ -766,6 +766,7 @@
766 } 766 }
767 767
768 .shareItem { 768 .shareItem {
  769 + padding: 0;
769 margin-right: 0; 770 margin-right: 0;
770 background: #D2541C; 771 background: #D2541C;
771 color: #fff; 772 color: #fff;
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
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 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 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -618,6 +618,7 @@ @@ -618,6 +618,7 @@
618 } 618 }
619 619
620 .shareItem { 620 .shareItem {
  621 + padding: 0;
621 margin-right: 0; 622 margin-right: 0;
622 background: #FFEFC5; 623 background: #FFEFC5;
623 color: #0B0805; 624 color: #0B0805;
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
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 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"> 95 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -650,6 +650,7 @@ @@ -650,6 +650,7 @@
650 } 650 }
651 651
652 .shareItem { 652 .shareItem {
  653 + padding: 0;
653 margin-right: 0; 654 margin-right: 0;
654 background: #FFEFC5; 655 background: #FFEFC5;
655 color: #0B0805; 656 color: #0B0805;
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
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 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 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -640,6 +640,7 @@ @@ -640,6 +640,7 @@
640 } 640 }
641 641
642 .shareItem { 642 .shareItem {
  643 + padding: 0;
643 margin-right: 0; 644 margin-right: 0;
644 background: #FFEFC5; 645 background: #FFEFC5;
645 color: #0B0805; 646 color: #0B0805;
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
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 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"> 76 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -639,6 +639,7 @@ @@ -639,6 +639,7 @@
639 } 639 }
640 640
641 .shareItem { 641 .shareItem {
  642 + padding: 0;
642 margin-right: 0; 643 margin-right: 0;
643 background: #FFEFC5; 644 background: #FFEFC5;
644 color: #0B0805; 645 color: #0B0805;
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
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 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"> 98 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -769,6 +769,7 @@ @@ -769,6 +769,7 @@
769 } 769 }
770 770
771 .shareItem { 771 .shareItem {
  772 + padding: 0;
772 margin-right: 0; 773 margin-right: 0;
773 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 774 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
774 color: #fff; 775 color: #fff;
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
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 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"> 91 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -638,6 +638,7 @@ @@ -638,6 +638,7 @@
638 } 638 }
639 639
640 .shareItem { 640 .shareItem {
  641 + padding: 0;
641 margin-right: 0; 642 margin-right: 0;
642 background: #FFEFC5; 643 background: #FFEFC5;
643 color: #0B0805; 644 color: #0B0805;
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
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 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"> 88 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -638,6 +638,7 @@ @@ -638,6 +638,7 @@
638 } 638 }
639 639
640 .shareItem { 640 .shareItem {
  641 + padding: 0;
641 margin-right: 0; 642 margin-right: 0;
642 background: #FFEFC5; 643 background: #FFEFC5;
643 color: #0B0805; 644 color: #0B0805;
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
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 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"> 93 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -634,6 +634,7 @@ @@ -634,6 +634,7 @@
634 } 634 }
635 635
636 .shareItem { 636 .shareItem {
  637 + padding: 0;
637 margin-right: 0; 638 margin-right: 0;
638 background: #FFEFC5; 639 background: #FFEFC5;
639 color: #0B0805; 640 color: #0B0805;
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
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 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"> 9 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
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 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"> 24 + <navigator wx:if="{{item.resultCoupon == '1' || item.is_type != '3'}}" 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>