xt / xcx-book · Commits

Go to a project

Commit b13ddb0f5067737fa84552166424228c501364aa

Authored by pengye
1 parent 97e44b51
build: skipped

邀请函、券支付页、券列表、券详情、商家有礼、商家详情券加不可用日期（早餐）

Inline Side-by-side
Showing 33 changed files with 176 additions and 79 deletions
... ... @@ -72,10 +72,13 @@ Page({
detail.accumulationShow = detail.arule.is_accumulation
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -497,7 +500,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -50,9 +50,13 @@
<!-- <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}}" class="font20r bottomTitle"><text>不可使用：</text><view wx:if="{{item.noonText}}" class="bottom font20r">{{item.noonText}}</view>
<view wx:if="{{item.morText || item.noonText || item.nigText}}" class="font20r bottomTitle"><text>不可使用：</text>
<view class="textBox">
<view wx:if="{{item.morText}}" class="bottom font20r">{{item.morText}}</view>
<view wx:if="{{item.noonText}}" class="bottom font20r">{{item.noonText}}</view>
<view wx:if="{{item.nigText}}" class="bottom font20r">{{item.nigText}}</view>
</view>
</view>
<view wx:if="{{item.nigText}}" class="font20r {{!item.noonText?'bottomTitle':'bottom nodate'}}"><text wx:if="{{!item.noonText}}">不可使用：</text><view wx:if="{{item.nigText}}" class="bottom font20r">{{item.nigText}}</view></view>
<view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font20r">无使用时间限制</view>
</view>
<checkbox disabled="{{item.showCpupon == '0'}}" value="{{item.activity_id}}" checked="{{item.checked}}" />
... ...
... ... @@ -176,6 +176,12 @@
margin: 0 20rpx;
}
.textBox {
width: 90%;
display: flex;
flex-direction: column;
}
.bottomTitle {
color: #515151;
font-family: PingFang SC;
... ...
... ... @@ -136,10 +136,13 @@ Page({
let exp_date = util.determine(detail.exp_date);
detail.arule = detail.arule ? util.determine(detail.arule) : '';
if (exp_date && exp_date.week_data) {
let noon = this.hasConsecutiveSelect(exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -228,7 +231,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -20,13 +20,14 @@
<view class="info font24r" wx:if="{{detail.aexpiration>0}}">领取后{{detail.aexpiration}}天内使用</view>
</view>
<view class="centerMain">
<view class="title">
<view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">
<image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" />
<text class="font28r">不可用日期</text>
</view>
<view wx:if="{{detail.morText}}" class="info font24r">{{detail.morText}}</view>
<view wx:if="{{detail.noonText}}" class="info font24r">{{detail.noonText}}</view>
<view wx:if="{{detail.nigText}}" class="info font24r">{{detail.nigText}}</view>
<view wx:if="{{!detail.noonText && !detail.nigText}}" class="info font24r">无限制</view>
<view wx:if="{{!detail.morText && !detail.noonText && !detail.nigText}}" class="info font24r">无限制</view>
</view>
<view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}">
<view class="title">
... ...
... ... @@ -934,10 +934,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1009,10 +1012,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1151,7 +1157,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -100,7 +100,7 @@
<view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc">
<view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -120,6 +120,9 @@
<text></text>
<view>消费满{{item.desc}}元可用</view>
</view>
<view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r">
<text></text>{{item.morText}}
</view>
<view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{item.noonText}}
</view>
... ... @@ -183,7 +186,7 @@
<view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -203,6 +206,9 @@
<text></text>
<view>消费满{{couponData.desc}}元可用</view>
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r">
<text></text>{{couponData.morText}}
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{couponData.noonText}}
</view>
... ...
... ... @@ -975,10 +975,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1064,10 +1067,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1220,7 +1226,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -137,7 +137,7 @@
<view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc">
<view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -157,7 +157,10 @@
<text></text>
<view>消费满{{item.desc}}元可用</view>
</view>
<view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<text></text>{{item.morText}}
</view>
<view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{item.noonText}}
</view>
<view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">
... ... @@ -226,7 +229,7 @@
<view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -246,7 +249,10 @@
<text></text>
<view>消费满{{couponData.desc}}元可用</view>
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<text></text>{{couponData.morText}}
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{couponData.noonText}}
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">
... ...
... ... @@ -990,10 +990,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1079,10 +1082,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1235,7 +1241,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -181,7 +181,7 @@
<view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc">
<view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -201,7 +201,10 @@
<text></text>
<view>消费满{{item.desc}}元可用</view>
</view>
<view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<text></text>{{item.morText}}
</view>
<view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{item.noonText}}
</view>
<view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">
... ... @@ -264,7 +267,7 @@
<view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
<text class="font24r">消费要求</text>
</view>
<view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
<text class="font24r">不可用日期</text>
</view>
</view>
... ... @@ -284,7 +287,10 @@
<text></text>
<view>消费满{{couponData.desc}}元可用</view>
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
<text></text>{{couponData.morText}}
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
<text></text>{{couponData.noonText}}
</view>
<view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">
... ...
... ... @@ -984,10 +984,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1126,7 +1129,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -111,7 +111,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可使用：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -939,10 +939,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1081,7 +1084,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -117,7 +117,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -940,10 +940,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1082,7 +1085,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -100,7 +100,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -938,10 +938,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1080,7 +1083,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -98,7 +98,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -895,10 +895,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1037,7 +1040,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -120,7 +120,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -939,10 +939,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1081,7 +1084,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -113,7 +113,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -938,10 +938,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1080,7 +1083,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -110,7 +110,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -972,10 +972,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -1114,7 +1117,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -115,7 +115,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -49,10 +49,13 @@ Page({
item.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
}
if (item.exp_date && item.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(item.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(item.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(item.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(item.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(item.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
item.morText = mor;
item.noonText = noon;
item.nigText = nig;
}
... ... @@ -152,7 +155,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -27,7 +27,8 @@
</block>
<block wx:if="{{item.is_type == '3'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -251,10 +251,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -326,7 +329,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -31,7 +31,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...
... ... @@ -295,10 +295,13 @@ Page({
}
}
if (detail.exp_date && detail.exp_date.week_data) {
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
if (mor) mor = '早餐：' + mor
if (noon) noon = '午餐：' + noon
if (nig) nig = '晚餐：' + nig
detail.morText = mor;
detail.noonText = noon;
detail.nigText = nig;
}
... ... @@ -437,7 +440,7 @@ Page({
let rArr = []
let num = 0
for (let i = 0; i < arr.length; i++) {
let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig
let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
if (str) {
rArr.push(arr[i].title)
num++
... ...
... ... @@ -46,7 +46,8 @@
</block>
<block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
<view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
<view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
<view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
<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>
... ...