xt / xcx-book · Commits

Go to a project

Commit 9bf8fd3a4aeac81ade71df935e09ec7cf0d92c6e

Authored by pengye
1 parent 7f2fc563

挂机短信页、邀请函显示的优惠券判断是否停用

Inline Side-by-side
Showing 9 changed files with 25 additions and 17 deletions
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 </view> 74 </view>
75 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 75 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
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 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 77 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
78 <view class="itemsLeft"> 78 <view class="itemsLeft">
79 <view class="itemTop"> 79 <view class="itemTop">
80 <text class="font28r">{{item.aname}}</text> 80 <text class="font28r">{{item.aname}}</text>
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 </view> 82 </view>
83 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 83 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
84 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 84 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
85 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 85 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
86 <view class="itemLeft"> 86 <view class="itemLeft">
87 <view class="itemTop"> 87 <view class="itemTop">
88 <text class="font28r">{{item.aname}}</text> 88 <text class="font28r">{{item.aname}}</text>
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </view> 61 </view>
62 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 62 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
63 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 63 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
64 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 64 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
65 <view class="itemsLeft"> 65 <view class="itemsLeft">
66 <view class="top"> 66 <view class="top">
67 <text class="font28r">{{item.aname}}</text> 67 <text class="font28r">{{item.aname}}</text>
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 </view> 58 </view>
59 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 59 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
60 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 60 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
61 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 61 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
62 <view class="itemsLeft"> 62 <view class="itemsLeft">
63 <view class="top"> 63 <view class="top">
64 <text class="font28r">{{item.aname}}</text> 64 <text class="font28r">{{item.aname}}</text>
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </view> 81 </view>
82 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 82 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
83 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 83 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
84 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 84 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
85 <view class="left"> 85 <view class="left">
86 <view class="top"> 86 <view class="top">
87 <text class="font28r">{{item.aname}}</text> 87 <text class="font28r">{{item.aname}}</text>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </view> 76 </view>
77 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 77 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
78 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 78 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
79 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 79 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
80 <view class="itemLeft"> 80 <view class="itemLeft">
81 <view class="itemTop"> 81 <view class="itemTop">
82 <text class="font28r">{{item.aname}}</text> 82 <text class="font28r">{{item.aname}}</text>
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </view> 63 </view>
64 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 64 <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
65 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index"> 65 <block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
66 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 66 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
67 <view class="itemLeft couponItem"> 67 <view class="itemLeft couponItem">
68 <view class="itemTop"> 68 <view class="itemTop">
69 <text class="font28r">{{item.aname}}</text> 69 <text class="font28r">{{item.aname}}</text>
1 <!--pages/reserve/shopHome.wxml--> 1 <!--pages/reserve/shopHome.wxml-->
2 <nav hasHome class="navhome" backgroundColor="#0143a3" color="#fff" place="{{true}}">{{seller.sellName}}</nav> 2 <nav hasHome class="navhome" backgroundColor="#0143a3" color="#fff" place="{{true}}">{{seller.sellName}}</nav>
3 <view> 3 <view>
4 - <view class="sellBox flex-vc"> 4 + <view class="flex-vc {{home.image?'sellBox':'sellBox sellBox1'}}">
5 <image wx:if="{{home.image}}" class="imgs" src="{{home.image}}" mode="scaleToFill" /> 5 <image wx:if="{{home.image}}" class="imgs" src="{{home.image}}" mode="scaleToFill" />
6 <view class="info flex-vl" style="background:#fff;"> 6 <view class="info flex-vl" style="background:#fff;">
7 <view class="flex-lr"> 7 <view class="flex-lr">
@@ -19,9 +19,9 @@ @@ -19,9 +19,9 @@
19 </view> 19 </view>
20 </view> 20 </view>
21 </view> 21 </view>
22 - <view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}"> 22 + <view class="{{home.image?'preferential':'preferential preferential1'}}" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && 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 - <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}"> 24 + <view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
25 <view class="itemLeft couponItem"> 25 <view class="itemLeft couponItem">
26 <view class="itemTop"> 26 <view class="itemTop">
27 <text class="font28r">{{item.aname}}</text> 27 <text class="font28r">{{item.aname}}</text>
1 /* pages/reserve/shopHome.wxss */ 1 /* pages/reserve/shopHome.wxss */
2 .imgs { 2 .imgs {
3 - height: 562rpx;  
4 width: 100%; 3 width: 100%;
  4 + height: 562rpx;
  5 + position: absolute;
  6 + left: 0;
  7 + top: 0;
5 } 8 }
6 9
7 .my_canvas { 10 .my_canvas {
@@ -12,7 +15,12 @@ @@ -12,7 +15,12 @@
12 .sellBox { 15 .sellBox {
13 width: 100%; 16 width: 100%;
14 position: relative; 17 position: relative;
15 - margin-bottom: 200rpx; 18 + height: 562rpx;
  19 +}
  20 +
  21 +.sellBox1{
  22 + min-height: 330rpx;
  23 + height: auto;
16 } 24 }
17 25
18 .info { 26 .info {
@@ -131,10 +139,6 @@ @@ -131,10 +139,6 @@
131 color: #0143A3; 139 color: #0143A3;
132 } 140 }
133 141
134 -.preferential {  
135 - margin: 20rpx 0;  
136 -}  
137 -  
138 .between { 142 .between {
139 justify-content: space-between; 143 justify-content: space-between;
140 } 144 }
@@ -173,7 +177,11 @@ @@ -173,7 +177,11 @@
173 } 177 }
174 178
175 .preferential { 179 .preferential {
176 - margin: 20rpx 40rpx 0 40rpx; 180 + margin: 228rpx 40rpx 0 40rpx;
  181 +}
  182 +
  183 +.preferential1{
  184 + margin: 130rpx 40rpx 0 40rpx;
177 } 185 }
178 186
179 .rubric1 { 187 .rubric1 {