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 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemsLeft">
<view class="itemTop">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -82,7 +82,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemLeft">
<view class="itemTop">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -61,7 +61,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemsLeft">
<view class="top">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -58,7 +58,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemsLeft">
<view class="top">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -81,7 +81,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="left">
<view class="top">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -76,7 +76,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemLeft">
<view class="itemTop">
<text class="font28r">{{item.aname}}</text>
... ...
... ... @@ -63,7 +63,7 @@
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemLeft couponItem">
<view class="itemTop">
<text class="font28r">{{item.aname}}</text>
... ...
<!--pages/reserve/shopHome.wxml-->
<nav hasHome class="navhome" backgroundColor="#0143a3" color="#fff" place="{{true}}">{{seller.sellName}}</nav>
<view>
<view class="sellBox flex-vc">
<view class="flex-vc {{home.image?'sellBox':'sellBox sellBox1'}}">
<image wx:if="{{home.image}}" class="imgs" src="{{home.image}}" mode="scaleToFill" />
<view class="info flex-vl" style="background:#fff;">
<view class="flex-lr">
... ... @@ -19,9 +19,9 @@
</view>
</view>
</view>
<view class="preferential" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<view class="{{home.image?'preferential':'preferential preferential1'}}" wx:if="{{hasValueCertificate && marketing && marketing.is_coupon=='1' && coupon_dataList.length>0}}">
<block wx:for="{{coupon_dataList}}" wx:key="index" wx:for-index="index">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1)}}">
<view class="preferentialItems" wx:if="{{dataStr<(item.etime*1) && item.status == '1'}}">
<view class="itemLeft couponItem">
<view class="itemTop">
<text class="font28r">{{item.aname}}</text>
... ...
/* pages/reserve/shopHome.wxss */
.imgs {
height: 562rpx;
width: 100%;
height: 562rpx;
position: absolute;
left: 0;
top: 0;
}
.my_canvas {
... ... @@ -12,7 +15,12 @@
.sellBox {
width: 100%;
position: relative;
margin-bottom: 200rpx;
height: 562rpx;
}
.sellBox1{
min-height: 330rpx;
height: auto;
}
.info {
... ... @@ -131,10 +139,6 @@
color: #0143A3;
}
.preferential {
margin: 20rpx 0;
}
.between {
justify-content: space-between;
}
... ... @@ -173,7 +177,11 @@
}
.preferential {
margin: 20rpx 40rpx 0 40rpx;
margin: 228rpx 40rpx 0 40rpx;
}
.preferential1{
margin: 130rpx 40rpx 0 40rpx;
}
.rubric1 {
... ...