Showing
1 changed file
with
6 additions
and
4 deletions
| @@ -312,7 +312,7 @@ Page({ | @@ -312,7 +312,7 @@ Page({ | ||
| 312 | let data=res.data | 312 | let data=res.data |
| 313 | console.log('data',data); | 313 | console.log('data',data); |
| 314 | let coupon_dataList=[] | 314 | let coupon_dataList=[] |
| 315 | - let home,chef,marketing,reserve,swich_phone,is_comments,signboard,store,homeColor,priceInfo,certificate,scoreInfo,recharge_list,stringifyUse; | 315 | + let home,chef,marketing,coupon,reserve,swich_phone,is_comments,signboard,store,homeColor,priceInfo,certificate,scoreInfo,recharge_list,stringifyUse; |
| 316 | chef = util.determine(data.chef); | 316 | chef = util.determine(data.chef); |
| 317 | reserve = util.determine(data.reserve); | 317 | reserve = util.determine(data.reserve); |
| 318 | marketing = util.determine(data.marketing); | 318 | marketing = util.determine(data.marketing); |
| @@ -320,9 +320,11 @@ Page({ | @@ -320,9 +320,11 @@ Page({ | ||
| 320 | store = util.determine(data.store); | 320 | store = util.determine(data.store); |
| 321 | home = util.determine(data.home); | 321 | home = util.determine(data.home); |
| 322 | swich_phone = reserve && reserve.swich_phone?reserve.swich_phone:''; | 322 | swich_phone = reserve && reserve.swich_phone?reserve.swich_phone:''; |
| 323 | - is_comments = marketing && marketing.is_comments?marketing.is_comments:''; | ||
| 324 | - let coupon=marketing?util.determine(marketing.coupon_data):''; | ||
| 325 | - marketing.coupon_data_comments=(marketing && is_comments=='1' && marketing.is_comments_coupon=='1')?util.determine(marketing.coupon_data_comments):''; | 323 | + if(marketing){ |
| 324 | + is_comments = marketing.is_comments?marketing.is_comments:''; | ||
| 325 | + coupon=marketing.coupon_data?util.determine(marketing.coupon_data):''; | ||
| 326 | + marketing.coupon_data_comments=(is_comments=='1' && marketing.is_comments_coupon=='1')?util.determine(marketing.coupon_data_comments):''; | ||
| 327 | + } | ||
| 326 | // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示 | 328 | // is_cash 代金券 is_discount折扣券 is_dish菜品券 只有代金券有几折显示 |
| 327 | if(coupon && util.getType(coupon)=='object'){ | 329 | if(coupon && util.getType(coupon)=='object'){ |
| 328 | coupon.stringifyUse=JSON.stringify(coupon.use) | 330 | coupon.stringifyUse=JSON.stringify(coupon.use) |
-
Please register or login to post a comment