xt / xcx-book · Commits

Go to a project

Commit a97ee325242a709a03921510d7b2eb5031a8fdb6

Authored by pengye
1 parent 93c49f11
build: skipped

多时段---提前点菜页、确认菜品页、邀请函入口页、邀请函2-22用餐时间显示、修改到店时间、分享卡片

Inline Side-by-side
Showing 22 changed files with 1055 additions and 341 deletions
@@ -85,18 +85,65 @@ Page({ @@ -85,18 +85,65 @@ Page({
85 }) 85 })
86 let reserev = RS.reserve(res.data) 86 let reserev = RS.reserve(res.data)
87 let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II'); 87 let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
88 - let daily=reserev.seller.daily; 88 + this.setData({
  89 + seller: {
  90 + soltName: reserev.soltName,
  91 + date: dateSmart,
  92 + tableNum: res.data.actual_pum ? res.data.actual_pum : '',
  93 + tablesText
  94 + },
  95 + })
  96 + this.getLocalLunchTime(obj, reserev)
  97 + }).catch(res => {
  98 + console.log(res, '详情请求失败');
  99 + })
  100 + },
  101 + // 获取日期对应的时段
  102 + getLocalLunchTime(obj, reserev) {
  103 + let ddateStr = new Date(reserev.ddate * 1000)
  104 + let year1 = ddateStr.getFullYear();
  105 + let month1 = ddateStr.getMonth() + 1;
  106 + let day1 = ddateStr.getDate();
  107 + let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + day1;
  108 + App.Seller.getMealSectionByDay({
  109 + sellerid: reserev.sid,
  110 + day: day2,
  111 + }).then(res => {
  112 + let data = res.data;
  113 + let lunchDinnerList = [];
  114 + if (data.length <= 3 && !data[0].ddate_solt) {
  115 + data.forEach(i => {
  116 + if (i.mname == '早餐') {
  117 + lunchDinnerList.push({
  118 + mname: "早餐",
  119 + mdate: i.mdate,
  120 + ddate_solt: 1,
  121 + })
  122 + }
  123 + if (i.mname == '午餐') {
  124 + lunchDinnerList.push({
  125 + mname: "午餐",
  126 + mdate: i.mdate,
  127 + ddate_solt: 2,
  128 + })
  129 + }
  130 + if (i.mname == '晚餐') {
  131 + lunchDinnerList.push({
  132 + mname: "晚餐",
  133 + mdate: i.mdate,
  134 + ddate_solt: 3,
  135 + })
  136 + }
  137 + })
  138 + } else {
  139 + lunchDinnerList = data;
  140 + }
89 let time; 141 let time;
90 - switch (reserev.ddate_solt) {  
91 - case '1':  
92 - time=daily.morning.split("-")[1];  
93 - break;  
94 - case '2':  
95 - time=daily.noon.split("-")[1];  
96 - break;  
97 - case '3':  
98 - time=daily.night.split("-")[1];  
99 - break; 142 + let obj1 = lunchDinnerList.filter(i => {
  143 + return i.ddate_solt == reserev.ddate_solt
  144 + })
  145 + if (obj1 && obj1.length > 0) {
  146 + time = obj1[0].mdate.split('-')[1];
100 } 147 }
101 let timeHour=time.split(":")[0];//预订日期--预订餐段的截止时间--小时 148 let timeHour=time.split(":")[0];//预订日期--预订餐段的截止时间--小时
102 let timeMinute=time.split(":")[1];//预订日期--预订餐段的截止时间--分钟 149 let timeMinute=time.split(":")[1];//预订日期--预订餐段的截止时间--分钟
@@ -107,19 +154,13 @@ Page({ @@ -107,19 +154,13 @@ Page({
107 // 是否可以下单（超过该预订的餐段截止时间，不可以下单） 154 // 是否可以下单（超过该预订的餐段截止时间，不可以下单）
108 let isOrder=this.isCurrentTimeGreaterThan(year,month,day,timeHour*1,timeMinute*1) 155 let isOrder=this.isCurrentTimeGreaterThan(year,month,day,timeHour*1,timeMinute*1)
109 this.setData({ 156 this.setData({
110 - seller: {  
111 - soltName: reserev.soltName,  
112 - date: dateSmart,  
113 - tableNum:res.data.actual_pum?res.data.actual_pum:'',  
114 - tablesText  
115 - },  
116 isOrder, 157 isOrder,
117 }) 158 })
118 setTimeout(() => { 159 setTimeout(() => {
119 this.getCheckCookList(obj) 160 this.getCheckCookList(obj)
120 },100) 161 },100)
121 }).catch(res => { 162 }).catch(res => {
122 - console.log(res, '详情请求失败'); 163 + console.log(res, '获取多时段失败');
123 }) 164 })
124 }, 165 },
125 // 判断是否超过该预订的餐段截止时间 166 // 判断是否超过该预订的餐段截止时间
@@ -13,6 +13,7 @@ Page({ @@ -13,6 +13,7 @@ Page({
13 vipProbablyPrice: '', 13 vipProbablyPrice: '',
14 notes: '', 14 notes: '',
15 tpls: [], 15 tpls: [],
  16 + reserev:{},
16 seller: {}, 17 seller: {},
17 options: {}, 18 options: {},
18 rechargeList:[], 19 rechargeList:[],
@@ -426,30 +427,54 @@ Page({ @@ -426,30 +427,54 @@ Page({
426 if (this.data.changeType == '1') { 427 if (this.data.changeType == '1') {
427 return this.myToast.showToast('您的订单已经下达给商家，如果需要改菜需和商家确认，以免产生误解。', 3000) 428 return this.myToast.showToast('您的订单已经下达给商家，如果需要改菜需和商家确认，以免产生误解。', 3000)
428 } 429 }
429 - App.Reserve.Detail({  
430 - rid: this.data.options.rid 430 + let ddateStr = new Date(this.data.reserev.ddate * 1000)
  431 + let year = ddateStr.getFullYear();
  432 + let month = ddateStr.getMonth() + 1;
  433 + let day = ddateStr.getDate();
  434 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  435 + // 获取日期对应的时段
  436 + App.Seller.getMealSectionByDay({
  437 + sellerid: this.data.options.sid,
  438 + day: day1,
431 }).then(res => { 439 }).then(res => {
432 - let daily = res.data.seller.daily  
433 - let str = ''  
434 - switch (res.data.ddate_solt) {  
435 - case '1':  
436 - str = 'morning'  
437 - break;  
438 - case '2':  
439 - str = 'noon'  
440 - break;  
441 - case '3':  
442 - str = 'night'  
443 - break; 440 + let data = res.data;
  441 + let lunchDinnerList = [];
  442 + if (data.length <= 3 && !data[0].ddate_solt) {
  443 + data.forEach(i => {
  444 + if (i.mname == '早餐') {
  445 + lunchDinnerList.push({
  446 + mname: "早餐",
  447 + mdate: i.mdate,
  448 + ddate_solt: 1,
  449 + })
  450 + }
  451 + if (i.mname == '午餐') {
  452 + lunchDinnerList.push({
  453 + mname: "午餐",
  454 + mdate: i.mdate,
  455 + ddate_solt: 2,
  456 + })
  457 + }
  458 + if (i.mname == '晚餐') {
  459 + lunchDinnerList.push({
  460 + mname: "晚餐",
  461 + mdate: i.mdate,
  462 + ddate_solt: 3,
  463 + })
  464 + }
  465 + })
  466 + } else {
  467 + lunchDinnerList = data;
444 } 468 }
445 - const currentTimestamp = Date.now();  
446 let dur; 469 let dur;
447 - Object.keys(daily).forEach(k => {  
448 - if (k == str) {  
449 - dur = daily[k].split('-')[0];  
450 - } 470 + const currentTimestamp = Date.now();
  471 + let obj = lunchDinnerList.filter(i => {
  472 + return i.ddate_solt == this.data.reserev.ddate_solt
451 }) 473 })
452 - let ddate = util.unixtoTime(this.data.seller.reserev.ddate, 'YYYY-MM-DD'); 474 + if (obj && obj.length > 0) {
  475 + dur = obj[0].mdate.split('-')[0];
  476 + }
  477 + let ddate = util.unixtoTime(this.data.reserev.ddate, 'YYYY-MM-DD');
453 const dateTimeString = `${ddate}T${dur}:00`; 478 const dateTimeString = `${ddate}T${dur}:00`;
454 const timestamp = new Date(dateTimeString).getTime(); 479 const timestamp = new Date(dateTimeString).getTime();
455 let times = 0; 480 let times = 0;
@@ -513,12 +538,12 @@ Page({ @@ -513,12 +538,12 @@ Page({
513 let reserev = RS.reserve(res.data) 538 let reserev = RS.reserve(res.data)
514 let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II'); 539 let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
515 this.setData({ 540 this.setData({
  541 + reserev,
516 seller: { 542 seller: {
517 soltName: reserev.soltName, 543 soltName: reserev.soltName,
518 date: dateSmart, 544 date: dateSmart,
519 tableNum:res.data.actual_pum?res.data.actual_pum:'', 545 tableNum:res.data.actual_pum?res.data.actual_pum:'',
520 tablesText, 546 tablesText,
521 - reserev,  
522 map_address:reserev.seller.map_address, 547 map_address:reserev.seller.map_address,
523 } 548 }
524 }) 549 })
@@ -52,6 +52,7 @@ Page({ @@ -52,6 +52,7 @@ Page({
52 imgSrc: '', //canvas图片地址 52 imgSrc: '', //canvas图片地址
53 couponData: '', //评价赠送优惠券数据 53 couponData: '', //评价赠送优惠券数据
54 timeList: [], //餐段时间 54 timeList: [], //餐段时间
  55 + isMany:'0',//0默认餐段 1多时段
55 temp_ddate: '', //展示的到店时间 56 temp_ddate: '', //展示的到店时间
56 lite_style: '', //小程序转发卡片样式 57 lite_style: '', //小程序转发卡片样式
57 isMoreBtn: '', //再次预订按钮 58 isMoreBtn: '', //再次预订按钮
@@ -292,8 +293,8 @@ Page({ @@ -292,8 +293,8 @@ Page({
292 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 293 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
293 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 294 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
294 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 295 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
295 - console.log('dateSmart', dateSmart);  
296 let detail = this.formatDatail(reserev, dateSmart) 296 let detail = this.formatDatail(reserev, dateSmart)
  297 + reserev.soltName = '';
297 this.setData({ 298 this.setData({
298 detail, 299 detail,
299 tableNum, 300 tableNum,
@@ -323,7 +324,7 @@ Page({ @@ -323,7 +324,7 @@ Page({
323 is_set_ddate: reserev.is_set_ddate, 324 is_set_ddate: reserev.is_set_ddate,
324 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 325 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
325 tel: reserev.seller.seller_tel.split(','), 326 tel: reserev.seller.seller_tel.split(','),
326 - soltName: reserev.soltName, 327 + soltName: reserev.soltName || detail.mname,
327 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), 328 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
328 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 329 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
329 lat: reserev.seller.lat, 330 lat: reserev.seller.lat,
@@ -529,13 +530,14 @@ Page({ @@ -529,13 +530,14 @@ Page({
529 let type1 = style[0]; 530 let type1 = style[0];
530 let type2 = style[1]; 531 let type2 = style[1];
531 let data = this.data.detail; 532 let data = this.data.detail;
  533 + let isMany = this.data.isMany;
532 let img = data.seller.seller_image.replace(/^http:/, "https:"); 534 let img = data.seller.seller_image.replace(/^http:/, "https:");
533 let d = data.ddate_solt; 535 let d = data.ddate_solt;
534 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 536 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
535 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 537 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
536 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 538 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
537 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
538 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 539 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  540 + let timeSlot2 = ' ' + this.data.seller.soltName;
539 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 541 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
540 time = timeStr ? timeStr : time; 542 time = timeStr ? timeStr : time;
541 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 543 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -553,7 +555,7 @@ Page({ @@ -553,7 +555,7 @@ Page({
553 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 555 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
554 } 556 }
555 if (type1 == '3' || type1 == '4') { 557 if (type1 == '3' || type1 == '4') {
556 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 558 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
557 } 559 }
558 } 560 }
559 this.setData({ 561 this.setData({
@@ -684,16 +686,7 @@ Page({ @@ -684,16 +686,7 @@ Page({
684 if (store) store = this.processInfo(store, '2') 686 if (store) store = this.processInfo(store, '2')
685 if (signboard) signboard = this.processInfo(signboard, '3') 687 if (signboard) signboard = this.processInfo(signboard, '3')
686 if (chef) chef = this.processInfo(chef, '4') 688 if (chef) chef = this.processInfo(chef, '4')
687 - let solt = this.data.detail.ddate_solt;  
688 - let lunchDis = this.data.seller.daily;  
689 - let timeList = []  
690 - var morningStr = lunchDis.morning.split("-");  
691 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
692 - var noonStr = lunchDis.noon.split("-");  
693 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
694 - var nightStr = lunchDis.night.split("-");  
695 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
696 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 689 + this.getLocalLunchTime(data.lite_style);
697 let obj = { 690 let obj = {
698 chef, 691 chef,
699 marketing, 692 marketing,
@@ -704,7 +697,6 @@ Page({ @@ -704,7 +697,6 @@ Page({
704 swich_phone, 697 swich_phone,
705 StyleType, 698 StyleType,
706 lite_style: data.lite_style, 699 lite_style: data.lite_style,
707 - timeList,  
708 is_comments, 700 is_comments,
709 couponList, 701 couponList,
710 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1', 702 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
@@ -725,19 +717,78 @@ Page({ @@ -725,19 +717,78 @@ Page({
725 }) 717 })
726 this.textToSpeechFun(reserve.voice_info) 718 this.textToSpeechFun(reserve.voice_info)
727 } 719 }
728 - // 获取转发客人卡片设置  
729 - let detailInfo = this.data.detail;  
730 - data.lite_style = data.lite_style || '3';  
731 - let liteStyle = data.lite_style.split('-');  
732 - if (liteStyle[0] == '0') {  
733 - this.setData({  
734 - imgSrc: detailInfo.seller.seller_image 720 + }).catch(res => {
  721 + console.log('GetSellerTemplateConf请求失败');
  722 + })
  723 + },
  724 + // 获取日期对应的时段
  725 + getLocalLunchTime(lite_style) {
  726 + let detail = this.data.detail;
  727 + let ddateStr = new Date(detail.ddate * 1000);
  728 + let year = ddateStr.getFullYear();
  729 + let month = ddateStr.getMonth() + 1;
  730 + let day = ddateStr.getDate();
  731 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  732 + App.Seller.getMealSectionByDay({
  733 + sellerid: detail.seller.id,
  734 + day: day1,
  735 + }).then(res => {
  736 + let data = res.data;
  737 + let lunchDinnerList = [];
  738 + let isMany = '0';//0默认餐段 1多时段
  739 + if (data.length <= 3 && !data[0].ddate_solt) {
  740 + isMany = '0';
  741 + data.forEach(i => {
  742 + if (i.mname == '早餐') {
  743 + lunchDinnerList.push({
  744 + mname: "早餐",
  745 + mdate: i.mdate,
  746 + ddate_solt: 1,
  747 + })
  748 + }
  749 + if (i.mname == '午餐') {
  750 + lunchDinnerList.push({
  751 + mname: "午餐",
  752 + mdate: i.mdate,
  753 + ddate_solt: 2,
  754 + })
  755 + }
  756 + if (i.mname == '晚餐') {
  757 + lunchDinnerList.push({
  758 + mname: "晚餐",
  759 + mdate: i.mdate,
  760 + ddate_solt: 3,
  761 + })
  762 + }
735 }) 763 })
736 } else { 764 } else {
737 - this.painterBtn(data.lite_style); 765 + isMany = '1';
  766 + lunchDinnerList = data;
  767 + }
  768 + let obj = lunchDinnerList.filter(i => {
  769 + return i.ddate_solt == detail.ddate_solt
  770 + })
  771 + var timeList = [];
  772 + if (obj && obj.length > 0) {
  773 + var time = obj[0].mdate.split("-");
  774 + timeList = this.computeHour(time[0], time[1], 15);
738 } 775 }
  776 + this.setData({
  777 + timeList,
  778 + isMany,
  779 + })
  780 + // 获取转发客人卡片设置
  781 + let lite = lite_style || '3';
  782 + let liteStyle = lite.split('-');
  783 + if (liteStyle[0] == '0') {
  784 + this.setData({
  785 + imgSrc: detail.seller.seller_image
  786 + })
  787 + } else {
  788 + this.painterBtn(lite);
  789 + }
739 }).catch(res => { 790 }).catch(res => {
740 - console.log('GetSellerTemplateConf请求失败'); 791 + console.log(res, '获取多时段失败');
741 }) 792 })
742 }, 793 },
743 // 点击商家有礼 794 // 点击商家有礼
@@ -65,6 +65,11 @@ @@ -65,6 +65,11 @@
65 font-family: PingFang SC; 65 font-family: PingFang SC;
66 margin-left: 4rpx; 66 margin-left: 4rpx;
67 font-weight: 600; 67 font-weight: 600;
  68 + display: -webkit-box;
  69 + word-break: break-all;
  70 + word-wrap: break-word;
  71 + overflow: hidden;
  72 + text-align: left;
68 } 73 }
69 74
70 .contentDataPhone { 75 .contentDataPhone {
@@ -51,6 +51,7 @@ Page({ @@ -51,6 +51,7 @@ Page({
51 colors: '', //导航栏颜色 51 colors: '', //导航栏颜色
52 couponData: '', //评价赠送优惠券数据 52 couponData: '', //评价赠送优惠券数据
53 timeList: [], //餐段时间 53 timeList: [], //餐段时间
  54 + isMany:'0',//0默认餐段 1多时段
54 temp_ddate: '', //展示的到店时间 55 temp_ddate: '', //展示的到店时间
55 lite_style: '', //小程序转发卡片样式 56 lite_style: '', //小程序转发卡片样式
56 isMoreBtn: '', //再次预订按钮 57 isMoreBtn: '', //再次预订按钮
@@ -320,8 +321,8 @@ Page({ @@ -320,8 +321,8 @@ Page({
320 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 321 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
321 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 322 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
322 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 323 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
323 - console.log('dateSmart', dateSmart);  
324 let detail = this.formatDatail(reserev, dateSmart) 324 let detail = this.formatDatail(reserev, dateSmart)
  325 + reserev.soltName = '';
325 this.setData({ 326 this.setData({
326 detail, 327 detail,
327 tableNum, 328 tableNum,
@@ -342,7 +343,7 @@ Page({ @@ -342,7 +343,7 @@ Page({
342 is_set_ddate: reserev.is_set_ddate, 343 is_set_ddate: reserev.is_set_ddate,
343 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 344 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
344 tel: reserev.seller.seller_tel.split(','), 345 tel: reserev.seller.seller_tel.split(','),
345 - soltName: reserev.soltName, 346 + soltName: reserev.soltName || detail.mname,
346 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), 347 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
347 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 348 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
348 lat: reserev.seller.lat, 349 lat: reserev.seller.lat,
@@ -546,13 +547,14 @@ Page({ @@ -546,13 +547,14 @@ Page({
546 let type1 = style[0]; 547 let type1 = style[0];
547 let type2 = style[1]; 548 let type2 = style[1];
548 let data = this.data.detail; 549 let data = this.data.detail;
  550 + let isMany = this.data.isMany;
549 let img = data.seller.seller_image.replace(/^http:/, "https:"); 551 let img = data.seller.seller_image.replace(/^http:/, "https:");
550 let d = data.ddate_solt; 552 let d = data.ddate_solt;
551 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 553 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
552 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 554 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
553 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 555 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
554 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
555 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 556 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  557 + let timeSlot2 = ' ' + this.data.seller.soltName;
556 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 558 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
557 time = timeStr ? timeStr : time; 559 time = timeStr ? timeStr : time;
558 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 560 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -570,7 +572,7 @@ Page({ @@ -570,7 +572,7 @@ Page({
570 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 572 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
571 } 573 }
572 if (type1 == '3' || type1 == '4') { 574 if (type1 == '3' || type1 == '4') {
573 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 575 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
574 } 576 }
575 } 577 }
576 this.setData({ 578 this.setData({
@@ -699,16 +701,7 @@ Page({ @@ -699,16 +701,7 @@ Page({
699 if (store) store = this.processInfo(store, '2') 701 if (store) store = this.processInfo(store, '2')
700 if (signboard) signboard = this.processInfo(signboard, '3') 702 if (signboard) signboard = this.processInfo(signboard, '3')
701 if (chef) chef = this.processInfo(chef, '4') 703 if (chef) chef = this.processInfo(chef, '4')
702 - let solt = this.data.detail.ddate_solt;  
703 - let lunchDis = this.data.seller.daily;  
704 - let timeList = []  
705 - var morningStr = lunchDis.morning.split("-");  
706 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
707 - var noonStr = lunchDis.noon.split("-");  
708 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
709 - var nightStr = lunchDis.night.split("-");  
710 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
711 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 704 + this.getLocalLunchTime(data.lite_style);
712 let bookType = this.data.bookType; 705 let bookType = this.data.bookType;
713 let urlsArr = this.data.urlsArr 706 let urlsArr = this.data.urlsArr
714 marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : '' 707 marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
@@ -724,7 +717,6 @@ Page({ @@ -724,7 +717,6 @@ Page({
724 swich_phone, 717 swich_phone,
725 StyleType, 718 StyleType,
726 lite_style: data.lite_style, 719 lite_style: data.lite_style,
727 - timeList,  
728 is_comments, 720 is_comments,
729 couponList, 721 couponList,
730 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1', 722 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
@@ -747,19 +739,78 @@ Page({ @@ -747,19 +739,78 @@ Page({
747 }) 739 })
748 this.textToSpeechFun(reserve.voice_info) 740 this.textToSpeechFun(reserve.voice_info)
749 } 741 }
750 - // 获取转发客人卡片设置  
751 - let detailInfo = this.data.detail;  
752 - data.lite_style = data.lite_style || '3';  
753 - let liteStyle = data.lite_style.split('-');  
754 - if (liteStyle[0] == '0') {  
755 - this.setData({  
756 - imgSrc: detailInfo.seller.seller_image 742 + }).catch(res => {
  743 + console.log('GetSellerTemplateConf请求失败');
  744 + })
  745 + },
  746 + // 获取日期对应的时段
  747 + getLocalLunchTime(lite_style) {
  748 + let detail = this.data.detail;
  749 + let ddateStr = new Date(detail.ddate * 1000);
  750 + let year = ddateStr.getFullYear();
  751 + let month = ddateStr.getMonth() + 1;
  752 + let day = ddateStr.getDate();
  753 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  754 + App.Seller.getMealSectionByDay({
  755 + sellerid: detail.seller.id,
  756 + day: day1,
  757 + }).then(res => {
  758 + let data = res.data;
  759 + let lunchDinnerList = [];
  760 + let isMany = '0';//0默认餐段 1多时段
  761 + if (data.length <= 3 && !data[0].ddate_solt) {
  762 + isMany = '0';
  763 + data.forEach(i => {
  764 + if (i.mname == '早餐') {
  765 + lunchDinnerList.push({
  766 + mname: "早餐",
  767 + mdate: i.mdate,
  768 + ddate_solt: 1,
  769 + })
  770 + }
  771 + if (i.mname == '午餐') {
  772 + lunchDinnerList.push({
  773 + mname: "午餐",
  774 + mdate: i.mdate,
  775 + ddate_solt: 2,
  776 + })
  777 + }
  778 + if (i.mname == '晚餐') {
  779 + lunchDinnerList.push({
  780 + mname: "晚餐",
  781 + mdate: i.mdate,
  782 + ddate_solt: 3,
  783 + })
  784 + }
757 }) 785 })
758 } else { 786 } else {
759 - this.painterBtn(data.lite_style); 787 + isMany = '1';
  788 + lunchDinnerList = data;
  789 + }
  790 + let obj = lunchDinnerList.filter(i => {
  791 + return i.ddate_solt == detail.ddate_solt
  792 + })
  793 + var timeList = [];
  794 + if (obj && obj.length > 0) {
  795 + var time = obj[0].mdate.split("-");
  796 + timeList = this.computeHour(time[0], time[1], 15);
760 } 797 }
  798 + this.setData({
  799 + timeList,
  800 + isMany,
  801 + })
  802 + // 获取转发客人卡片设置
  803 + let lite = lite_style || '3';
  804 + let liteStyle = lite.split('-');
  805 + if (liteStyle[0] == '0') {
  806 + this.setData({
  807 + imgSrc: detail.seller.seller_image
  808 + })
  809 + } else {
  810 + this.painterBtn(lite);
  811 + }
761 }).catch(res => { 812 }).catch(res => {
762 - console.log('GetSellerTemplateConf请求失败'); 813 + console.log(res, '获取多时段失败');
763 }) 814 })
764 }, 815 },
765 // 点击商家有礼 816 // 点击商家有礼
@@ -51,6 +51,7 @@ Page({ @@ -51,6 +51,7 @@ Page({
51 colors: '', //导航栏颜色 51 colors: '', //导航栏颜色
52 couponData: '', //评价赠送优惠券数据 52 couponData: '', //评价赠送优惠券数据
53 timeList: [], //餐段时间 53 timeList: [], //餐段时间
  54 + isMany:'0',//0默认餐段 1多时段
54 temp_ddate: '', //展示的到店时间 55 temp_ddate: '', //展示的到店时间
55 lite_style: '', //小程序转发卡片样式 56 lite_style: '', //小程序转发卡片样式
56 isMoreBtn: '', //再次预订按钮 57 isMoreBtn: '', //再次预订按钮
@@ -328,8 +329,8 @@ Page({ @@ -328,8 +329,8 @@ Page({
328 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 329 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
329 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 330 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
330 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 331 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
331 - console.log('dateSmart', dateSmart);  
332 let detail = this.formatDatail(reserev, dateSmart) 332 let detail = this.formatDatail(reserev, dateSmart)
  333 + reserev.soltName = '';
333 this.setData({ 334 this.setData({
334 detail, 335 detail,
335 tableNum, 336 tableNum,
@@ -350,7 +351,7 @@ Page({ @@ -350,7 +351,7 @@ Page({
350 is_set_ddate: reserev.is_set_ddate, 351 is_set_ddate: reserev.is_set_ddate,
351 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 352 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
352 tel: reserev.seller.seller_tel.split(','), 353 tel: reserev.seller.seller_tel.split(','),
353 - soltName: reserev.soltName, 354 + soltName: reserev.soltName || detail.mname,
354 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), 355 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
355 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 356 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
356 lat: reserev.seller.lat, 357 lat: reserev.seller.lat,
@@ -555,13 +556,14 @@ Page({ @@ -555,13 +556,14 @@ Page({
555 let type1 = style[0]; 556 let type1 = style[0];
556 let type2 = style[1]; 557 let type2 = style[1];
557 let data = this.data.detail; 558 let data = this.data.detail;
  559 + let isMany = this.data.isMany;
558 let img = data.seller.seller_image.replace(/^http:/, "https:"); 560 let img = data.seller.seller_image.replace(/^http:/, "https:");
559 let d = data.ddate_solt; 561 let d = data.ddate_solt;
560 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 562 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
561 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 563 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
562 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 564 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
563 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
564 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 565 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  566 + let timeSlot2 = ' ' + this.data.seller.soltName;
565 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 567 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
566 time = timeStr ? timeStr : time; 568 time = timeStr ? timeStr : time;
567 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 569 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -579,7 +581,7 @@ Page({ @@ -579,7 +581,7 @@ Page({
579 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 581 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
580 } 582 }
581 if (type1 == '3' || type1 == '4') { 583 if (type1 == '3' || type1 == '4') {
582 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 584 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
583 } 585 }
584 } 586 }
585 this.setData({ 587 this.setData({
@@ -708,16 +710,7 @@ Page({ @@ -708,16 +710,7 @@ Page({
708 if (store) store = this.processInfo(store, '2') 710 if (store) store = this.processInfo(store, '2')
709 if (signboard) signboard = this.processInfo(signboard, '3') 711 if (signboard) signboard = this.processInfo(signboard, '3')
710 if (chef) chef = this.processInfo(chef, '4') 712 if (chef) chef = this.processInfo(chef, '4')
711 - let solt = this.data.detail.ddate_solt;  
712 - let lunchDis = this.data.seller.daily;  
713 - let timeList = []  
714 - var morningStr = lunchDis.morning.split("-");  
715 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
716 - var noonStr = lunchDis.noon.split("-");  
717 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
718 - var nightStr = lunchDis.night.split("-");  
719 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
720 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 713 + this.getLocalLunchTime(data.lite_style);
721 let bookType = this.data.bookType; 714 let bookType = this.data.bookType;
722 let urlsArr = this.data.urlsArr 715 let urlsArr = this.data.urlsArr
723 marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : '' 716 marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
@@ -733,7 +726,6 @@ Page({ @@ -733,7 +726,6 @@ Page({
733 swich_phone, 726 swich_phone,
734 StyleType, 727 StyleType,
735 lite_style: data.lite_style, 728 lite_style: data.lite_style,
736 - timeList,  
737 is_comments, 729 is_comments,
738 couponList, 730 couponList,
739 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1', 731 isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
@@ -756,19 +748,78 @@ Page({ @@ -756,19 +748,78 @@ Page({
756 }) 748 })
757 this.textToSpeechFun(reserve.voice_info) 749 this.textToSpeechFun(reserve.voice_info)
758 } 750 }
759 - // 获取转发客人卡片设置  
760 - let detailInfo = this.data.detail;  
761 - data.lite_style = data.lite_style || '3';  
762 - let liteStyle = data.lite_style.split('-');  
763 - if (liteStyle[0] == '0') {  
764 - this.setData({  
765 - imgSrc: detailInfo.seller.seller_image 751 + }).catch(res => {
  752 + console.log('GetSellerTemplateConf请求失败');
  753 + })
  754 + },
  755 + // 获取日期对应的时段
  756 + getLocalLunchTime(lite_style) {
  757 + let detail = this.data.detail;
  758 + let ddateStr = new Date(detail.ddate * 1000);
  759 + let year = ddateStr.getFullYear();
  760 + let month = ddateStr.getMonth() + 1;
  761 + let day = ddateStr.getDate();
  762 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  763 + App.Seller.getMealSectionByDay({
  764 + sellerid: detail.seller.id,
  765 + day: day1,
  766 + }).then(res => {
  767 + let data = res.data;
  768 + let lunchDinnerList = [];
  769 + let isMany = '0';//0默认餐段 1多时段
  770 + if (data.length <= 3 && !data[0].ddate_solt) {
  771 + isMany = '0';
  772 + data.forEach(i => {
  773 + if (i.mname == '早餐') {
  774 + lunchDinnerList.push({
  775 + mname: "早餐",
  776 + mdate: i.mdate,
  777 + ddate_solt: 1,
  778 + })
  779 + }
  780 + if (i.mname == '午餐') {
  781 + lunchDinnerList.push({
  782 + mname: "午餐",
  783 + mdate: i.mdate,
  784 + ddate_solt: 2,
  785 + })
  786 + }
  787 + if (i.mname == '晚餐') {
  788 + lunchDinnerList.push({
  789 + mname: "晚餐",
  790 + mdate: i.mdate,
  791 + ddate_solt: 3,
  792 + })
  793 + }
766 }) 794 })
767 } else { 795 } else {
768 - this.painterBtn(data.lite_style); 796 + isMany = '1';
  797 + lunchDinnerList = data;
  798 + }
  799 + let obj = lunchDinnerList.filter(i => {
  800 + return i.ddate_solt == detail.ddate_solt
  801 + })
  802 + var timeList = [];
  803 + if (obj && obj.length > 0) {
  804 + var time = obj[0].mdate.split("-");
  805 + timeList = this.computeHour(time[0], time[1], 15);
769 } 806 }
  807 + this.setData({
  808 + timeList,
  809 + isMany,
  810 + })
  811 + // 获取转发客人卡片设置
  812 + let lite = lite_style || '3';
  813 + let liteStyle = lite.split('-');
  814 + if (liteStyle[0] == '0') {
  815 + this.setData({
  816 + imgSrc: detail.seller.seller_image
  817 + })
  818 + } else {
  819 + this.painterBtn(lite);
  820 + }
770 }).catch(res => { 821 }).catch(res => {
771 - console.log('GetSellerTemplateConf请求失败'); 822 + console.log(res, '获取多时段失败');
772 }) 823 })
773 }, 824 },
774 // 点击商家有礼 825 // 点击商家有礼
@@ -61,6 +61,7 @@ Page({ @@ -61,6 +61,7 @@ Page({
61 imgSrc:'',//canvas图片地址 61 imgSrc:'',//canvas图片地址
62 couponData: '', //评价赠送优惠券数据 62 couponData: '', //评价赠送优惠券数据
63 timeList: [], 63 timeList: [],
  64 + isMany:'0',//0默认餐段 1多时段
64 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
66 isMoreBtn:'',//再次预订按钮 67 isMoreBtn:'',//再次预订按钮
@@ -289,9 +290,10 @@ Page({ @@ -289,9 +290,10 @@ Page({
289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 290 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 291 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 292 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
292 - console.log('dateSmart', dateSmart); 293 + let detail = this.formatDatail(reserev, dateSmart)
  294 + reserev.soltName = '';
293 this.setData({ 295 this.setData({
294 - detail: this.formatDatail(reserev, dateSmart), 296 + detail,
295 tableNum, 297 tableNum,
296 tableinfo, 298 tableinfo,
297 is_user_comments: res.data.is_user_comments, 299 is_user_comments: res.data.is_user_comments,
@@ -309,7 +311,7 @@ Page({ @@ -309,7 +311,7 @@ Page({
309 is_set_ddate: reserev.is_set_ddate, 311 is_set_ddate: reserev.is_set_ddate,
310 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 312 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
311 tel: reserev.seller.seller_tel.split(','), 313 tel: reserev.seller.seller_tel.split(','),
312 - soltName: reserev.soltName, 314 + soltName: reserev.soltName || detail.mname,
313 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 315 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
314 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 316 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
315 lat: reserev.seller.lat, 317 lat: reserev.seller.lat,
@@ -514,13 +516,14 @@ Page({ @@ -514,13 +516,14 @@ Page({
514 let type1 = style[0]; 516 let type1 = style[0];
515 let type2 = style[1]; 517 let type2 = style[1];
516 let data = this.data.detail; 518 let data = this.data.detail;
  519 + let isMany = this.data.isMany;
517 let img = data.seller.seller_image.replace(/^http:/, "https:"); 520 let img = data.seller.seller_image.replace(/^http:/, "https:");
518 let d = data.ddate_solt; 521 let d = data.ddate_solt;
519 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 522 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
520 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 523 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
521 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 524 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
522 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
523 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 525 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  526 + let timeSlot2 = ' ' + this.data.seller.soltName;
524 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 527 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
525 time = timeStr ? timeStr : time; 528 time = timeStr ? timeStr : time;
526 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 529 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -538,7 +541,7 @@ Page({ @@ -538,7 +541,7 @@ Page({
538 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 541 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
539 } 542 }
540 if (type1 == '3' || type1 == '4') { 543 if (type1 == '3' || type1 == '4') {
541 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 544 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
542 } 545 }
543 } 546 }
544 this.setData({ 547 this.setData({
@@ -713,16 +716,7 @@ Page({ @@ -713,16 +716,7 @@ Page({
713 themeSixteen = '#fbf6f1' 716 themeSixteen = '#fbf6f1'
714 break; 717 break;
715 } 718 }
716 - let solt = this.data.detail.ddate_solt;  
717 - let lunchDis = this.data.seller.daily;  
718 - let timeList = []  
719 - var morningStr = lunchDis.morning.split("-");  
720 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
721 - var noonStr = lunchDis.noon.split("-");  
722 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
723 - var nightStr = lunchDis.night.split("-");  
724 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
725 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 719 + this.getLocalLunchTime(data.lite_style);
726 let obj = { 720 let obj = {
727 chef, 721 chef,
728 marketing, 722 marketing,
@@ -737,7 +731,6 @@ Page({ @@ -737,7 +731,6 @@ Page({
737 themeColor, 731 themeColor,
738 themeSixteen, 732 themeSixteen,
739 lite_style:data.lite_style, 733 lite_style:data.lite_style,
740 - timeList,  
741 couponList, 734 couponList,
742 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 735 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
743 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 736 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -755,21 +748,80 @@ Page({ @@ -755,21 +748,80 @@ Page({
755 }) 748 })
756 this.textToSpeechFun(reserve.voice_info) 749 this.textToSpeechFun(reserve.voice_info)
757 } 750 }
  751 + }).catch(res => {
  752 + console.log('GetSellerTemplateConf请求失败');
  753 + })
  754 + },
  755 + // 获取日期对应的时段
  756 + getLocalLunchTime(lite_style) {
  757 + let detail = this.data.detail;
  758 + let ddateStr = new Date(detail.ddate * 1000);
  759 + let year = ddateStr.getFullYear();
  760 + let month = ddateStr.getMonth() + 1;
  761 + let day = ddateStr.getDate();
  762 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  763 + App.Seller.getMealSectionByDay({
  764 + sellerid: detail.seller.id,
  765 + day: day1,
  766 + }).then(res => {
  767 + let data = res.data;
  768 + let lunchDinnerList = [];
  769 + let isMany = '0';//0默认餐段 1多时段
  770 + if (data.length <= 3 && !data[0].ddate_solt) {
  771 + isMany = '0';
  772 + data.forEach(i => {
  773 + if (i.mname == '早餐') {
  774 + lunchDinnerList.push({
  775 + mname: "早餐",
  776 + mdate: i.mdate,
  777 + ddate_solt: 1,
  778 + })
  779 + }
  780 + if (i.mname == '午餐') {
  781 + lunchDinnerList.push({
  782 + mname: "午餐",
  783 + mdate: i.mdate,
  784 + ddate_solt: 2,
  785 + })
  786 + }
  787 + if (i.mname == '晚餐') {
  788 + lunchDinnerList.push({
  789 + mname: "晚餐",
  790 + mdate: i.mdate,
  791 + ddate_solt: 3,
  792 + })
  793 + }
  794 + })
  795 + } else {
  796 + isMany = '1';
  797 + lunchDinnerList = data;
  798 + }
  799 + let obj = lunchDinnerList.filter(i => {
  800 + return i.ddate_solt == detail.ddate_solt
  801 + })
  802 + var timeList = [];
  803 + if (obj && obj.length > 0) {
  804 + var time = obj[0].mdate.split("-");
  805 + timeList = this.computeHour(time[0], time[1], 15);
  806 + }
  807 + this.setData({
  808 + timeList,
  809 + isMany,
  810 + })
758 // 获取转发客人卡片设置 811 // 获取转发客人卡片设置
759 - let detailInfo = this.data.detail;  
760 - data.lite_style = data.lite_style || '3';  
761 - let liteStyle = data.lite_style.split('-'); 812 + let lite = lite_style || '3';
  813 + let liteStyle = lite.split('-');
762 if (liteStyle[0] == '0') { 814 if (liteStyle[0] == '0') {
763 this.setData({ 815 this.setData({
764 - imgSrc: detailInfo.seller.seller_image 816 + imgSrc: detail.seller.seller_image
765 }) 817 })
766 } else { 818 } else {
767 - this.painterBtn(data.lite_style); 819 + this.painterBtn(lite);
768 } 820 }
769 - }).catch(res => {  
770 - console.log('GetSellerTemplateConf请求失败');  
771 - })  
772 - }, 821 + }).catch(res => {
  822 + console.log(res, '获取多时段失败');
  823 + })
  824 + },
773 // 点击商家有礼 825 // 点击商家有礼
774 gotoSellerGift(e){ 826 gotoSellerGift(e){
775 this.couponModal.closeModal() 827 this.couponModal.closeModal()
@@ -44,6 +44,11 @@ @@ -44,6 +44,11 @@
44 line-height: 60rpx; 44 line-height: 60rpx;
45 font-family: PingFang SC; 45 font-family: PingFang SC;
46 color: #FFD200; 46 color: #FFD200;
  47 + display: -webkit-box;
  48 + word-break: break-all;
  49 + word-wrap: break-word;
  50 + overflow: hidden;
  51 + text-align: left;
47 } 52 }
48 53
49 .handleInfoBox { 54 .handleInfoBox {
@@ -61,6 +61,7 @@ Page({ @@ -61,6 +61,7 @@ Page({
61 imgSrc:'',//canvas图片地址 61 imgSrc:'',//canvas图片地址
62 couponData: '', //评价赠送优惠券数据 62 couponData: '', //评价赠送优惠券数据
63 timeList: [], 63 timeList: [],
  64 + isMany:'0',//0默认餐段 1多时段
64 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
66 isMoreBtn:'',//再次预订按钮 67 isMoreBtn:'',//再次预订按钮
@@ -289,9 +290,10 @@ Page({ @@ -289,9 +290,10 @@ Page({
289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 290 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 291 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 292 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
292 - console.log('dateSmart', dateSmart);  
293 - this.setData({  
294 - detail: this.formatDatail(reserev, dateSmart), 293 + let detail = this.formatDatail(reserev, dateSmart)
  294 + reserev.soltName = '';
  295 + this.setData({
  296 + detail,
295 tableNum, 297 tableNum,
296 tableinfo, 298 tableinfo,
297 is_user_comments: res.data.is_user_comments, 299 is_user_comments: res.data.is_user_comments,
@@ -309,7 +311,7 @@ Page({ @@ -309,7 +311,7 @@ Page({
309 is_set_ddate: reserev.is_set_ddate, 311 is_set_ddate: reserev.is_set_ddate,
310 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 312 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
311 tel: reserev.seller.seller_tel.split(','), 313 tel: reserev.seller.seller_tel.split(','),
312 - soltName: reserev.soltName, 314 + soltName: reserev.soltName || detail.mname,
313 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 315 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
314 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 316 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
315 lat: reserev.seller.lat, 317 lat: reserev.seller.lat,
@@ -514,13 +516,14 @@ Page({ @@ -514,13 +516,14 @@ Page({
514 let type1 = style[0]; 516 let type1 = style[0];
515 let type2 = style[1]; 517 let type2 = style[1];
516 let data = this.data.detail; 518 let data = this.data.detail;
  519 + let isMany = this.data.isMany;
517 let img = data.seller.seller_image.replace(/^http:/, "https:"); 520 let img = data.seller.seller_image.replace(/^http:/, "https:");
518 let d = data.ddate_solt; 521 let d = data.ddate_solt;
519 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 522 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
520 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 523 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
521 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 524 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
522 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
523 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 525 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  526 + let timeSlot2 = ' ' + this.data.seller.soltName;
524 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 527 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
525 time = timeStr ? timeStr : time; 528 time = timeStr ? timeStr : time;
526 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 529 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -538,7 +541,7 @@ Page({ @@ -538,7 +541,7 @@ Page({
538 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 541 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
539 } 542 }
540 if (type1 == '3' || type1 == '4') { 543 if (type1 == '3' || type1 == '4') {
541 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 544 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
542 } 545 }
543 } 546 }
544 this.setData({ 547 this.setData({
@@ -669,16 +672,7 @@ Page({ @@ -669,16 +672,7 @@ Page({
669 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 672 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
670 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 673 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
671 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 674 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
672 - let solt = this.data.detail.ddate_solt;  
673 - let lunchDis = this.data.seller.daily;  
674 - let timeList = []  
675 - var morningStr = lunchDis.morning.split("-");  
676 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
677 - var noonStr = lunchDis.noon.split("-");  
678 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
679 - var nightStr = lunchDis.night.split("-");  
680 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
681 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 675 + this.getLocalLunchTime(data.lite_style);
682 let obj = { 676 let obj = {
683 chef, 677 chef,
684 marketing, 678 marketing,
@@ -692,7 +686,6 @@ Page({ @@ -692,7 +686,6 @@ Page({
692 titleType, 686 titleType,
693 themeColor, 687 themeColor,
694 lite_style:data.lite_style, 688 lite_style:data.lite_style,
695 - timeList,  
696 couponList, 689 couponList,
697 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 690 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
698 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 691 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -710,21 +703,80 @@ Page({ @@ -710,21 +703,80 @@ Page({
710 }) 703 })
711 this.textToSpeechFun(reserve.voice_info) 704 this.textToSpeechFun(reserve.voice_info)
712 } 705 }
  706 + }).catch(res => {
  707 + console.log('GetSellerTemplateConf请求失败');
  708 + })
  709 + },
  710 + // 获取日期对应的时段
  711 + getLocalLunchTime(lite_style) {
  712 + let detail = this.data.detail;
  713 + let ddateStr = new Date(detail.ddate * 1000);
  714 + let year = ddateStr.getFullYear();
  715 + let month = ddateStr.getMonth() + 1;
  716 + let day = ddateStr.getDate();
  717 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  718 + App.Seller.getMealSectionByDay({
  719 + sellerid: detail.seller.id,
  720 + day: day1,
  721 + }).then(res => {
  722 + let data = res.data;
  723 + let lunchDinnerList = [];
  724 + let isMany = '0';//0默认餐段 1多时段
  725 + if (data.length <= 3 && !data[0].ddate_solt) {
  726 + isMany = '0';
  727 + data.forEach(i => {
  728 + if (i.mname == '早餐') {
  729 + lunchDinnerList.push({
  730 + mname: "早餐",
  731 + mdate: i.mdate,
  732 + ddate_solt: 1,
  733 + })
  734 + }
  735 + if (i.mname == '午餐') {
  736 + lunchDinnerList.push({
  737 + mname: "午餐",
  738 + mdate: i.mdate,
  739 + ddate_solt: 2,
  740 + })
  741 + }
  742 + if (i.mname == '晚餐') {
  743 + lunchDinnerList.push({
  744 + mname: "晚餐",
  745 + mdate: i.mdate,
  746 + ddate_solt: 3,
  747 + })
  748 + }
  749 + })
  750 + } else {
  751 + isMany = '1';
  752 + lunchDinnerList = data;
  753 + }
  754 + let obj = lunchDinnerList.filter(i => {
  755 + return i.ddate_solt == detail.ddate_solt
  756 + })
  757 + var timeList = [];
  758 + if (obj && obj.length > 0) {
  759 + var time = obj[0].mdate.split("-");
  760 + timeList = this.computeHour(time[0], time[1], 15);
  761 + }
  762 + this.setData({
  763 + timeList,
  764 + isMany,
  765 + })
713 // 获取转发客人卡片设置 766 // 获取转发客人卡片设置
714 - let detailInfo = this.data.detail;  
715 - data.lite_style = data.lite_style || '3';  
716 - let liteStyle = data.lite_style.split('-'); 767 + let lite = lite_style || '3';
  768 + let liteStyle = lite.split('-');
717 if (liteStyle[0] == '0') { 769 if (liteStyle[0] == '0') {
718 this.setData({ 770 this.setData({
719 - imgSrc: detailInfo.seller.seller_image 771 + imgSrc: detail.seller.seller_image
720 }) 772 })
721 } else { 773 } else {
722 - this.painterBtn(data.lite_style); 774 + this.painterBtn(lite);
723 } 775 }
724 - }).catch(res => {  
725 - console.log('GetSellerTemplateConf请求失败');  
726 - })  
727 - }, 776 + }).catch(res => {
  777 + console.log(res, '获取多时段失败');
  778 + })
  779 + },
728 // 点击商家有礼 780 // 点击商家有礼
729 gotoSellerGift(e){ 781 gotoSellerGift(e){
730 this.couponModal.closeModal() 782 this.couponModal.closeModal()
@@ -157,6 +157,11 @@ @@ -157,6 +157,11 @@
157 font-family: PingFang SC; 157 font-family: PingFang SC;
158 margin-left: 40rpx; 158 margin-left: 40rpx;
159 color: #FFD200; 159 color: #FFD200;
  160 + display: -webkit-box;
  161 + word-break: break-all;
  162 + word-wrap: break-word;
  163 + overflow: hidden;
  164 + text-align: left;
160 } 165 }
161 166
162 .handleInfo { 167 .handleInfo {
@@ -61,6 +61,7 @@ Page({ @@ -61,6 +61,7 @@ Page({
61 imgSrc:'',//canvas图片地址 61 imgSrc:'',//canvas图片地址
62 couponData: '', //评价赠送优惠券数据 62 couponData: '', //评价赠送优惠券数据
63 timeList: [], 63 timeList: [],
  64 + isMany:'0',//0默认餐段 1多时段
64 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
66 isMoreBtn:'',//再次预订按钮 67 isMoreBtn:'',//再次预订按钮
@@ -289,9 +290,10 @@ Page({ @@ -289,9 +290,10 @@ Page({
289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 290 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 291 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 292 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
292 - console.log('dateSmart', dateSmart);  
293 - this.setData({  
294 - detail: this.formatDatail(reserev, dateSmart), 293 + let detail = this.formatDatail(reserev, dateSmart)
  294 + reserev.soltName = '';
  295 + this.setData({
  296 + detail,
295 tableNum, 297 tableNum,
296 tableinfo, 298 tableinfo,
297 is_user_comments: res.data.is_user_comments, 299 is_user_comments: res.data.is_user_comments,
@@ -309,7 +311,7 @@ Page({ @@ -309,7 +311,7 @@ Page({
309 is_set_ddate: reserev.is_set_ddate, 311 is_set_ddate: reserev.is_set_ddate,
310 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 312 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
311 tel: reserev.seller.seller_tel.split(','), 313 tel: reserev.seller.seller_tel.split(','),
312 - soltName: reserev.soltName, 314 + soltName: reserev.soltName || detail.mname,
313 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 315 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
314 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 316 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
315 lat: reserev.seller.lat, 317 lat: reserev.seller.lat,
@@ -514,13 +516,14 @@ Page({ @@ -514,13 +516,14 @@ Page({
514 let type1 = style[0]; 516 let type1 = style[0];
515 let type2 = style[1]; 517 let type2 = style[1];
516 let data = this.data.detail; 518 let data = this.data.detail;
  519 + let isMany = this.data.isMany;
517 let img = data.seller.seller_image.replace(/^http:/, "https:"); 520 let img = data.seller.seller_image.replace(/^http:/, "https:");
518 let d = data.ddate_solt; 521 let d = data.ddate_solt;
519 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 522 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
520 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 523 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
521 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 524 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
522 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
523 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 525 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  526 + let timeSlot2 = ' ' + this.data.seller.soltName;
524 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 527 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
525 time = timeStr ? timeStr : time; 528 time = timeStr ? timeStr : time;
526 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 529 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -538,7 +541,7 @@ Page({ @@ -538,7 +541,7 @@ Page({
538 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 541 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
539 } 542 }
540 if (type1 == '3' || type1 == '4') { 543 if (type1 == '3' || type1 == '4') {
541 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 544 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
542 } 545 }
543 } 546 }
544 this.setData({ 547 this.setData({
@@ -669,16 +672,7 @@ Page({ @@ -669,16 +672,7 @@ Page({
669 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 672 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
670 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 673 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
671 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 674 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
672 - let solt = this.data.detail.ddate_solt;  
673 - let lunchDis = this.data.seller.daily;  
674 - let timeList = []  
675 - var morningStr = lunchDis.morning.split("-");  
676 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
677 - var noonStr = lunchDis.noon.split("-");  
678 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
679 - var nightStr = lunchDis.night.split("-");  
680 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
681 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 675 + this.getLocalLunchTime(data.lite_style);
682 let obj = { 676 let obj = {
683 chef, 677 chef,
684 marketing, 678 marketing,
@@ -692,7 +686,6 @@ Page({ @@ -692,7 +686,6 @@ Page({
692 titleType, 686 titleType,
693 themeColor, 687 themeColor,
694 lite_style:data.lite_style, 688 lite_style:data.lite_style,
695 - timeList,  
696 couponList, 689 couponList,
697 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 690 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
698 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 691 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -710,22 +703,80 @@ Page({ @@ -710,22 +703,80 @@ Page({
710 }) 703 })
711 this.textToSpeechFun(reserve.voice_info) 704 this.textToSpeechFun(reserve.voice_info)
712 } 705 }
  706 + }).catch(res => {
  707 + console.log('GetSellerTemplateConf请求失败');
  708 + })
  709 + },
  710 + // 获取日期对应的时段
  711 + getLocalLunchTime(lite_style) {
  712 + let detail = this.data.detail;
  713 + let ddateStr = new Date(detail.ddate * 1000);
  714 + let year = ddateStr.getFullYear();
  715 + let month = ddateStr.getMonth() + 1;
  716 + let day = ddateStr.getDate();
  717 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  718 + App.Seller.getMealSectionByDay({
  719 + sellerid: detail.seller.id,
  720 + day: day1,
  721 + }).then(res => {
  722 + let data = res.data;
  723 + let lunchDinnerList = [];
  724 + let isMany = '0';//0默认餐段 1多时段
  725 + if (data.length <= 3 && !data[0].ddate_solt) {
  726 + isMany = '0';
  727 + data.forEach(i => {
  728 + if (i.mname == '早餐') {
  729 + lunchDinnerList.push({
  730 + mname: "早餐",
  731 + mdate: i.mdate,
  732 + ddate_solt: 1,
  733 + })
  734 + }
  735 + if (i.mname == '午餐') {
  736 + lunchDinnerList.push({
  737 + mname: "午餐",
  738 + mdate: i.mdate,
  739 + ddate_solt: 2,
  740 + })
  741 + }
  742 + if (i.mname == '晚餐') {
  743 + lunchDinnerList.push({
  744 + mname: "晚餐",
  745 + mdate: i.mdate,
  746 + ddate_solt: 3,
  747 + })
  748 + }
  749 + })
  750 + } else {
  751 + isMany = '1';
  752 + lunchDinnerList = data;
  753 + }
  754 + let obj = lunchDinnerList.filter(i => {
  755 + return i.ddate_solt == detail.ddate_solt
  756 + })
  757 + var timeList = [];
  758 + if (obj && obj.length > 0) {
  759 + var time = obj[0].mdate.split("-");
  760 + timeList = this.computeHour(time[0], time[1], 15);
  761 + }
  762 + this.setData({
  763 + timeList,
  764 + isMany,
  765 + })
713 // 获取转发客人卡片设置 766 // 获取转发客人卡片设置
714 - let detailInfo = this.data.detail;  
715 - data.lite_style = data.lite_style || '3';  
716 - let liteStyle = data.lite_style.split('-'); 767 + let lite = lite_style || '3';
  768 + let liteStyle = lite.split('-');
717 if (liteStyle[0] == '0') { 769 if (liteStyle[0] == '0') {
718 this.setData({ 770 this.setData({
719 - imgSrc: detailInfo.seller.seller_image 771 + imgSrc: detail.seller.seller_image
720 }) 772 })
721 } else { 773 } else {
722 -  
723 - this.painterBtn(data.lite_style); 774 + this.painterBtn(lite);
724 } 775 }
725 - }).catch(res => {  
726 - console.log('GetSellerTemplateConf请求失败');  
727 - })  
728 - }, 776 + }).catch(res => {
  777 + console.log(res, '获取多时段失败');
  778 + })
  779 + },
729 // 点击商家有礼 780 // 点击商家有礼
730 gotoSellerGift(e){ 781 gotoSellerGift(e){
731 this.couponModal.closeModal() 782 this.couponModal.closeModal()
@@ -60,6 +60,7 @@ Page({ @@ -60,6 +60,7 @@ Page({
60 imgSrc:'',//canvas图片地址 60 imgSrc:'',//canvas图片地址
61 couponData: '', //评价赠送优惠券数据 61 couponData: '', //评价赠送优惠券数据
62 timeList: [], 62 timeList: [],
  63 + isMany:'0',//0默认餐段 1多时段
63 temp_ddate:'',//展示的到店时间 64 temp_ddate:'',//展示的到店时间
64 lite_style:'',//小程序转发卡片样式 65 lite_style:'',//小程序转发卡片样式
65 isMoreBtn:'',//再次预订按钮 66 isMoreBtn:'',//再次预订按钮
@@ -288,9 +289,10 @@ Page({ @@ -288,9 +289,10 @@ Page({
288 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
289 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
290 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
291 - console.log('dateSmart', dateSmart);  
292 - this.setData({  
293 - detail: this.formatDatail(reserev, dateSmart), 292 + let detail = this.formatDatail(reserev, dateSmart)
  293 + reserev.soltName = '';
  294 + this.setData({
  295 + detail,
294 tableNum, 296 tableNum,
295 tableinfo, 297 tableinfo,
296 is_user_comments: res.data.is_user_comments, 298 is_user_comments: res.data.is_user_comments,
@@ -308,7 +310,7 @@ Page({ @@ -308,7 +310,7 @@ Page({
308 is_set_ddate: reserev.is_set_ddate, 310 is_set_ddate: reserev.is_set_ddate,
309 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 311 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
310 tel: reserev.seller.seller_tel.split(','), 312 tel: reserev.seller.seller_tel.split(','),
311 - soltName: reserev.soltName, 313 + soltName: reserev.soltName || detail.mname,
312 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 314 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
313 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 315 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
314 lat: reserev.seller.lat, 316 lat: reserev.seller.lat,
@@ -513,13 +515,14 @@ Page({ @@ -513,13 +515,14 @@ Page({
513 let type1 = style[0]; 515 let type1 = style[0];
514 let type2 = style[1]; 516 let type2 = style[1];
515 let data = this.data.detail; 517 let data = this.data.detail;
  518 + let isMany = this.data.isMany;
516 let img = data.seller.seller_image.replace(/^http:/, "https:"); 519 let img = data.seller.seller_image.replace(/^http:/, "https:");
517 let d = data.ddate_solt; 520 let d = data.ddate_solt;
518 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 521 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
519 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 522 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
520 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 523 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
521 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
522 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 524 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  525 + let timeSlot2 = ' ' + this.data.seller.soltName;
523 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 526 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
524 time = timeStr ? timeStr : time; 527 time = timeStr ? timeStr : time;
525 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 528 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -537,7 +540,7 @@ Page({ @@ -537,7 +540,7 @@ Page({
537 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 540 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
538 } 541 }
539 if (type1 == '3' || type1 == '4') { 542 if (type1 == '3' || type1 == '4') {
540 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 543 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
541 } 544 }
542 } 545 }
543 this.setData({ 546 this.setData({
@@ -668,16 +671,7 @@ Page({ @@ -668,16 +671,7 @@ Page({
668 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 671 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
669 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 672 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
670 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 673 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
671 - let solt = this.data.detail.ddate_solt;  
672 - let lunchDis = this.data.seller.daily;  
673 - let timeList = []  
674 - var morningStr = lunchDis.morning.split("-");  
675 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
676 - var noonStr = lunchDis.noon.split("-");  
677 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
678 - var nightStr = lunchDis.night.split("-");  
679 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
680 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 674 + this.getLocalLunchTime(data.lite_style);
681 let obj = { 675 let obj = {
682 chef, 676 chef,
683 marketing, 677 marketing,
@@ -691,7 +685,6 @@ Page({ @@ -691,7 +685,6 @@ Page({
691 titleType, 685 titleType,
692 themeColor, 686 themeColor,
693 lite_style:data.lite_style, 687 lite_style:data.lite_style,
694 - timeList,  
695 couponList, 688 couponList,
696 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 689 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
697 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 690 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -709,21 +702,80 @@ Page({ @@ -709,21 +702,80 @@ Page({
709 }) 702 })
710 this.textToSpeechFun(reserve.voice_info) 703 this.textToSpeechFun(reserve.voice_info)
711 } 704 }
  705 + }).catch(res => {
  706 + console.log('GetSellerTemplateConf请求失败');
  707 + })
  708 + },
  709 + // 获取日期对应的时段
  710 + getLocalLunchTime(lite_style) {
  711 + let detail = this.data.detail;
  712 + let ddateStr = new Date(detail.ddate * 1000);
  713 + let year = ddateStr.getFullYear();
  714 + let month = ddateStr.getMonth() + 1;
  715 + let day = ddateStr.getDate();
  716 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  717 + App.Seller.getMealSectionByDay({
  718 + sellerid: detail.seller.id,
  719 + day: day1,
  720 + }).then(res => {
  721 + let data = res.data;
  722 + let lunchDinnerList = [];
  723 + let isMany = '0';//0默认餐段 1多时段
  724 + if (data.length <= 3 && !data[0].ddate_solt) {
  725 + isMany = '0';
  726 + data.forEach(i => {
  727 + if (i.mname == '早餐') {
  728 + lunchDinnerList.push({
  729 + mname: "早餐",
  730 + mdate: i.mdate,
  731 + ddate_solt: 1,
  732 + })
  733 + }
  734 + if (i.mname == '午餐') {
  735 + lunchDinnerList.push({
  736 + mname: "午餐",
  737 + mdate: i.mdate,
  738 + ddate_solt: 2,
  739 + })
  740 + }
  741 + if (i.mname == '晚餐') {
  742 + lunchDinnerList.push({
  743 + mname: "晚餐",
  744 + mdate: i.mdate,
  745 + ddate_solt: 3,
  746 + })
  747 + }
  748 + })
  749 + } else {
  750 + isMany = '1';
  751 + lunchDinnerList = data;
  752 + }
  753 + let obj = lunchDinnerList.filter(i => {
  754 + return i.ddate_solt == detail.ddate_solt
  755 + })
  756 + var timeList = [];
  757 + if (obj && obj.length > 0) {
  758 + var time = obj[0].mdate.split("-");
  759 + timeList = this.computeHour(time[0], time[1], 15);
  760 + }
  761 + this.setData({
  762 + timeList,
  763 + isMany,
  764 + })
712 // 获取转发客人卡片设置 765 // 获取转发客人卡片设置
713 - let detailInfo = this.data.detail;  
714 - data.lite_style = data.lite_style || '3';  
715 - let liteStyle = data.lite_style.split('-'); 766 + let lite = lite_style || '3';
  767 + let liteStyle = lite.split('-');
716 if (liteStyle[0] == '0') { 768 if (liteStyle[0] == '0') {
717 this.setData({ 769 this.setData({
718 - imgSrc: detailInfo.seller.seller_image 770 + imgSrc: detail.seller.seller_image
719 }) 771 })
720 } else { 772 } else {
721 - this.painterBtn(data.lite_style); 773 + this.painterBtn(lite);
722 } 774 }
723 - }).catch(res => {  
724 - console.log('GetSellerTemplateConf请求失败');  
725 - })  
726 - }, 775 + }).catch(res => {
  776 + console.log(res, '获取多时段失败');
  777 + })
  778 + },
727 // 点击商家有礼 779 // 点击商家有礼
728 gotoSellerGift(e){ 780 gotoSellerGift(e){
729 this.couponModal.closeModal() 781 this.couponModal.closeModal()
@@ -62,6 +62,7 @@ Page({ @@ -62,6 +62,7 @@ Page({
62 imgSrc:'',//canvas图片地址 62 imgSrc:'',//canvas图片地址
63 couponData: '', //评价赠送优惠券数据 63 couponData: '', //评价赠送优惠券数据
64 timeList: [], 64 timeList: [],
  65 + isMany:'0',//0默认餐段 1多时段
65 temp_ddate:'',//展示的到店时间 66 temp_ddate:'',//展示的到店时间
66 lite_style:'',//小程序转发卡片样式 67 lite_style:'',//小程序转发卡片样式
67 isMoreBtn:'',//再次预订按钮 68 isMoreBtn:'',//再次预订按钮
@@ -246,8 +247,10 @@ Page({ @@ -246,8 +247,10 @@ Page({
246 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 247 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
247 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 248 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
248 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 249 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
  250 + let detail = this.formatDatail(reserev, dateSmart)
  251 + reserev.soltName = '';
249 this.setData({ 252 this.setData({
250 - detail: this.formatDatail(reserev, dateSmart), 253 + detail,
251 tableNum, 254 tableNum,
252 is_user_comments: res.data.is_user_comments, 255 is_user_comments: res.data.is_user_comments,
253 temp_ddate:this.data.temp_ddate?this.data.temp_ddate:reserev.temp_ddate?util.unixtoTime(reserev.temp_ddate, 'HH:II'):util.unixtoTime(reserev.ddate, 'HH:II'), 256 temp_ddate:this.data.temp_ddate?this.data.temp_ddate:reserev.temp_ddate?util.unixtoTime(reserev.temp_ddate, 'HH:II'):util.unixtoTime(reserev.ddate, 'HH:II'),
@@ -264,7 +267,7 @@ Page({ @@ -264,7 +267,7 @@ Page({
264 is_set_ddate: reserev.is_set_ddate, 267 is_set_ddate: reserev.is_set_ddate,
265 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 268 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
266 tel: reserev.seller.seller_tel.split(','), 269 tel: reserev.seller.seller_tel.split(','),
267 - soltName: reserev.soltName, 270 + soltName: reserev.soltName || detail.mname,
268 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 271 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
269 lat: reserev.seller.lat, 272 lat: reserev.seller.lat,
270 long: reserev.seller.long, 273 long: reserev.seller.long,
@@ -466,13 +469,14 @@ Page({ @@ -466,13 +469,14 @@ Page({
466 let type1 = style[0]; 469 let type1 = style[0];
467 let type2 = style[1]; 470 let type2 = style[1];
468 let data = this.data.detail; 471 let data = this.data.detail;
  472 + let isMany = this.data.isMany;
469 let img = data.seller.seller_image.replace(/^http:/, "https:"); 473 let img = data.seller.seller_image.replace(/^http:/, "https:");
470 let d = data.ddate_solt; 474 let d = data.ddate_solt;
471 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 475 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
472 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 476 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
473 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 477 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
474 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
475 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 478 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  479 + let timeSlot2 = ' ' + this.data.seller.soltName;
476 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 480 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
477 time = timeStr ? timeStr : time; 481 time = timeStr ? timeStr : time;
478 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 482 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -490,7 +494,7 @@ Page({ @@ -490,7 +494,7 @@ Page({
490 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 494 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
491 } 495 }
492 if (type1 == '3' || type1 == '4') { 496 if (type1 == '3' || type1 == '4') {
493 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 497 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
494 } 498 }
495 } 499 }
496 this.setData({ 500 this.setData({
@@ -624,16 +628,7 @@ Page({ @@ -624,16 +628,7 @@ Page({
624 } else { 628 } else {
625 whiteBj = false 629 whiteBj = false
626 } 630 }
627 - let solt = this.data.detail.ddate_solt;  
628 - let lunchDis = this.data.seller.daily;  
629 - let timeList = []  
630 - var morningStr = lunchDis.morning.split("-");  
631 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
632 - var noonStr = lunchDis.noon.split("-");  
633 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
634 - var nightStr = lunchDis.night.split("-");  
635 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
636 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 631 + this.getLocalLunchTime(data.lite_style);
637 let obj = { 632 let obj = {
638 chef, 633 chef,
639 marketing, 634 marketing,
@@ -648,7 +643,6 @@ Page({ @@ -648,7 +643,6 @@ Page({
648 themeColor, 643 themeColor,
649 whiteBj, 644 whiteBj,
650 lite_style:data.lite_style, 645 lite_style:data.lite_style,
651 - timeList,  
652 couponList, 646 couponList,
653 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 647 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
654 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 648 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -666,19 +660,78 @@ Page({ @@ -666,19 +660,78 @@ Page({
666 }) 660 })
667 this.textToSpeechFun(reserve.voice_info) 661 this.textToSpeechFun(reserve.voice_info)
668 } 662 }
  663 + }).catch(res => {
  664 + console.log('GetSellerTemplateConf请求失败');
  665 + })
  666 + },
  667 + // 获取日期对应的时段
  668 + getLocalLunchTime(lite_style) {
  669 + let detail = this.data.detail;
  670 + let ddateStr = new Date(detail.ddate * 1000);
  671 + let year = ddateStr.getFullYear();
  672 + let month = ddateStr.getMonth() + 1;
  673 + let day = ddateStr.getDate();
  674 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  675 + App.Seller.getMealSectionByDay({
  676 + sellerid: detail.seller.id,
  677 + day: day1,
  678 + }).then(res => {
  679 + let data = res.data;
  680 + let lunchDinnerList = [];
  681 + let isMany = '0';//0默认餐段 1多时段
  682 + if (data.length <= 3 && !data[0].ddate_solt) {
  683 + isMany = '0';
  684 + data.forEach(i => {
  685 + if (i.mname == '早餐') {
  686 + lunchDinnerList.push({
  687 + mname: "早餐",
  688 + mdate: i.mdate,
  689 + ddate_solt: 1,
  690 + })
  691 + }
  692 + if (i.mname == '午餐') {
  693 + lunchDinnerList.push({
  694 + mname: "午餐",
  695 + mdate: i.mdate,
  696 + ddate_solt: 2,
  697 + })
  698 + }
  699 + if (i.mname == '晚餐') {
  700 + lunchDinnerList.push({
  701 + mname: "晚餐",
  702 + mdate: i.mdate,
  703 + ddate_solt: 3,
  704 + })
  705 + }
  706 + })
  707 + } else {
  708 + isMany = '1';
  709 + lunchDinnerList = data;
  710 + }
  711 + let obj = lunchDinnerList.filter(i => {
  712 + return i.ddate_solt == detail.ddate_solt
  713 + })
  714 + var timeList = [];
  715 + if (obj && obj.length > 0) {
  716 + var time = obj[0].mdate.split("-");
  717 + timeList = this.computeHour(time[0], time[1], 15);
  718 + }
  719 + this.setData({
  720 + timeList,
  721 + isMany,
  722 + })
669 // 获取转发客人卡片设置 723 // 获取转发客人卡片设置
670 - let detailInfo = this.data.detail;  
671 - data.lite_style = data.lite_style || '3';  
672 - let liteStyle = data.lite_style.split('-'); 724 + let lite = lite_style || '3';
  725 + let liteStyle = lite.split('-');
673 if (liteStyle[0] == '0') { 726 if (liteStyle[0] == '0') {
674 this.setData({ 727 this.setData({
675 - imgSrc: detailInfo.seller.seller_image 728 + imgSrc: detail.seller.seller_image
676 }) 729 })
677 } else { 730 } else {
678 - this.painterBtn(data.lite_style); 731 + this.painterBtn(lite);
679 } 732 }
680 }).catch(res => { 733 }).catch(res => {
681 - console.log('GetSellerTemplateConf请求失败'); 734 + console.log(res, '获取多时段失败');
682 }) 735 })
683 }, 736 },
684 // 点击商家有礼 737 // 点击商家有礼
@@ -101,7 +101,12 @@ @@ -101,7 +101,12 @@
101 flex: 1; 101 flex: 1;
102 line-height: 60rpx; 102 line-height: 60rpx;
103 color: #000000; 103 color: #000000;
104 - font-family: PingFang SC; 104 + font-family: PingFang SC;
  105 + display: -webkit-box;
  106 + word-break: break-all;
  107 + word-wrap: break-word;
  108 + overflow: hidden;
  109 + text-align: left;
105 } 110 }
106 111
107 .handleInfo { 112 .handleInfo {
@@ -1137,12 +1142,12 @@ @@ -1137,12 +1142,12 @@
1137 align-items: center; 1142 align-items: center;
1138 } 1143 }
1139 1144
1140 -.arrivalBox button{ 1145 +.arrivalBox button {
1141 display: flex; 1146 display: flex;
1142 font-size: 24rpx; 1147 font-size: 24rpx;
1143 flex-direction: column; 1148 flex-direction: column;
1144 height: 50rpx; 1149 height: 50rpx;
1145 - padding: 0 18rpx; 1150 + padding: 0 15rpx;
1146 line-height: 48rpx; 1151 line-height: 48rpx;
1147 font-family: PingFang SC; 1152 font-family: PingFang SC;
1148 border-radius: 40rpx; 1153 border-radius: 40rpx;
@@ -61,6 +61,7 @@ Page({ @@ -61,6 +61,7 @@ Page({
61 imgSrc:'',//canvas图片地址 61 imgSrc:'',//canvas图片地址
62 couponData: '', //评价赠送优惠券数据 62 couponData: '', //评价赠送优惠券数据
63 timeList: [], 63 timeList: [],
  64 + isMany:'0',//0默认餐段 1多时段
64 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
66 isMoreBtn:'',//再次预订按钮 67 isMoreBtn:'',//再次预订按钮
@@ -289,9 +290,10 @@ Page({ @@ -289,9 +290,10 @@ Page({
289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 290 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 291 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 292 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
292 - console.log('dateSmart', dateSmart);  
293 - this.setData({  
294 - detail: this.formatDatail(reserev, dateSmart), 293 + let detail = this.formatDatail(reserev, dateSmart)
  294 + reserev.soltName = '';
  295 + this.setData({
  296 + detail,
295 tableNum, 297 tableNum,
296 tableinfo, 298 tableinfo,
297 is_user_comments: res.data.is_user_comments, 299 is_user_comments: res.data.is_user_comments,
@@ -309,7 +311,7 @@ Page({ @@ -309,7 +311,7 @@ Page({
309 is_set_ddate: reserev.is_set_ddate, 311 is_set_ddate: reserev.is_set_ddate,
310 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 312 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
311 tel: reserev.seller.seller_tel.split(','), 313 tel: reserev.seller.seller_tel.split(','),
312 - soltName: reserev.soltName, 314 + soltName: reserev.soltName || detail.mname,
313 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 315 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
314 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 316 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
315 lat: reserev.seller.lat, 317 lat: reserev.seller.lat,
@@ -514,13 +516,14 @@ Page({ @@ -514,13 +516,14 @@ Page({
514 let type1 = style[0]; 516 let type1 = style[0];
515 let type2 = style[1]; 517 let type2 = style[1];
516 let data = this.data.detail; 518 let data = this.data.detail;
  519 + let isMany = this.data.isMany;
517 let img = data.seller.seller_image.replace(/^http:/, "https:"); 520 let img = data.seller.seller_image.replace(/^http:/, "https:");
518 let d = data.ddate_solt; 521 let d = data.ddate_solt;
519 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 522 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
520 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 523 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
521 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 524 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
522 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
523 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 525 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  526 + let timeSlot2 = ' ' + this.data.seller.soltName;
524 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 527 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
525 time = timeStr ? timeStr : time; 528 time = timeStr ? timeStr : time;
526 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 529 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -538,7 +541,7 @@ Page({ @@ -538,7 +541,7 @@ Page({
538 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 541 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
539 } 542 }
540 if (type1 == '3' || type1 == '4') { 543 if (type1 == '3' || type1 == '4') {
541 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 544 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
542 } 545 }
543 } 546 }
544 this.setData({ 547 this.setData({
@@ -669,16 +672,7 @@ Page({ @@ -669,16 +672,7 @@ Page({
669 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 672 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
670 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 673 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
671 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 674 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
672 - let solt = this.data.detail.ddate_solt;  
673 - let lunchDis = this.data.seller.daily;  
674 - let timeList = []  
675 - var morningStr = lunchDis.morning.split("-");  
676 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
677 - var noonStr = lunchDis.noon.split("-");  
678 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
679 - var nightStr = lunchDis.night.split("-");  
680 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
681 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 675 + this.getLocalLunchTime(data.lite_style);
682 let obj = { 676 let obj = {
683 chef, 677 chef,
684 marketing, 678 marketing,
@@ -692,7 +686,6 @@ Page({ @@ -692,7 +686,6 @@ Page({
692 titleType, 686 titleType,
693 themeColor, 687 themeColor,
694 lite_style:data.lite_style, 688 lite_style:data.lite_style,
695 - timeList,  
696 couponList, 689 couponList,
697 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 690 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
698 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 691 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -710,21 +703,80 @@ Page({ @@ -710,21 +703,80 @@ Page({
710 }) 703 })
711 this.textToSpeechFun(reserve.voice_info) 704 this.textToSpeechFun(reserve.voice_info)
712 } 705 }
  706 + }).catch(res => {
  707 + console.log('GetSellerTemplateConf请求失败');
  708 + })
  709 + },
  710 + // 获取日期对应的时段
  711 + getLocalLunchTime(lite_style) {
  712 + let detail = this.data.detail;
  713 + let ddateStr = new Date(detail.ddate * 1000);
  714 + let year = ddateStr.getFullYear();
  715 + let month = ddateStr.getMonth() + 1;
  716 + let day = ddateStr.getDate();
  717 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  718 + App.Seller.getMealSectionByDay({
  719 + sellerid: detail.seller.id,
  720 + day: day1,
  721 + }).then(res => {
  722 + let data = res.data;
  723 + let lunchDinnerList = [];
  724 + let isMany = '0';//0默认餐段 1多时段
  725 + if (data.length <= 3 && !data[0].ddate_solt) {
  726 + isMany = '0';
  727 + data.forEach(i => {
  728 + if (i.mname == '早餐') {
  729 + lunchDinnerList.push({
  730 + mname: "早餐",
  731 + mdate: i.mdate,
  732 + ddate_solt: 1,
  733 + })
  734 + }
  735 + if (i.mname == '午餐') {
  736 + lunchDinnerList.push({
  737 + mname: "午餐",
  738 + mdate: i.mdate,
  739 + ddate_solt: 2,
  740 + })
  741 + }
  742 + if (i.mname == '晚餐') {
  743 + lunchDinnerList.push({
  744 + mname: "晚餐",
  745 + mdate: i.mdate,
  746 + ddate_solt: 3,
  747 + })
  748 + }
  749 + })
  750 + } else {
  751 + isMany = '1';
  752 + lunchDinnerList = data;
  753 + }
  754 + let obj = lunchDinnerList.filter(i => {
  755 + return i.ddate_solt == detail.ddate_solt
  756 + })
  757 + var timeList = [];
  758 + if (obj && obj.length > 0) {
  759 + var time = obj[0].mdate.split("-");
  760 + timeList = this.computeHour(time[0], time[1], 15);
  761 + }
  762 + this.setData({
  763 + timeList,
  764 + isMany,
  765 + })
713 // 获取转发客人卡片设置 766 // 获取转发客人卡片设置
714 - let detailInfo = this.data.detail;  
715 - data.lite_style = data.lite_style || '3';  
716 - let liteStyle = data.lite_style.split('-'); 767 + let lite = lite_style || '3';
  768 + let liteStyle = lite.split('-');
717 if (liteStyle[0] == '0') { 769 if (liteStyle[0] == '0') {
718 this.setData({ 770 this.setData({
719 - imgSrc: detailInfo.seller.seller_image 771 + imgSrc: detail.seller.seller_image
720 }) 772 })
721 } else { 773 } else {
722 - this.painterBtn(data.lite_style); 774 + this.painterBtn(lite);
723 } 775 }
724 - }).catch(res => {  
725 - console.log('GetSellerTemplateConf请求失败');  
726 - })  
727 - }, 776 + }).catch(res => {
  777 + console.log(res, '获取多时段失败');
  778 + })
  779 + },
728 // 点击商家有礼 780 // 点击商家有礼
729 gotoSellerGift(e){ 781 gotoSellerGift(e){
730 this.couponModal.closeModal() 782 this.couponModal.closeModal()
@@ -85,6 +85,11 @@ @@ -85,6 +85,11 @@
85 font-family: PingFang SC; 85 font-family: PingFang SC;
86 margin-left: 40rpx; 86 margin-left: 40rpx;
87 color: #FFD200; 87 color: #FFD200;
  88 + display: -webkit-box;
  89 + word-break: break-all;
  90 + word-wrap: break-word;
  91 + overflow: hidden;
  92 + text-align: left;
88 } 93 }
89 94
90 .handleInfo { 95 .handleInfo {
@@ -61,6 +61,7 @@ Page({ @@ -61,6 +61,7 @@ Page({
61 imgSrc:'',//canvas图片地址 61 imgSrc:'',//canvas图片地址
62 couponData: '', //评价赠送优惠券数据 62 couponData: '', //评价赠送优惠券数据
63 timeList: [], 63 timeList: [],
  64 + isMany:'0',//0默认餐段 1多时段
64 temp_ddate:'',//展示的到店时间 65 temp_ddate:'',//展示的到店时间
65 lite_style:'',//小程序转发卡片样式 66 lite_style:'',//小程序转发卡片样式
66 isMoreBtn:'',//再次预订按钮 67 isMoreBtn:'',//再次预订按钮
@@ -289,9 +290,10 @@ Page({ @@ -289,9 +290,10 @@ Page({
289 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 290 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
290 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 291 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
291 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 292 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
292 - console.log('dateSmart', dateSmart);  
293 - this.setData({  
294 - detail: this.formatDatail(reserev, dateSmart), 293 + let detail = this.formatDatail(reserev, dateSmart)
  294 + reserev.soltName = '';
  295 + this.setData({
  296 + detail,
295 tableNum, 297 tableNum,
296 tableinfo, 298 tableinfo,
297 is_user_comments: res.data.is_user_comments, 299 is_user_comments: res.data.is_user_comments,
@@ -310,7 +312,7 @@ Page({ @@ -310,7 +312,7 @@ Page({
310 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 312 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
311 tel: reserev.seller.seller_tel.split(','), 313 tel: reserev.seller.seller_tel.split(','),
312 phone:reserev.phone, 314 phone:reserev.phone,
313 - soltName: reserev.soltName, 315 + soltName: reserev.soltName || detail.mname,
314 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'), 316 dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
315 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 317 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
316 lat: reserev.seller.lat, 318 lat: reserev.seller.lat,
@@ -513,13 +515,14 @@ Page({ @@ -513,13 +515,14 @@ Page({
513 let type1 = style[0]; 515 let type1 = style[0];
514 let type2 = style[1]; 516 let type2 = style[1];
515 let data = this.data.detail; 517 let data = this.data.detail;
  518 + let isMany = this.data.isMany;
516 let img = data.seller.seller_image.replace(/^http:/, "https:"); 519 let img = data.seller.seller_image.replace(/^http:/, "https:");
517 let d = data.ddate_solt; 520 let d = data.ddate_solt;
518 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 521 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
519 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 522 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
520 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 523 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
521 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
522 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 524 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  525 + let timeSlot2 = ' ' + this.data.seller.soltName;
523 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 526 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
524 time = timeStr ? timeStr : time; 527 time = timeStr ? timeStr : time;
525 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 528 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -537,7 +540,7 @@ Page({ @@ -537,7 +540,7 @@ Page({
537 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 540 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
538 } 541 }
539 if (type1 == '3' || type1 == '4') { 542 if (type1 == '3' || type1 == '4') {
540 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 543 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
541 } 544 }
542 } 545 }
543 this.setData({ 546 this.setData({
@@ -668,16 +671,7 @@ Page({ @@ -668,16 +671,7 @@ Page({
668 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 671 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
669 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 672 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
670 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 673 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
671 - let solt = this.data.detail.ddate_solt;  
672 - let lunchDis = this.data.seller.daily;  
673 - let timeList = []  
674 - var morningStr = lunchDis.morning.split("-");  
675 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
676 - var noonStr = lunchDis.noon.split("-");  
677 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
678 - var nightStr = lunchDis.night.split("-");  
679 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
680 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 674 + this.getLocalLunchTime(data.lite_style);
681 let obj ={ 675 let obj ={
682 chef, 676 chef,
683 marketing, 677 marketing,
@@ -691,7 +685,6 @@ Page({ @@ -691,7 +685,6 @@ Page({
691 titleType, 685 titleType,
692 themeColor, 686 themeColor,
693 lite_style:data.lite_style, 687 lite_style:data.lite_style,
694 - timeList,  
695 couponList, 688 couponList,
696 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 689 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
697 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 690 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -709,21 +702,80 @@ Page({ @@ -709,21 +702,80 @@ Page({
709 }) 702 })
710 this.textToSpeechFun(reserve.voice_info) 703 this.textToSpeechFun(reserve.voice_info)
711 } 704 }
  705 + }).catch(res => {
  706 + console.log('GetSellerTemplateConf请求失败');
  707 + })
  708 + },
  709 + // 获取日期对应的时段
  710 + getLocalLunchTime(lite_style) {
  711 + let detail = this.data.detail;
  712 + let ddateStr = new Date(detail.ddate * 1000);
  713 + let year = ddateStr.getFullYear();
  714 + let month = ddateStr.getMonth() + 1;
  715 + let day = ddateStr.getDate();
  716 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  717 + App.Seller.getMealSectionByDay({
  718 + sellerid: detail.seller.id,
  719 + day: day1,
  720 + }).then(res => {
  721 + let data = res.data;
  722 + let lunchDinnerList = [];
  723 + let isMany = '0';//0默认餐段 1多时段
  724 + if (data.length <= 3 && !data[0].ddate_solt) {
  725 + isMany = '0';
  726 + data.forEach(i => {
  727 + if (i.mname == '早餐') {
  728 + lunchDinnerList.push({
  729 + mname: "早餐",
  730 + mdate: i.mdate,
  731 + ddate_solt: 1,
  732 + })
  733 + }
  734 + if (i.mname == '午餐') {
  735 + lunchDinnerList.push({
  736 + mname: "午餐",
  737 + mdate: i.mdate,
  738 + ddate_solt: 2,
  739 + })
  740 + }
  741 + if (i.mname == '晚餐') {
  742 + lunchDinnerList.push({
  743 + mname: "晚餐",
  744 + mdate: i.mdate,
  745 + ddate_solt: 3,
  746 + })
  747 + }
  748 + })
  749 + } else {
  750 + isMany = '1';
  751 + lunchDinnerList = data;
  752 + }
  753 + let obj = lunchDinnerList.filter(i => {
  754 + return i.ddate_solt == detail.ddate_solt
  755 + })
  756 + var timeList = [];
  757 + if (obj && obj.length > 0) {
  758 + var time = obj[0].mdate.split("-");
  759 + timeList = this.computeHour(time[0], time[1], 15);
  760 + }
  761 + this.setData({
  762 + timeList,
  763 + isMany,
  764 + })
712 // 获取转发客人卡片设置 765 // 获取转发客人卡片设置
713 - let detailInfo = this.data.detail;  
714 - data.lite_style = data.lite_style || '3';  
715 - let liteStyle = data.lite_style.split('-'); 766 + let lite = lite_style || '3';
  767 + let liteStyle = lite.split('-');
716 if (liteStyle[0] == '0') { 768 if (liteStyle[0] == '0') {
717 this.setData({ 769 this.setData({
718 - imgSrc: detailInfo.seller.seller_image 770 + imgSrc: detail.seller.seller_image
719 }) 771 })
720 } else { 772 } else {
721 - this.painterBtn(data.lite_style); 773 + this.painterBtn(lite);
722 } 774 }
723 - }).catch(res => {  
724 - console.log('GetSellerTemplateConf请求失败');  
725 - })  
726 - }, 775 + }).catch(res => {
  776 + console.log(res, '获取多时段失败');
  777 + })
  778 + },
727 // 点击商家有礼 779 // 点击商家有礼
728 gotoSellerGift(e){ 780 gotoSellerGift(e){
729 this.couponModal.closeModal() 781 this.couponModal.closeModal()
@@ -91,6 +91,11 @@ @@ -91,6 +91,11 @@
91 font-family: PingFang SC; 91 font-family: PingFang SC;
92 margin-left: 80rpx; 92 margin-left: 80rpx;
93 color: #FFD200; 93 color: #FFD200;
  94 + display: -webkit-box;
  95 + word-break: break-all;
  96 + word-wrap: break-word;
  97 + overflow: hidden;
  98 + text-align: left;
94 } 99 }
95 100
96 .handleInfo { 101 .handleInfo {
@@ -69,6 +69,7 @@ Page({ @@ -69,6 +69,7 @@ Page({
69 colors:'',//导航栏颜色 69 colors:'',//导航栏颜色
70 couponData: '', //评价赠送优惠券数据 70 couponData: '', //评价赠送优惠券数据
71 timeList: [], 71 timeList: [],
  72 + isMany:'0',//0默认餐段 1多时段
72 temp_ddate:'',//展示的到店时间 73 temp_ddate:'',//展示的到店时间
73 lite_style:'',//小程序转发卡片样式 74 lite_style:'',//小程序转发卡片样式
74 isMoreBtn:'',//再次预订按钮 75 isMoreBtn:'',//再次预订按钮
@@ -306,9 +307,10 @@ Page({ @@ -306,9 +307,10 @@ Page({
306 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日') 307 let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
307 let dateStr = util.unixtoTime(reserev.ddate, 'HH点') 308 let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
308 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分') 309 let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
309 - console.log('dateSmart', dateSmart); 310 + let detail = this.formatDatail(reserev, dateSmart)
  311 + reserev.soltName = '';
310 this.setData({ 312 this.setData({
311 - detail: this.formatDatail(reserev, dateSmart), 313 + detail,
312 tableNum, 314 tableNum,
313 tableinfo, 315 tableinfo,
314 is_user_comments: res.data.is_user_comments, 316 is_user_comments: res.data.is_user_comments,
@@ -326,7 +328,7 @@ Page({ @@ -326,7 +328,7 @@ Page({
326 is_set_ddate: reserev.is_set_ddate, 328 is_set_ddate: reserev.is_set_ddate,
327 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2, 329 hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
328 tel: reserev.seller.seller_tel.split(','), 330 tel: reserev.seller.seller_tel.split(','),
329 - soltName: reserev.soltName, 331 + soltName: reserev.soltName || detail.mname,
330 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'), 332 dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
331 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'), 333 time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
332 lat: reserev.seller.lat, 334 lat: reserev.seller.lat,
@@ -533,13 +535,14 @@ Page({ @@ -533,13 +535,14 @@ Page({
533 let type1 = style[0]; 535 let type1 = style[0];
534 let type2 = style[1]; 536 let type2 = style[1];
535 let data = this.data.detail; 537 let data = this.data.detail;
  538 + let isMany = this.data.isMany;
536 let img = data.seller.seller_image.replace(/^http:/, "https:"); 539 let img = data.seller.seller_image.replace(/^http:/, "https:");
537 let d = data.ddate_solt; 540 let d = data.ddate_solt;
538 let date1 = util.unixtoTime(data.ddate, 'MM月DD日'); 541 let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
539 let date2 = util.unixtoTime(data.ddate, 'MM/DD'); 542 let date2 = util.unixtoTime(data.ddate, 'MM/DD');
540 let week = ' ' + util.unixtoTime(data.ddate, '周WW'); 543 let week = ' ' + util.unixtoTime(data.ddate, '周WW');
541 - let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');  
542 - let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : ''); 544 + let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
  545 + let timeSlot2 = ' ' + this.data.seller.soltName;
543 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II') 546 let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
544 time = timeStr ? timeStr : time; 547 time = timeStr ? timeStr : time;
545 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')] 548 let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
@@ -557,7 +560,7 @@ Page({ @@ -557,7 +560,7 @@ Page({
557 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : ''; 560 section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
558 } 561 }
559 if (type1 == '3' || type1 == '4') { 562 if (type1 == '3' || type1 == '4') {
560 - section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : ''; 563 + section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
561 } 564 }
562 } 565 }
563 this.setData({ 566 this.setData({
@@ -699,16 +702,7 @@ Page({ @@ -699,16 +702,7 @@ Page({
699 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images); 702 if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
700 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images); 703 if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
701 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images); 704 if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
702 - let solt = this.data.detail.ddate_solt;  
703 - let lunchDis = this.data.seller.daily;  
704 - let timeList = []  
705 - var morningStr = lunchDis.morning.split("-");  
706 - var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];  
707 - var noonStr = lunchDis.noon.split("-");  
708 - var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];  
709 - var nightStr = lunchDis.night.split("-");  
710 - var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];  
711 - timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : [] 705 + this.getLocalLunchTime(data.lite_style);
712 let obj = { 706 let obj = {
713 chef, 707 chef,
714 marketing, 708 marketing,
@@ -725,7 +719,6 @@ Page({ @@ -725,7 +719,6 @@ Page({
725 inviteImgUrl, 719 inviteImgUrl,
726 colors, 720 colors,
727 lite_style:data.lite_style, 721 lite_style:data.lite_style,
728 - timeList,  
729 couponList, 722 couponList,
730 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1', 723 isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
731 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1', 724 isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
@@ -743,19 +736,78 @@ Page({ @@ -743,19 +736,78 @@ Page({
743 }) 736 })
744 this.textToSpeechFun(reserve.voice_info) 737 this.textToSpeechFun(reserve.voice_info)
745 } 738 }
746 - // 获取转发客人卡片设置  
747 - let detailInfo = this.data.detail;  
748 - data.lite_style = data.lite_style || '3';  
749 - let liteStyle = data.lite_style.split('-');  
750 - if (liteStyle[0] == '0') {  
751 - this.setData({  
752 - imgSrc: detailInfo.seller.seller_image 739 + }).catch(res => {
  740 + console.log('GetSellerTemplateConf请求失败');
  741 + })
  742 + },
  743 + // 获取日期对应的时段
  744 + getLocalLunchTime(lite_style) {
  745 + let detail = this.data.detail;
  746 + let ddateStr = new Date(detail.ddate * 1000);
  747 + let year = ddateStr.getFullYear();
  748 + let month = ddateStr.getMonth() + 1;
  749 + let day = ddateStr.getDate();
  750 + let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
  751 + App.Seller.getMealSectionByDay({
  752 + sellerid: detail.seller.id,
  753 + day: day1,
  754 + }).then(res => {
  755 + let data = res.data;
  756 + let lunchDinnerList = [];
  757 + let isMany = '0';//0默认餐段 1多时段
  758 + if (data.length <= 3 && !data[0].ddate_solt) {
  759 + isMany = '0';
  760 + data.forEach(i => {
  761 + if (i.mname == '早餐') {
  762 + lunchDinnerList.push({
  763 + mname: "早餐",
  764 + mdate: i.mdate,
  765 + ddate_solt: 1,
  766 + })
  767 + }
  768 + if (i.mname == '午餐') {
  769 + lunchDinnerList.push({
  770 + mname: "午餐",
  771 + mdate: i.mdate,
  772 + ddate_solt: 2,
  773 + })
  774 + }
  775 + if (i.mname == '晚餐') {
  776 + lunchDinnerList.push({
  777 + mname: "晚餐",
  778 + mdate: i.mdate,
  779 + ddate_solt: 3,
  780 + })
  781 + }
753 }) 782 })
754 } else { 783 } else {
755 - this.painterBtn(data.lite_style); 784 + isMany = '1';
  785 + lunchDinnerList = data;
  786 + }
  787 + let obj = lunchDinnerList.filter(i => {
  788 + return i.ddate_solt == detail.ddate_solt
  789 + })
  790 + var timeList = [];
  791 + if (obj && obj.length > 0) {
  792 + var time = obj[0].mdate.split("-");
  793 + timeList = this.computeHour(time[0], time[1], 15);
756 } 794 }
  795 + this.setData({
  796 + timeList,
  797 + isMany,
  798 + })
  799 + // 获取转发客人卡片设置
  800 + let lite = lite_style || '3';
  801 + let liteStyle = lite.split('-');
  802 + if (liteStyle[0] == '0') {
  803 + this.setData({
  804 + imgSrc: detail.seller.seller_image
  805 + })
  806 + } else {
  807 + this.painterBtn(lite);
  808 + }
757 }).catch(res => { 809 }).catch(res => {
758 - console.log('GetSellerTemplateConf请求失败'); 810 + console.log(res, '获取多时段失败');
759 }) 811 })
760 }, 812 },
761 // 点击商家有礼 813 // 点击商家有礼
@@ -88,6 +88,11 @@ @@ -88,6 +88,11 @@
88 font-family: PingFang SC; 88 font-family: PingFang SC;
89 margin-left: 40rpx; 89 margin-left: 40rpx;
90 font-weight: 600; 90 font-weight: 600;
  91 + display: -webkit-box;
  92 + word-break: break-all;
  93 + word-wrap: break-word;
  94 + overflow: hidden;
  95 + text-align: left;
91 } 96 }
92 97
93 .pageSpacing { 98 .pageSpacing {
1 -// pages/customer/detail_owner_invitation2.js 1 +// pages/customer/detail_owner_invitation_new.js
2 import App from '../../utils/api'; 2 import App from '../../utils/api';
3 import TP from '../../utils/tpls'; 3 import TP from '../../utils/tpls';
4 import RS from '../../utils/reserveStatus' 4 import RS from '../../utils/reserveStatus'
@@ -72,18 +72,57 @@ Page({ @@ -72,18 +72,57 @@ Page({
72 rid: this.data.options.id 72 rid: this.data.options.id
73 }).then(res => { 73 }).then(res => {
74 let reserev = RS.reserve(res.data) 74 let reserev = RS.reserve(res.data)
75 - let daily = reserev.seller.daily; 75 + this.getLocalLunchTime(reserev);
  76 + }).catch(res => {
  77 + console.log(res, '详情请求失败');
  78 + })
  79 + },
  80 + // 获取日期对应的时段
  81 + getLocalLunchTime(reserev) {
  82 + let ddateStr = new Date(reserev.ddate * 1000)
  83 + let year1 = ddateStr.getFullYear();
  84 + let month1 = ddateStr.getMonth() + 1;
  85 + let day1 = ddateStr.getDate();
  86 + let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + day1;
  87 + App.Seller.getMealSectionByDay({
  88 + sellerid: reserev.sid,
  89 + day: day2,
  90 + }).then(res => {
  91 + let data = res.data;
  92 + let lunchDinnerList = [];
  93 + if (data.length <= 3 && !data[0].ddate_solt) {
  94 + data.forEach(i => {
  95 + if (i.mname == '早餐') {
  96 + lunchDinnerList.push({
  97 + mname: "早餐",
  98 + mdate: i.mdate,
  99 + ddate_solt: 1,
  100 + })
  101 + }
  102 + if (i.mname == '午餐') {
  103 + lunchDinnerList.push({
  104 + mname: "午餐",
  105 + mdate: i.mdate,
  106 + ddate_solt: 2,
  107 + })
  108 + }
  109 + if (i.mname == '晚餐') {
  110 + lunchDinnerList.push({
  111 + mname: "晚餐",
  112 + mdate: i.mdate,
  113 + ddate_solt: 3,
  114 + })
  115 + }
  116 + })
  117 + } else {
  118 + lunchDinnerList = data;
  119 + }
76 let time; 120 let time;
77 - switch (reserev.ddate_solt) {  
78 - case '1':  
79 - time = daily.morning.split("-")[1];  
80 - break;  
81 - case '2':  
82 - time = daily.noon.split("-")[1];  
83 - break;  
84 - case '3':  
85 - time = daily.night.split("-")[1];  
86 - break; 121 + let obj = lunchDinnerList.filter(i => {
  122 + return i.ddate_solt == reserev.ddate_solt
  123 + })
  124 + if (obj && obj.length > 0) {
  125 + time = obj[0].mdate.split('-')[1];
87 } 126 }
88 let timeHour = time.split(":")[0]; //预订日期--预订餐段的截止时间--小时 127 let timeHour = time.split(":")[0]; //预订日期--预订餐段的截止时间--小时
89 let timeMinute = time.split(":")[1]; //预订日期--预订餐段的截止时间--分钟 128 let timeMinute = time.split(":")[1]; //预订日期--预订餐段的截止时间--分钟
@@ -92,9 +131,9 @@ Page({ @@ -92,9 +131,9 @@ Page({
92 const month = date.getMonth() + 1; 131 const month = date.getMonth() + 1;
93 const day = date.getDate(); 132 const day = date.getDate();
94 let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1) 133 let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
95 - this.getSellerDetail(RS.reserve(res.data).sid, isOrder, reserev) 134 + this.getSellerDetail(reserev.sid, isOrder, reserev)
96 }).catch(res => { 135 }).catch(res => {
97 - console.log(res, '详情请求失败'); 136 + console.log(res, '获取多时段失败');
98 }) 137 })
99 }, 138 },
100 // 获取店铺详情 139 // 获取店铺详情
@@ -792,4 +792,9 @@ export default { @@ -792,4 +792,9 @@ export default {
792 cachetime: 0, 792 cachetime: 0,
793 }, 793 },
794 794
  795 + //获取日期对应的时段
  796 + 'App.Seller.getMealSectionByDay':{
  797 + alias:'App.Seller.getMealSectionByDay',
  798 + cachetime: 0,
  799 + },
795 } 800 }