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({ @@ -72,10 +72,13 @@ Page({
72 detail.accumulationShow = detail.arule.is_accumulation 72 detail.accumulationShow = detail.arule.is_accumulation
73 } 73 }
74 if (detail.exp_date && detail.exp_date.week_data) { 74 if (detail.exp_date && detail.exp_date.week_data) {
75 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
76 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 75 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  76 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  77 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  78 + if (mor) mor = '早餐：' + mor
77 if (noon) noon = '午餐：' + noon 79 if (noon) noon = '午餐：' + noon
78 if (nig) nig = '晚餐：' + nig 80 if (nig) nig = '晚餐：' + nig
  81 + detail.morText = mor;
79 detail.noonText = noon; 82 detail.noonText = noon;
80 detail.nigText = nig; 83 detail.nigText = nig;
81 } 84 }
@@ -497,7 +500,7 @@ Page({ @@ -497,7 +500,7 @@ Page({
497 let rArr = [] 500 let rArr = []
498 let num = 0 501 let num = 0
499 for (let i = 0; i < arr.length; i++) { 502 for (let i = 0; i < arr.length; i++) {
500 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 503 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
501 if (str) { 504 if (str) {
502 rArr.push(arr[i].title) 505 rArr.push(arr[i].title)
503 num++ 506 num++
@@ -50,9 +50,13 @@ @@ -50,9 +50,13 @@
50 <!-- <view class="font20r bottom">{{item.arule.is_same_day=='1'?'领取当日可用':'领取当日不可用'}}</view> 50 <!-- <view class="font20r bottom">{{item.arule.is_same_day=='1'?'领取当日可用':'领取当日不可用'}}</view>
51 <view wx:if="{{item.aexpiration>0}}" class="font20r bottom">领取后{{item.aexpiration}}天内使用</view> 51 <view wx:if="{{item.aexpiration>0}}" class="font20r bottom">领取后{{item.aexpiration}}天内使用</view>
52 <view wx:if="{{item.cdateText}}" class="font20r bottom">领取日期：{{item.cdateText}}</view> --> 52 <view wx:if="{{item.cdateText}}" class="font20r bottom">领取日期：{{item.cdateText}}</view> -->
53 - <view wx:if="{{item.noonText}}" class="font20r bottomTitle"><text>不可使用：</text><view wx:if="{{item.noonText}}" class="bottom font20r">{{item.noonText}}</view> 53 + <view wx:if="{{item.morText || item.noonText || item.nigText}}" class="font20r bottomTitle"><text>不可使用：</text>
  54 + <view class="textBox">
  55 + <view wx:if="{{item.morText}}" class="bottom font20r">{{item.morText}}</view>
  56 + <view wx:if="{{item.noonText}}" class="bottom font20r">{{item.noonText}}</view>
  57 + <view wx:if="{{item.nigText}}" class="bottom font20r">{{item.nigText}}</view>
  58 + </view>
54 </view> 59 </view>
55 - <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>  
56 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font20r">无使用时间限制</view> 60 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font20r">无使用时间限制</view>
57 </view> 61 </view>
58 <checkbox disabled="{{item.showCpupon == '0'}}" value="{{item.activity_id}}" checked="{{item.checked}}" /> 62 <checkbox disabled="{{item.showCpupon == '0'}}" value="{{item.activity_id}}" checked="{{item.checked}}" />
@@ -176,6 +176,12 @@ @@ -176,6 +176,12 @@
176 margin: 0 20rpx; 176 margin: 0 20rpx;
177 } 177 }
178 178
  179 +.textBox {
  180 + width: 90%;
  181 + display: flex;
  182 + flex-direction: column;
  183 +}
  184 +
179 .bottomTitle { 185 .bottomTitle {
180 color: #515151; 186 color: #515151;
181 font-family: PingFang SC; 187 font-family: PingFang SC;
@@ -136,10 +136,13 @@ Page({ @@ -136,10 +136,13 @@ Page({
136 let exp_date = util.determine(detail.exp_date); 136 let exp_date = util.determine(detail.exp_date);
137 detail.arule = detail.arule ? util.determine(detail.arule) : ''; 137 detail.arule = detail.arule ? util.determine(detail.arule) : '';
138 if (exp_date && exp_date.week_data) { 138 if (exp_date && exp_date.week_data) {
139 - let noon = this.hasConsecutiveSelect(exp_date.week_data, '1').rArr.join('、')  
140 - let nig = this.hasConsecutiveSelect(exp_date.week_data, '2').rArr.join('、') 139 + let mor = this.hasConsecutiveSelect(exp_date.week_data, '1').rArr.join('、')
  140 + let noon = this.hasConsecutiveSelect(exp_date.week_data, '2').rArr.join('、')
  141 + let nig = this.hasConsecutiveSelect(exp_date.week_data, '3').rArr.join('、')
  142 + if (mor) mor = '早餐：' + mor
141 if (noon) noon = '午餐：' + noon 143 if (noon) noon = '午餐：' + noon
142 if (nig) nig = '晚餐：' + nig 144 if (nig) nig = '晚餐：' + nig
  145 + detail.morText = mor;
143 detail.noonText = noon; 146 detail.noonText = noon;
144 detail.nigText = nig; 147 detail.nigText = nig;
145 } 148 }
@@ -228,7 +231,7 @@ Page({ @@ -228,7 +231,7 @@ Page({
228 let rArr = [] 231 let rArr = []
229 let num = 0 232 let num = 0
230 for (let i = 0; i < arr.length; i++) { 233 for (let i = 0; i < arr.length; i++) {
231 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 234 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
232 if (str) { 235 if (str) {
233 rArr.push(arr[i].title) 236 rArr.push(arr[i].title)
234 num++ 237 num++
@@ -20,13 +20,14 @@ @@ -20,13 +20,14 @@
20 <view class="info font24r" wx:if="{{detail.aexpiration>0}}">领取后{{detail.aexpiration}}天内使用</view> 20 <view class="info font24r" wx:if="{{detail.aexpiration>0}}">领取后{{detail.aexpiration}}天内使用</view>
21 </view> 21 </view>
22 <view class="centerMain"> 22 <view class="centerMain">
23 - <view class="title"> 23 + <view class="title" wx:if="{{detail.morText || detail.noonText || detail.nigText}}">
24 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" /> 24 <image src="https://qn.colorcun.com/voucherUnion_2.png" mode="" />
25 <text class="font28r">不可用日期</text> 25 <text class="font28r">不可用日期</text>
26 </view> 26 </view>
  27 + <view wx:if="{{detail.morText}}" class="info font24r">{{detail.morText}}</view>
27 <view wx:if="{{detail.noonText}}" class="info font24r">{{detail.noonText}}</view> 28 <view wx:if="{{detail.noonText}}" class="info font24r">{{detail.noonText}}</view>
28 <view wx:if="{{detail.nigText}}" class="info font24r">{{detail.nigText}}</view> 29 <view wx:if="{{detail.nigText}}" class="info font24r">{{detail.nigText}}</view>
29 - <view wx:if="{{!detail.noonText && !detail.nigText}}" class="info font24r">无限制</view> 30 + <view wx:if="{{!detail.morText && !detail.noonText && !detail.nigText}}" class="info font24r">无限制</view>
30 </view> 31 </view>
31 <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}"> 32 <view class="centerMain centerMain3" wx:if="{{detail.aexpiration}}">
32 <view class="title"> 33 <view class="title">
@@ -934,10 +934,13 @@ Page({ @@ -934,10 +934,13 @@ Page({
934 } 934 }
935 } 935 }
936 if (detail.exp_date && detail.exp_date.week_data) { 936 if (detail.exp_date && detail.exp_date.week_data) {
937 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
938 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 937 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  938 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  939 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  940 + if (mor) mor = '早餐：' + mor
939 if (noon) noon = '午餐：' + noon 941 if (noon) noon = '午餐：' + noon
940 if (nig) nig = '晚餐：' + nig 942 if (nig) nig = '晚餐：' + nig
  943 + detail.morText = mor;
941 detail.noonText = noon; 944 detail.noonText = noon;
942 detail.nigText = nig; 945 detail.nigText = nig;
943 } 946 }
@@ -1009,10 +1012,13 @@ Page({ @@ -1009,10 +1012,13 @@ Page({
1009 } 1012 }
1010 } 1013 }
1011 if (detail.exp_date && detail.exp_date.week_data) { 1014 if (detail.exp_date && detail.exp_date.week_data) {
1012 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
1013 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 1015 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  1016 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  1017 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  1018 + if (mor) mor = '早餐：' + mor
1014 if (noon) noon = '午餐：' + noon 1019 if (noon) noon = '午餐：' + noon
1015 if (nig) nig = '晚餐：' + nig 1020 if (nig) nig = '晚餐：' + nig
  1021 + detail.morText = mor;
1016 detail.noonText = noon; 1022 detail.noonText = noon;
1017 detail.nigText = nig; 1023 detail.nigText = nig;
1018 } 1024 }
@@ -1151,7 +1157,7 @@ Page({ @@ -1151,7 +1157,7 @@ Page({
1151 let rArr = [] 1157 let rArr = []
1152 let num = 0 1158 let num = 0
1153 for (let i = 0; i < arr.length; i++) { 1159 for (let i = 0; i < arr.length; i++) {
1154 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1160 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1155 if (str) { 1161 if (str) {
1156 rArr.push(arr[i].title) 1162 rArr.push(arr[i].title)
1157 num++ 1163 num++
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc"> 100 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
101 <text class="font24r">消费要求</text> 101 <text class="font24r">消费要求</text>
102 </view> 102 </view>
103 - <view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc"> 103 + <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
104 <text class="font24r">不可用日期</text> 104 <text class="font24r">不可用日期</text>
105 </view> 105 </view>
106 </view> 106 </view>
@@ -120,6 +120,9 @@ @@ -120,6 +120,9 @@
120 <text></text> 120 <text></text>
121 <view>消费满{{item.desc}}元可用</view> 121 <view>消费满{{item.desc}}元可用</view>
122 </view> 122 </view>
  123 + <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r">
  124 + <text></text>{{item.morText}}
  125 + </view>
123 <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r"> 126 <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
124 <text></text>{{item.noonText}} 127 <text></text>{{item.noonText}}
125 </view> 128 </view>
@@ -183,7 +186,7 @@ @@ -183,7 +186,7 @@
183 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc"> 186 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
184 <text class="font24r">消费要求</text> 187 <text class="font24r">消费要求</text>
185 </view> 188 </view>
186 - <view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc"> 189 + <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
187 <text class="font24r">不可用日期</text> 190 <text class="font24r">不可用日期</text>
188 </view> 191 </view>
189 </view> 192 </view>
@@ -203,6 +206,9 @@ @@ -203,6 +206,9 @@
203 <text></text> 206 <text></text>
204 <view>消费满{{couponData.desc}}元可用</view> 207 <view>消费满{{couponData.desc}}元可用</view>
205 </view> 208 </view>
  209 + <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r">
  210 + <text></text>{{couponData.morText}}
  211 + </view>
206 <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r"> 212 <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
207 <text></text>{{couponData.noonText}} 213 <text></text>{{couponData.noonText}}
208 </view> 214 </view>
@@ -975,10 +975,13 @@ Page({ @@ -975,10 +975,13 @@ Page({
975 } 975 }
976 } 976 }
977 if (detail.exp_date && detail.exp_date.week_data) { 977 if (detail.exp_date && detail.exp_date.week_data) {
978 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
979 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 978 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  979 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  980 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  981 + if (mor) mor = '早餐：' + mor
980 if (noon) noon = '午餐：' + noon 982 if (noon) noon = '午餐：' + noon
981 if (nig) nig = '晚餐：' + nig 983 if (nig) nig = '晚餐：' + nig
  984 + detail.morText = mor;
982 detail.noonText = noon; 985 detail.noonText = noon;
983 detail.nigText = nig; 986 detail.nigText = nig;
984 } 987 }
@@ -1064,10 +1067,13 @@ Page({ @@ -1064,10 +1067,13 @@ Page({
1064 } 1067 }
1065 } 1068 }
1066 if (detail.exp_date && detail.exp_date.week_data) { 1069 if (detail.exp_date && detail.exp_date.week_data) {
1067 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
1068 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 1070 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  1071 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  1072 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  1073 + if (mor) mor = '早餐：' + mor
1069 if (noon) noon = '午餐：' + noon 1074 if (noon) noon = '午餐：' + noon
1070 if (nig) nig = '晚餐：' + nig 1075 if (nig) nig = '晚餐：' + nig
  1076 + detail.morText = mor;
1071 detail.noonText = noon; 1077 detail.noonText = noon;
1072 detail.nigText = nig; 1078 detail.nigText = nig;
1073 } 1079 }
@@ -1220,7 +1226,7 @@ Page({ @@ -1220,7 +1226,7 @@ Page({
1220 let rArr = [] 1226 let rArr = []
1221 let num = 0 1227 let num = 0
1222 for (let i = 0; i < arr.length; i++) { 1228 for (let i = 0; i < arr.length; i++) {
1223 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1229 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1224 if (str) { 1230 if (str) {
1225 rArr.push(arr[i].title) 1231 rArr.push(arr[i].title)
1226 num++ 1232 num++
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc"> 137 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
138 <text class="font24r">消费要求</text> 138 <text class="font24r">消费要求</text>
139 </view> 139 </view>
140 - <view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc"> 140 + <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
141 <text class="font24r">不可用日期</text> 141 <text class="font24r">不可用日期</text>
142 </view> 142 </view>
143 </view> 143 </view>
@@ -157,7 +157,10 @@ @@ -157,7 +157,10 @@
157 <text></text> 157 <text></text>
158 <view>消费满{{item.desc}}元可用</view> 158 <view>消费满{{item.desc}}元可用</view>
159 </view> 159 </view>
160 - <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop"> 160 + <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
  161 + <text></text>{{item.morText}}
  162 + </view>
  163 + <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
161 <text></text>{{item.noonText}} 164 <text></text>{{item.noonText}}
162 </view> 165 </view>
163 <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r"> 166 <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">
@@ -226,7 +229,7 @@ @@ -226,7 +229,7 @@
226 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc"> 229 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
227 <text class="font24r">消费要求</text> 230 <text class="font24r">消费要求</text>
228 </view> 231 </view>
229 - <view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc"> 232 + <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
230 <text class="font24r">不可用日期</text> 233 <text class="font24r">不可用日期</text>
231 </view> 234 </view>
232 </view> 235 </view>
@@ -246,7 +249,10 @@ @@ -246,7 +249,10 @@
246 <text></text> 249 <text></text>
247 <view>消费满{{couponData.desc}}元可用</view> 250 <view>消费满{{couponData.desc}}元可用</view>
248 </view> 251 </view>
249 - <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop"> 252 + <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
  253 + <text></text>{{couponData.morText}}
  254 + </view>
  255 + <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
250 <text></text>{{couponData.noonText}} 256 <text></text>{{couponData.noonText}}
251 </view> 257 </view>
252 <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r"> 258 <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">
@@ -990,10 +990,13 @@ Page({ @@ -990,10 +990,13 @@ Page({
990 } 990 }
991 } 991 }
992 if (detail.exp_date && detail.exp_date.week_data) { 992 if (detail.exp_date && detail.exp_date.week_data) {
993 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
994 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 993 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  994 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  995 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  996 + if (mor) mor = '早餐：' + mor
995 if (noon) noon = '午餐：' + noon 997 if (noon) noon = '午餐：' + noon
996 if (nig) nig = '晚餐：' + nig 998 if (nig) nig = '晚餐：' + nig
  999 + detail.morText = mor;
997 detail.noonText = noon; 1000 detail.noonText = noon;
998 detail.nigText = nig; 1001 detail.nigText = nig;
999 } 1002 }
@@ -1079,10 +1082,13 @@ Page({ @@ -1079,10 +1082,13 @@ Page({
1079 } 1082 }
1080 } 1083 }
1081 if (detail.exp_date && detail.exp_date.week_data) { 1084 if (detail.exp_date && detail.exp_date.week_data) {
1082 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
1083 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 1085 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  1086 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  1087 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  1088 + if (mor) mor = '早餐：' + mor
1084 if (noon) noon = '午餐：' + noon 1089 if (noon) noon = '午餐：' + noon
1085 if (nig) nig = '晚餐：' + nig 1090 if (nig) nig = '晚餐：' + nig
  1091 + detail.morText = mor;
1086 detail.noonText = noon; 1092 detail.noonText = noon;
1087 detail.nigText = nig; 1093 detail.nigText = nig;
1088 } 1094 }
@@ -1235,7 +1241,7 @@ Page({ @@ -1235,7 +1241,7 @@ Page({
1235 let rArr = [] 1241 let rArr = []
1236 let num = 0 1242 let num = 0
1237 for (let i = 0; i < arr.length; i++) { 1243 for (let i = 0; i < arr.length; i++) {
1238 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1244 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1239 if (str) { 1245 if (str) {
1240 rArr.push(arr[i].title) 1246 rArr.push(arr[i].title)
1241 num++ 1247 num++
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc"> 181 <view wx:if="{{item.is_type == '4' && item.desc}}" class="limitation showDesc">
182 <text class="font24r">消费要求</text> 182 <text class="font24r">消费要求</text>
183 </view> 183 </view>
184 - <view wx:if="{{item.is_type == '3' && (item.noonText || item.nigText)}}" class="limitation showDesc"> 184 + <view wx:if="{{item.is_type == '3' && (item.morText || item.noonText || item.nigText)}}" class="limitation showDesc">
185 <text class="font24r">不可用日期</text> 185 <text class="font24r">不可用日期</text>
186 </view> 186 </view>
187 </view> 187 </view>
@@ -201,7 +201,10 @@ @@ -201,7 +201,10 @@
201 <text></text> 201 <text></text>
202 <view>消费满{{item.desc}}元可用</view> 202 <view>消费满{{item.desc}}元可用</view>
203 </view> 203 </view>
204 - <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop"> 204 + <view wx:if="{{item.is_type == '3' && item.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
  205 + <text></text>{{item.morText}}
  206 + </view>
  207 + <view wx:if="{{item.is_type == '3' && item.noonText}}" class="bottomLimitation limitation font24r">
205 <text></text>{{item.noonText}} 208 <text></text>{{item.noonText}}
206 </view> 209 </view>
207 <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r"> 210 <view wx:if="{{item.is_type == '3' && item.nigText}}" class="bottomLimitation limitation font24r">
@@ -264,7 +267,7 @@ @@ -264,7 +267,7 @@
264 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc"> 267 <view wx:if="{{couponData.is_type == '4' && couponData.desc}}" class="limitation showDesc">
265 <text class="font24r">消费要求</text> 268 <text class="font24r">消费要求</text>
266 </view> 269 </view>
267 - <view wx:if="{{couponData.is_type == '3' && (couponData.noonText || couponData.nigText)}}" class="limitation showDesc"> 270 + <view wx:if="{{couponData.is_type == '3' && (couponData.morText || couponData.noonText || couponData.nigText)}}" class="limitation showDesc">
268 <text class="font24r">不可用日期</text> 271 <text class="font24r">不可用日期</text>
269 </view> 272 </view>
270 </view> 273 </view>
@@ -284,7 +287,10 @@ @@ -284,7 +287,10 @@
284 <text></text> 287 <text></text>
285 <view>消费满{{couponData.desc}}元可用</view> 288 <view>消费满{{couponData.desc}}元可用</view>
286 </view> 289 </view>
287 - <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r bottomLimitationTop"> 290 + <view wx:if="{{couponData.is_type == '3' && couponData.morText}}" class="bottomLimitation limitation font24r bottomLimitationTop">
  291 + <text></text>{{couponData.morText}}
  292 + </view>
  293 + <view wx:if="{{couponData.is_type == '3' && couponData.noonText}}" class="bottomLimitation limitation font24r">
288 <text></text>{{couponData.noonText}} 294 <text></text>{{couponData.noonText}}
289 </view> 295 </view>
290 <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r"> 296 <view wx:if="{{couponData.is_type == '3' && couponData.nigText}}" class="bottomLimitation limitation font24r">
@@ -984,10 +984,13 @@ Page({ @@ -984,10 +984,13 @@ Page({
984 } 984 }
985 } 985 }
986 if (detail.exp_date && detail.exp_date.week_data) { 986 if (detail.exp_date && detail.exp_date.week_data) {
987 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
988 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 987 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  988 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  989 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  990 + if (mor) mor = '早餐：' + mor
989 if (noon) noon = '午餐：' + noon 991 if (noon) noon = '午餐：' + noon
990 if (nig) nig = '晚餐：' + nig 992 if (nig) nig = '晚餐：' + nig
  993 + detail.morText = mor;
991 detail.noonText = noon; 994 detail.noonText = noon;
992 detail.nigText = nig; 995 detail.nigText = nig;
993 } 996 }
@@ -1126,7 +1129,7 @@ Page({ @@ -1126,7 +1129,7 @@ Page({
1126 let rArr = [] 1129 let rArr = []
1127 let num = 0 1130 let num = 0
1128 for (let i = 0; i < arr.length; i++) { 1131 for (let i = 0; i < arr.length; i++) {
1129 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1132 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1130 if (str) { 1133 if (str) {
1131 rArr.push(arr[i].title) 1134 rArr.push(arr[i].title)
1132 num++ 1135 num++
@@ -111,7 +111,8 @@ @@ -111,7 +111,8 @@
111 </block> 111 </block>
112 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 112 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
113 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 113 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
114 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可使用：</view> 114 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  115 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
115 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 116 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
116 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 117 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
117 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 118 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -939,10 +939,13 @@ Page({ @@ -939,10 +939,13 @@ Page({
939 } 939 }
940 } 940 }
941 if (detail.exp_date && detail.exp_date.week_data) { 941 if (detail.exp_date && detail.exp_date.week_data) {
942 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
943 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 942 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  943 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  944 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  945 + if (mor) mor = '早餐：' + mor
944 if (noon) noon = '午餐：' + noon 946 if (noon) noon = '午餐：' + noon
945 if (nig) nig = '晚餐：' + nig 947 if (nig) nig = '晚餐：' + nig
  948 + detail.morText = mor;
946 detail.noonText = noon; 949 detail.noonText = noon;
947 detail.nigText = nig; 950 detail.nigText = nig;
948 } 951 }
@@ -1081,7 +1084,7 @@ Page({ @@ -1081,7 +1084,7 @@ Page({
1081 let rArr = [] 1084 let rArr = []
1082 let num = 0 1085 let num = 0
1083 for (let i = 0; i < arr.length; i++) { 1086 for (let i = 0; i < arr.length; i++) {
1084 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1087 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1085 if (str) { 1088 if (str) {
1086 rArr.push(arr[i].title) 1089 rArr.push(arr[i].title)
1087 num++ 1090 num++
@@ -117,7 +117,8 @@ @@ -117,7 +117,8 @@
117 </block> 117 </block>
118 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 118 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
119 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 119 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
120 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 120 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  121 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
121 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 122 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
122 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 123 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
123 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 124 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -940,10 +940,13 @@ Page({ @@ -940,10 +940,13 @@ Page({
940 } 940 }
941 } 941 }
942 if (detail.exp_date && detail.exp_date.week_data) { 942 if (detail.exp_date && detail.exp_date.week_data) {
943 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
944 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 943 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  944 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  945 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  946 + if (mor) mor = '早餐：' + mor
945 if (noon) noon = '午餐：' + noon 947 if (noon) noon = '午餐：' + noon
946 if (nig) nig = '晚餐：' + nig 948 if (nig) nig = '晚餐：' + nig
  949 + detail.morText = mor;
947 detail.noonText = noon; 950 detail.noonText = noon;
948 detail.nigText = nig; 951 detail.nigText = nig;
949 } 952 }
@@ -1082,7 +1085,7 @@ Page({ @@ -1082,7 +1085,7 @@ Page({
1082 let rArr = [] 1085 let rArr = []
1083 let num = 0 1086 let num = 0
1084 for (let i = 0; i < arr.length; i++) { 1087 for (let i = 0; i < arr.length; i++) {
1085 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1088 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1086 if (str) { 1089 if (str) {
1087 rArr.push(arr[i].title) 1090 rArr.push(arr[i].title)
1088 num++ 1091 num++
@@ -100,7 +100,8 @@ @@ -100,7 +100,8 @@
100 </block> 100 </block>
101 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 101 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
102 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 102 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
103 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 103 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  104 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
104 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 105 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
105 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 106 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
106 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 107 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -938,10 +938,13 @@ Page({ @@ -938,10 +938,13 @@ Page({
938 } 938 }
939 } 939 }
940 if (detail.exp_date && detail.exp_date.week_data) { 940 if (detail.exp_date && detail.exp_date.week_data) {
941 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
942 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 941 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  942 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  943 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  944 + if (mor) mor = '早餐：' + mor
943 if (noon) noon = '午餐：' + noon 945 if (noon) noon = '午餐：' + noon
944 if (nig) nig = '晚餐：' + nig 946 if (nig) nig = '晚餐：' + nig
  947 + detail.morText = mor;
945 detail.noonText = noon; 948 detail.noonText = noon;
946 detail.nigText = nig; 949 detail.nigText = nig;
947 } 950 }
@@ -1080,7 +1083,7 @@ Page({ @@ -1080,7 +1083,7 @@ Page({
1080 let rArr = [] 1083 let rArr = []
1081 let num = 0 1084 let num = 0
1082 for (let i = 0; i < arr.length; i++) { 1085 for (let i = 0; i < arr.length; i++) {
1083 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1086 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1084 if (str) { 1087 if (str) {
1085 rArr.push(arr[i].title) 1088 rArr.push(arr[i].title)
1086 num++ 1089 num++
@@ -98,7 +98,8 @@ @@ -98,7 +98,8 @@
98 </block> 98 </block>
99 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 99 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
100 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 100 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
101 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 101 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  102 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
102 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 103 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
103 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 104 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
104 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 105 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -895,10 +895,13 @@ Page({ @@ -895,10 +895,13 @@ Page({
895 } 895 }
896 } 896 }
897 if (detail.exp_date && detail.exp_date.week_data) { 897 if (detail.exp_date && detail.exp_date.week_data) {
898 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
899 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 898 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  899 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  900 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  901 + if (mor) mor = '早餐：' + mor
900 if (noon) noon = '午餐：' + noon 902 if (noon) noon = '午餐：' + noon
901 if (nig) nig = '晚餐：' + nig 903 if (nig) nig = '晚餐：' + nig
  904 + detail.morText = mor;
902 detail.noonText = noon; 905 detail.noonText = noon;
903 detail.nigText = nig; 906 detail.nigText = nig;
904 } 907 }
@@ -1037,7 +1040,7 @@ Page({ @@ -1037,7 +1040,7 @@ Page({
1037 let rArr = [] 1040 let rArr = []
1038 let num = 0 1041 let num = 0
1039 for (let i = 0; i < arr.length; i++) { 1042 for (let i = 0; i < arr.length; i++) {
1040 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1043 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1041 if (str) { 1044 if (str) {
1042 rArr.push(arr[i].title) 1045 rArr.push(arr[i].title)
1043 num++ 1046 num++
@@ -120,7 +120,8 @@ @@ -120,7 +120,8 @@
120 </block> 120 </block>
121 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 121 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
122 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 122 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
123 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 123 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  124 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
124 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 125 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
125 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 126 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
126 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 127 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -939,10 +939,13 @@ Page({ @@ -939,10 +939,13 @@ Page({
939 } 939 }
940 } 940 }
941 if (detail.exp_date && detail.exp_date.week_data) { 941 if (detail.exp_date && detail.exp_date.week_data) {
942 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
943 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 942 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  943 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  944 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  945 + if (mor) mor = '早餐：' + mor
944 if (noon) noon = '午餐：' + noon 946 if (noon) noon = '午餐：' + noon
945 if (nig) nig = '晚餐：' + nig 947 if (nig) nig = '晚餐：' + nig
  948 + detail.morText = mor;
946 detail.noonText = noon; 949 detail.noonText = noon;
947 detail.nigText = nig; 950 detail.nigText = nig;
948 } 951 }
@@ -1081,7 +1084,7 @@ Page({ @@ -1081,7 +1084,7 @@ Page({
1081 let rArr = [] 1084 let rArr = []
1082 let num = 0 1085 let num = 0
1083 for (let i = 0; i < arr.length; i++) { 1086 for (let i = 0; i < arr.length; i++) {
1084 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1087 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1085 if (str) { 1088 if (str) {
1086 rArr.push(arr[i].title) 1089 rArr.push(arr[i].title)
1087 num++ 1090 num++
@@ -113,7 +113,8 @@ @@ -113,7 +113,8 @@
113 </block> 113 </block>
114 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 114 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
115 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 115 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
116 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 116 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  117 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
117 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 118 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
118 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 119 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
119 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 120 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -938,10 +938,13 @@ Page({ @@ -938,10 +938,13 @@ Page({
938 } 938 }
939 } 939 }
940 if (detail.exp_date && detail.exp_date.week_data) { 940 if (detail.exp_date && detail.exp_date.week_data) {
941 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
942 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 941 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  942 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  943 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  944 + if (mor) mor = '早餐：' + mor
943 if (noon) noon = '午餐：' + noon 945 if (noon) noon = '午餐：' + noon
944 if (nig) nig = '晚餐：' + nig 946 if (nig) nig = '晚餐：' + nig
  947 + detail.morText = mor;
945 detail.noonText = noon; 948 detail.noonText = noon;
946 detail.nigText = nig; 949 detail.nigText = nig;
947 } 950 }
@@ -1080,7 +1083,7 @@ Page({ @@ -1080,7 +1083,7 @@ Page({
1080 let rArr = [] 1083 let rArr = []
1081 let num = 0 1084 let num = 0
1082 for (let i = 0; i < arr.length; i++) { 1085 for (let i = 0; i < arr.length; i++) {
1083 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1086 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1084 if (str) { 1087 if (str) {
1085 rArr.push(arr[i].title) 1088 rArr.push(arr[i].title)
1086 num++ 1089 num++
@@ -110,7 +110,8 @@ @@ -110,7 +110,8 @@
110 </block> 110 </block>
111 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 111 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
112 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 112 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
113 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 113 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  114 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
114 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 115 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
115 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 116 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
116 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 117 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -972,10 +972,13 @@ Page({ @@ -972,10 +972,13 @@ Page({
972 } 972 }
973 } 973 }
974 if (detail.exp_date && detail.exp_date.week_data) { 974 if (detail.exp_date && detail.exp_date.week_data) {
975 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
976 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 975 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  976 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  977 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  978 + if (mor) mor = '早餐：' + mor
977 if (noon) noon = '午餐：' + noon 979 if (noon) noon = '午餐：' + noon
978 if (nig) nig = '晚餐：' + nig 980 if (nig) nig = '晚餐：' + nig
  981 + detail.morText = mor;
979 detail.noonText = noon; 982 detail.noonText = noon;
980 detail.nigText = nig; 983 detail.nigText = nig;
981 } 984 }
@@ -1114,7 +1117,7 @@ Page({ @@ -1114,7 +1117,7 @@ Page({
1114 let rArr = [] 1117 let rArr = []
1115 let num = 0 1118 let num = 0
1116 for (let i = 0; i < arr.length; i++) { 1119 for (let i = 0; i < arr.length; i++) {
1117 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 1120 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
1118 if (str) { 1121 if (str) {
1119 rArr.push(arr[i].title) 1122 rArr.push(arr[i].title)
1120 num++ 1123 num++
@@ -115,7 +115,8 @@ @@ -115,7 +115,8 @@
115 </block> 115 </block>
116 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 116 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
117 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 117 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
118 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 118 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  119 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
119 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 120 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
120 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 121 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
121 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 122 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -49,10 +49,13 @@ Page({ @@ -49,10 +49,13 @@ Page({
49 item.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : ''; 49 item.discount = cash != 0 ? ((price / cash) * 10).toFixed(1) : '';
50 } 50 }
51 if (item.exp_date && item.exp_date.week_data) { 51 if (item.exp_date && item.exp_date.week_data) {
52 - let noon = this.hasConsecutiveSelect(item.exp_date.week_data, '1').rArr.join('、')  
53 - let nig = this.hasConsecutiveSelect(item.exp_date.week_data, '2').rArr.join('、') 52 + let mor = this.hasConsecutiveSelect(item.exp_date.week_data, '1').rArr.join('、')
  53 + let noon = this.hasConsecutiveSelect(item.exp_date.week_data, '2').rArr.join('、')
  54 + let nig = this.hasConsecutiveSelect(item.exp_date.week_data, '3').rArr.join('、')
  55 + if (mor) mor = '早餐：' + mor
54 if (noon) noon = '午餐：' + noon 56 if (noon) noon = '午餐：' + noon
55 if (nig) nig = '晚餐：' + nig 57 if (nig) nig = '晚餐：' + nig
  58 + item.morText = mor;
56 item.noonText = noon; 59 item.noonText = noon;
57 item.nigText = nig; 60 item.nigText = nig;
58 } 61 }
@@ -152,7 +155,7 @@ Page({ @@ -152,7 +155,7 @@ Page({
152 let rArr = [] 155 let rArr = []
153 let num = 0 156 let num = 0
154 for (let i = 0; i < arr.length; i++) { 157 for (let i = 0; i < arr.length; i++) {
155 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 158 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
156 if (str) { 159 if (str) {
157 rArr.push(arr[i].title) 160 rArr.push(arr[i].title)
158 num++ 161 num++
@@ -27,7 +27,8 @@ @@ -27,7 +27,8 @@
27 </block> 27 </block>
28 <block wx:if="{{item.is_type == '3'}}"> 28 <block wx:if="{{item.is_type == '3'}}">
29 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 29 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
30 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 30 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  31 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
31 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 32 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
32 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 33 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
33 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 34 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -251,10 +251,13 @@ Page({ @@ -251,10 +251,13 @@ Page({
251 } 251 }
252 } 252 }
253 if (detail.exp_date && detail.exp_date.week_data) { 253 if (detail.exp_date && detail.exp_date.week_data) {
254 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
255 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 254 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  255 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  256 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  257 + if (mor) mor = '早餐：' + mor
256 if (noon) noon = '午餐：' + noon 258 if (noon) noon = '午餐：' + noon
257 if (nig) nig = '晚餐：' + nig 259 if (nig) nig = '晚餐：' + nig
  260 + detail.morText = mor;
258 detail.noonText = noon; 261 detail.noonText = noon;
259 detail.nigText = nig; 262 detail.nigText = nig;
260 } 263 }
@@ -326,7 +329,7 @@ Page({ @@ -326,7 +329,7 @@ Page({
326 let rArr = [] 329 let rArr = []
327 let num = 0 330 let num = 0
328 for (let i = 0; i < arr.length; i++) { 331 for (let i = 0; i < arr.length; i++) {
329 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 332 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
330 if (str) { 333 if (str) {
331 rArr.push(arr[i].title) 334 rArr.push(arr[i].title)
332 num++ 335 num++
@@ -31,7 +31,8 @@ @@ -31,7 +31,8 @@
31 </block> 31 </block>
32 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 32 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
33 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 33 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
34 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 34 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  35 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
35 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 36 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
36 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 37 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
37 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 38 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>
@@ -295,10 +295,13 @@ Page({ @@ -295,10 +295,13 @@ Page({
295 } 295 }
296 } 296 }
297 if (detail.exp_date && detail.exp_date.week_data) { 297 if (detail.exp_date && detail.exp_date.week_data) {
298 - let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')  
299 - let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、') 298 + let mor = this.hasConsecutiveSelect(detail.exp_date.week_data, '1').rArr.join('、')
  299 + let noon = this.hasConsecutiveSelect(detail.exp_date.week_data, '2').rArr.join('、')
  300 + let nig = this.hasConsecutiveSelect(detail.exp_date.week_data, '3').rArr.join('、')
  301 + if (mor) mor = '早餐：' + mor
300 if (noon) noon = '午餐：' + noon 302 if (noon) noon = '午餐：' + noon
301 if (nig) nig = '晚餐：' + nig 303 if (nig) nig = '晚餐：' + nig
  304 + detail.morText = mor;
302 detail.noonText = noon; 305 detail.noonText = noon;
303 detail.nigText = nig; 306 detail.nigText = nig;
304 } 307 }
@@ -437,7 +440,7 @@ Page({ @@ -437,7 +440,7 @@ Page({
437 let rArr = [] 440 let rArr = []
438 let num = 0 441 let num = 0
439 for (let i = 0; i < arr.length; i++) { 442 for (let i = 0; i < arr.length; i++) {
440 - let str = type == '1' ? arr[i].selectNoon : arr[i].selectNig 443 + let str = type == '1' ? arr[i].selectMor : type == '2' ? arr[i].selectNoon : type == '3' ? arr[i].selectNig : '';
441 if (str) { 444 if (str) {
442 rArr.push(arr[i].title) 445 rArr.push(arr[i].title)
443 num++ 446 num++
@@ -46,7 +46,8 @@ @@ -46,7 +46,8 @@
46 </block> 46 </block>
47 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}"> 47 <block wx:if="{{item.is_type == '3' || item.is_type == '4'}}">
48 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view> 48 <view wx:if="{{item.is_type == '3' && item.aexpiration>0}}" class="bottom font24r">领取后{{item.aexpiration}}天有效</view>
49 - <view wx:if="{{item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view> 49 + <view wx:if="{{item.morText || item.noonText || item.noonText}}" class="bottom font24r">不可用日期：</view>
  50 + <view wx:if="{{item.morText}}" class="bottom font24r nodate">{{item.morText}}</view>
50 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view> 51 <view wx:if="{{item.noonText}}" class="bottom font24r nodate">{{item.noonText}}</view>
51 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view> 52 <view wx:if="{{item.nigText}}" class="bottom font24r nodate">{{item.nigText}}</view>
52 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view> 53 <view wx:if="{{item.exp_date.week_show=='无'}}" class="bottom font24r">无使用时间限制</view>