Commit 953dbc6137c4769f9ff068dcd4294bbe5bbaaa10

Authored by pengye
1 parent ab41a599

券详情未领取显示使用规则、券列表加有效期显示

... ... @@ -229,25 +229,32 @@ Page({
if (condition.valid_forever === '0' && condition.stime && condition.etime) {
detail.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');
detail.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');
detail.useEtimeStr = useStime + '至' + useEtime;
}
if (condition.valid_forever === '1') {
detail.foreverText = '永久有效';
detail.useEtimeStr = '永久有效';
}
// today 领券当日起天数
if (condition.valid_forever === '0' && condition.today) {
let obj = this.setTimeRange(detail.cdate, 0, parseInt(condition.today)-1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
detail.useEtimeStr = '领取当日起' + condition.today + '天内有效';
}
// tomorrow 领券次日起天数
if (condition.valid_forever === '0' && condition.tomorrow) {
let obj = this.setTimeRange(detail.cdate, 1, condition.tomorrow*1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
detail.useEtimeStr = '领取次日起' + condition.tomorrow + '天内有效';
}
// sday 领券后第几天的开始天数 eday 领券后第几天的结束天数
if (condition.valid_forever === '0' && condition.sday && condition.eday) {
let eday = condition.sday == '1' ? (parseInt(condition.eday)-1) : (parseInt(condition.eday)+1)
let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday)-1, eday);
let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);
detail.useStime = obj.useStime;
detail.useEtime = obj.useEtime;
detail.useEtimeStr = '领取后第' + condition.sday + '天至' + condition.eday + '天可用';
}
if (exp_date && exp_date.week_data) {
let mor = this.hasConsecutiveSelect(exp_date.week_data, '1').rArr.join('、')
... ...
... ... @@ -42,7 +42,14 @@
<text class="font32r">有效期</text>
</view>
<block wx:if="{{detail.is_type == '3'}}">
<view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期:</text>{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}</view>
<view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '0' && detail.useStime && detail.useEtime}}"><text>券有效期:</text>
<block wx:if="{{resultCoupon == '1'}}">
{{detail.useStime}} <text> 至 </text> {{detail.useEtime}}
</block>
<block wx:else>
{{detail.useEtimeStr}}
</block>
</view>
<view class="info font28r" wx:if="{{detail.aexpiration.valid_forever == '1'}}"><text>券有效期:</text> 永久有效</view>
</block>
<block wx:else>
... ...
... ... @@ -4,6 +4,7 @@ Page({
data: {
list:[],
status:1,
dataStr: Date.now() * 1 / 1000,
},
page:1,
size:10,
... ... @@ -30,7 +31,8 @@ Page({
let date=Date.now()*1/1000;
list.forEach(item=>{
item.is_expire='0'
let etime=item.etime*1
let etime=item.etime*1
if(!item.is_type) item.is_type = item.type
if(item.is_type == '3'){
item.status = '2';
item.is_examine = '0';
... ... @@ -45,6 +47,36 @@ Page({
item.arule = item.arule ? util.determine(item.arule) : '';
item.use = item.use ? util.determine(item.use) : '';
item.aexpiration = item.aexpiration ? util.determine(item.aexpiration) : '';
item.cdate = item.cdate * 1;
item.useStime = '';
item.useEtime = '';
let condition = item.aexpiration
if (condition.valid_forever === '0' && condition.stime && condition.etime) {
item.useStime = util.unixtoTime(condition.stime, 'YYYY-MM-DD');
item.useEtime = util.unixtoTime(condition.etime, 'YYYY-MM-DD');
}
if (condition.valid_forever === '1') {
item.foreverText = '永久有效';
}
// today 领券当日起天数
if (condition.valid_forever === '0' && condition.today) {
let obj = this.setTimeRange(item.cdate, 0, parseInt(condition.today)-1);
item.useStime = obj.useStime;
item.useEtime = obj.useEtime;
item.useEtimeStr = '领取当日起' + condition.today + '天内有效';
}
// tomorrow 领券次日起天数
if (condition.valid_forever === '0' && condition.tomorrow) {
let obj = this.setTimeRange(item.cdate, 1, condition.tomorrow*1);
item.useStime = obj.useStime;
item.useEtime = obj.useEtime;
}
// sday 领券后第几天的开始天数 eday 领券后第几天的结束天数
if (condition.valid_forever === '0' && condition.sday && condition.eday) {
let obj = this.setTimeRange(item.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1);
item.useStime = obj.useStime;
item.useEtime = obj.useEtime;
}
if ((item.use && (!item.use.is_cash || item.use.is_cash == '1'))) {
let cash = item.use.cash * 1;
let price = item.price * 1;
... ... @@ -67,7 +99,7 @@ Page({
item.noShow = '0'
item.noShowTetxt = '已使用'
}
if(item.is_expire=='1' && item.aexpiration.valid_forever != '1'){
if(item.is_expire=='1' && (item.is_type=='3' && item.aexpiration.valid_forever != '1' && this.data.dataStr > (item.useEtime * 1)) || (item.is_type !='3' && this.data.dataStr > (item.etime * 1))){
item.noShow = '0'
item.noShowTetxt = '已失效'
}
... ... @@ -150,6 +182,20 @@ Page({
this.todetail()
}
},
// 计算免费券有效期的起始、结束日期
setTimeRange(cdate, startOffset, endOffset) {
console.log(cdate, startOffset, endOffset);
const startDate = new Date((cdate * 1 + startOffset * 86400) * 1000);
startDate.setHours(0, 0, 0, 0);
const useStime = util.unixtoTime(startDate.getTime() / 1000, 'YYYY-MM-DD');
const endDate = new Date((cdate * 1 + endOffset * 86400) * 1000);
endDate.setHours(23, 59, 59, 0);
const useEtime = util.unixtoTime(endDate.getTime() / 1000, 'YYYY-MM-DD');
return {
useStime,
useEtime
};
},
// 处理优惠券不可用日期数据
hasConsecutiveSelect(arr, type) {
let firstTitle = null;
... ...
... ... @@ -32,11 +32,13 @@
<view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
<view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
<view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
<view wx:if="{{item.aexpiration.valid_forever == '0' && item.useStime && item.useEtime}}" class="bottom font24r">有效期:{{item.useStime}} 至 {{item.useEtime}}</view>
<view class="bottom font24r" wx:if="{{item.aexpiration.valid_forever == '1'}}">有效期:永久有效</view>
<view wx:if="{{item.is_type == '4' && item.desc!='0'}}" class="bottom font24r">消费满{{item.desc}}元可用</view>
</block>
</view>
<view class="btnBox">
<view class="font24r orderingFood" wx:if="{{item.is_type!='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'}}">去核销</view>
<view class="font24r orderingFood" wx:if="{{item.is_type!='3'&&item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5' && item.noShow !='0'}}">去核销</view>
<view class="font24r orderingFood" wx:if="{{item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'}}">去评价</view>
<view class="font24r orderingFood" wx:if="{{!(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1') && item.noShowTetxt}}">{{item.noShowTetxt}}</view>
</view>
... ...