xt / xcx-book · Commits

Go to a project

Commit acf47e3035be5a0f625295b59158986f250c2995

Authored by pengye
1 parent 5fa9edd1
build: skipped

邀请函、商家详情、商家有礼优惠券样式修改

Inline Side-by-side
Showing 33 changed files with 172 additions and 93 deletions
... ... @@ -1005,9 +1005,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -1060,9 +1060,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -1075,9 +1075,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -948,9 +948,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -92,16 +92,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -282,7 +282,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -339,7 +339,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -347,6 +347,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .btns text {
... ...
... ... @@ -903,9 +903,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -98,16 +98,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -309,7 +309,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -366,7 +366,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -374,6 +374,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .btns text {
... ...
... ... @@ -904,9 +904,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -81,16 +81,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -299,7 +299,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -356,7 +356,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -364,6 +364,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .btns text {
... ...
... ... @@ -902,9 +902,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -79,16 +79,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -298,7 +298,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -355,7 +355,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -363,6 +363,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .btns text {
... ...
... ... @@ -859,9 +859,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -101,16 +101,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -501,7 +501,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -558,7 +558,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -566,6 +566,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialItems .priceText .icons {
... ...
... ... @@ -903,9 +903,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -94,16 +94,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -292,7 +292,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -349,7 +349,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -357,6 +357,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .btns text {
... ...
... ... @@ -902,9 +902,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -91,16 +91,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -300,7 +300,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -357,7 +357,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -365,6 +365,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.preferentialCoupon .bottom {
... ...
... ... @@ -936,9 +936,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ... @@ -1147,7 +1152,6 @@ Page({
},
// 计算免费券有效期的起始、结束日期
setTimeRange(cdate, startOffset, endOffset) {
console.log(cdate, startOffset, endOffset);
const startDate = new Date((cdate + startOffset * 86400) * 1000);
startDate.setHours(0, 0, 0, 0);
const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD');
... ...
... ... @@ -96,16 +96,16 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<view wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</view>
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
无限制{{item.desc?'，'+item.desc+'。':'。'}}
</view>
... ...
... ... @@ -453,7 +453,7 @@
}
.preferentialCoupon .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -510,7 +510,7 @@
margin-right: 10rpx;
}
.preferentialCoupon .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -518,6 +518,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.bottom {
... ...
... ... @@ -213,9 +213,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -12,14 +12,14 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
... ...
... ... @@ -79,7 +79,7 @@ page {
}
.couponWrap .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -141,7 +141,7 @@ page {
margin-right: 10rpx;
}
.couponWrap .btns text {
.preferentialCoupon .btns .anameText {
font-weight: 600;
}
... ... @@ -149,12 +149,13 @@ page {
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.couponWrap .itemLeft {
background: transparent;
}
.couponWrap .discountText {
background: #F6231B;
background: #FD4D59;
}
.couponWrap .discountText1{
... ... @@ -200,7 +201,13 @@ page {
justify-content: center;
}
.priceText .icons {
.couponWrap .priceText .icons {
margin-left: 18rpx;
color: #E34D59;
font-size: 20rpx;
}
.preferentialItems .priceText .icons {
font-family: 'Abel';
color: #fff;
font-size: 40rpx;
... ...
... ... @@ -247,9 +247,14 @@ Page({
if (res.data.length > 0) {
// valid_forever 1永久 0非永久
let list = res.data.filter(item => {
let data = item.expiration_date ? util.determine(item.expiration_date) : '';
return ((data.valid_forever == '0' && this.data.dataStr < (data.etime * 1)) || data.valid_forever == '1') && item.is_open == '1'
})
let data = item.expiration_date ? util.determine(item.expiration_date) : {};
let validForever = data.valid_forever === '1';
let isValid = item.is_type === '3' ?
(validForever || (data.valid_forever === '0' && this.data.dataStr < (data.etime * 1))) :
(this.data.dataStr < (item.etime * 1));
return isValid && item.is_open === '1';
});
list.forEach(detail => {
detail.stringifyUse = detail.use ? JSON.stringify(detail.use) : '';
detail.exp_date = detail.exp_date ? util.determine(detail.exp_date) : '';
... ...
... ... @@ -27,14 +27,14 @@
<text wx:if="{{item.discount!='0.00' && (item.use.is_cash=='1' || item.use.is_cash) && item.discount}}" class="discountText font24r">{{item.discount}}折</text>
<view class="discountText1 font20r {{item.arule.is_accumulation == '1'?'discountText2':'discountText3'}}" wx:if="{{item.is_type == '3'}}">{{item.arule.is_accumulation == '1' ? '可' : '不可'}}叠加</view>
<view class="priceText" wx:if="{{item.price}}">
<view class="icons font24r">￥</view><text class="font40r">{{item.price}}</text>
<view class="icons font24r">￥</view><text class="font48r">{{item.price}}</text>
</view>
<view class="icons font20r" wx:if="{{item.is_type == '3' && item.desc!='0'}}">消费满{{item.desc}}元可用</view>
</view>
<view class="couponLine"></view>
<view class="itemRight">
<view class="btns">
<text class="font40r">{{item.aname}}</text>
<text class="font32r anameText">{{item.aname}}</text>
<block wx:if="{{item.is_type == '1' || item.is_type == '2'}}">
<text wx:if="{{item.exp_date.is_week=='1' || item.exp_date.is_week===true}}" class="bottom font24r">{{item.exp_date.week_show?item.exp_date.week_show+'可用':''}}{{item.desc?'，'+item.desc+'。':'。'}}</text>
<view wx:if="{{item.exp_date.is_none=='1' || item.exp_date.is_none===true}}" class="bottom font24r">
... ...
... ... @@ -278,7 +278,7 @@
text-align: center;
color: #fff;
border-radius: 32rpx;
margin: 20rpx 0;
margin: 10rpx 0;
line-height: 44rpx;
height: 44rpx;
background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
... ... @@ -349,7 +349,7 @@
}
.couponWrap .bottom {
margin-top: 10rpx;
margin-top: 4rpx;
width: 100%;
color: #C36607;
font-family: PingFang SC;
... ... @@ -372,7 +372,7 @@
}
.couponWrap .couponLine{
margin: 24rpx 0;
margin: 24rpx 0 4rpx 0;
border-right: 2rpx dashed #f6231b;
}
... ... @@ -427,7 +427,6 @@
flex-direction: column;
align-items: center;
color: #C36607;
margin-top: 10rpx;
}
.couponWrap .grantNum text {
... ... @@ -435,7 +434,7 @@
margin-right: 10rpx;
}
.couponWrap .btns text {
.couponWrap .btns .anameText {
font-weight: 600;
}
... ... @@ -443,6 +442,7 @@
border: 2rpx solid #fa4b20 !important;
background: transparent !important;
color: #fa4b20 !important;
font-weight: 600;
}
.couponWrap .discountText {
... ...