xt / xcx-book · Commits

Go to a project

Commit 171dd35c78da35554124bf7a09441c5e230cabd2

Authored by pengye
1 parent 696a835c
build: skipped

付款页券的有效期根据根据券可在几天内使用判断

Inline Side-by-side
Showing 2 changed files with 32 additions and 9 deletions
... ... @@ -60,9 +60,7 @@ Page({
sellerid: this.sid
}).then(res => {
if (res.ret == 200 && res.data && res.data.length > 0) {
let list = res.data.filter(item => {
return this.data.dataStr < (item.etime * 1)
})
let list = res.data
// console.log('listlistlist',JSON.stringify(list));
// list= monidata
list.forEach(detail => {
... ... @@ -82,8 +80,32 @@ Page({
}
detail.checked = false;
detail.showCpupon = '0';
detail.cdateText = util.unixtoTime(detail.cdate, 'YYYY-MM-DD')
detail.endDateStr = util.unixtoTime(detail.stime, 'YYYY-MM-DD') + '至' + util.unixtoTime(detail.etime, 'YYYY-MM-DD')
let cdateText = ''; //有效期开始时间（如果领取当天可用，领取之日， 否则就是次日）
let edateText = ''; //有效期截止时间（领取日期+领取后几天有效的日期）
let date = new Date(detail.cdate * 1000);
if (detail.arule.is_same_day != '1') {
date.setDate(date.getDate() + 1);
}
date.setHours(0, 0, 0, 0);
let newTimestamp = Math.floor(date.getTime() / 1000);
cdateText = util.unixtoTime(newTimestamp, 'YYYY-MM-DD HH:II')
detail.cdateText = cdateText;
if (detail.aexpiration == '0' || detail.aexpiration == '') {
edateText = util.unixtoTime(detail.etime, 'YYYY-MM-DD HH:II')
detail.deadlineDate = detail.etime
} else {
let time = new Date(detail.cdate * 1000);
time.setDate(time.getDate() + parseInt(detail.aexpiration));
time.setHours(23, 59, 0, 0);
let deadlineDate = Math.floor(time.getTime() / 1000);
detail.deadlineDate = deadlineDate
edateText = util.unixtoTime(deadlineDate, 'YYYY-MM-DD HH:II')
}
detail.endDateStr = cdateText + '至' + edateText
})
// 筛选出当前时间 > 领取日期+领取后几天有效的日期
list = list.filter(item => {
return this.data.dataStr < (item.deadlineDate * 1)
})
list.sort((a, b) => {
return (a.etime * 1) - (b.etime * 1)
... ... @@ -319,6 +341,7 @@ Page({
} else {
endUseDate.setDate(couponDate.getDate() + parseInt(coupon.aexpiration));
}
endUseDate.setHours(23, 59, 59, 999);
// 今天不是领取当日，但在有效天数内 && 今天是领取当日且可用 && 券是开启状态
const isUseDate = (currentDate > startUseDate && currentDate < endUseDate) && coupon.is_open == '1'
let selectedValue = true;
... ... @@ -362,10 +385,7 @@ Page({
availableDate = false
}
coupon.isOk = isUseDate && (availableDate || coupon.exp_date.week_show == '无') ? '1' : '0'; //是否在可用时间内 1可使用 2不可使用
endUseDate.setHours(23, 59, 59, 999); // 设置时间为23:59:59.999
const timestamp = Math.floor(endUseDate.getTime() / 1000);
let c = coupon.etime * 1
coupon.expirationDate = Math.min(timestamp, c);
coupon.expirationDate = coupon.deadlineDate;
});
return list
},
... ...
... ... @@ -46,6 +46,9 @@
</view>
<view wx:if="{{item.endDateStr}}" class="font20r bottomTitle">有效日期：<view class="bottom font20r">{{item.endDateStr}}</view>
</view>
<!-- <view class="font20r bottom">{{item.arule.is_same_day=='1'?'领取当日可用':'领取当日不可用'}}</view>
<view wx:if="{{item.aexpiration>0}}" class="font20r bottom">领取后{{item.aexpiration}}天内使用</view>
<view wx:if="{{item.cdateText}}" class="font20r bottom">领取日期：{{item.cdateText}}</view> -->
<view wx:if="{{item.noonText || item.noonText}}" class="font20r bottomTitle"><text>不可使用：</text><view wx:if="{{item.noonText}}" class="bottom font20r">{{item.noonText}}</view>
</view>
<view wx:if="{{item.nigText}}" class="bottom font20r nodate">{{item.nigText}}</view>
... ...