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({
})
let reserev = RS.reserve(res.data)
let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
let daily=reserev.seller.daily;
this.setData({
seller: {
soltName: reserev.soltName,
date: dateSmart,
tableNum: res.data.actual_pum ? res.data.actual_pum : '',
tablesText
},
})
this.getLocalLunchTime(obj, reserev)
}).catch(res => {
console.log(res, '详情请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(obj, reserev) {
let ddateStr = new Date(reserev.ddate * 1000)
let year1 = ddateStr.getFullYear();
let month1 = ddateStr.getMonth() + 1;
let day1 = ddateStr.getDate();
let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + day1;
App.Seller.getMealSectionByDay({
sellerid: reserev.sid,
day: day2,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
if (data.length <= 3 && !data[0].ddate_solt) {
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
lunchDinnerList = data;
}
let time;
switch (reserev.ddate_solt) {
case '1':
time=daily.morning.split("-")[1];
break;
case '2':
time=daily.noon.split("-")[1];
break;
case '3':
time=daily.night.split("-")[1];
break;
let obj1 = lunchDinnerList.filter(i => {
return i.ddate_solt == reserev.ddate_solt
})
if (obj1 && obj1.length > 0) {
time = obj1[0].mdate.split('-')[1];
}
let timeHour=time.split(":")[0];//预订日期--预订餐段的截止时间--小时
let timeMinute=time.split(":")[1];//预订日期--预订餐段的截止时间--分钟
... ... @@ -107,19 +154,13 @@ Page({
// 是否可以下单（超过该预订的餐段截止时间，不可以下单）
let isOrder=this.isCurrentTimeGreaterThan(year,month,day,timeHour*1,timeMinute*1)
this.setData({
seller: {
soltName: reserev.soltName,
date: dateSmart,
tableNum:res.data.actual_pum?res.data.actual_pum:'',
tablesText
},
isOrder,
})
setTimeout(() => {
this.getCheckCookList(obj)
},100)
}).catch(res => {
console.log(res, '详情请求失败');
console.log(res, '获取多时段失败');
})
},
// 判断是否超过该预订的餐段截止时间
... ...
... ... @@ -13,6 +13,7 @@ Page({
vipProbablyPrice: '',
notes: '',
tpls: [],
reserev:{},
seller: {},
options: {},
rechargeList:[],
... ... @@ -426,30 +427,54 @@ Page({
if (this.data.changeType == '1') {
return this.myToast.showToast('您的订单已经下达给商家，如果需要改菜需和商家确认，以免产生误解。', 3000)
}
App.Reserve.Detail({
rid: this.data.options.rid
let ddateStr = new Date(this.data.reserev.ddate * 1000)
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
// 获取日期对应的时段
App.Seller.getMealSectionByDay({
sellerid: this.data.options.sid,
day: day1,
}).then(res => {
let daily = res.data.seller.daily
let str = ''
switch (res.data.ddate_solt) {
case '1':
str = 'morning'
break;
case '2':
str = 'noon'
break;
case '3':
str = 'night'
break;
let data = res.data;
let lunchDinnerList = [];
if (data.length <= 3 && !data[0].ddate_solt) {
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
lunchDinnerList = data;
}
const currentTimestamp = Date.now();
let dur;
Object.keys(daily).forEach(k => {
if (k == str) {
dur = daily[k].split('-')[0];
}
const currentTimestamp = Date.now();
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == this.data.reserev.ddate_solt
})
let ddate = util.unixtoTime(this.data.seller.reserev.ddate, 'YYYY-MM-DD');
if (obj && obj.length > 0) {
dur = obj[0].mdate.split('-')[0];
}
let ddate = util.unixtoTime(this.data.reserev.ddate, 'YYYY-MM-DD');
const dateTimeString = `${ddate}T${dur}:00`;
const timestamp = new Date(dateTimeString).getTime();
let times = 0;
... ... @@ -513,12 +538,12 @@ Page({
let reserev = RS.reserve(res.data)
let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
this.setData({
reserev,
seller: {
soltName: reserev.soltName,
date: dateSmart,
tableNum:res.data.actual_pum?res.data.actual_pum:'',
tablesText,
reserev,
map_address:reserev.seller.map_address,
}
})
... ...
... ... @@ -52,6 +52,7 @@ Page({
imgSrc: '', //canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [], //餐段时间
isMany:'0',//0默认餐段 1多时段
temp_ddate: '', //展示的到店时间
lite_style: '', //小程序转发卡片样式
isMoreBtn: '', //再次预订按钮
... ... @@ -292,8 +293,8 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
... ... @@ -323,7 +324,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -529,13 +530,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -553,7 +555,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -684,16 +686,7 @@ Page({
if (store) store = this.processInfo(store, '2')
if (signboard) signboard = this.processInfo(signboard, '3')
if (chef) chef = this.processInfo(chef, '4')
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -704,7 +697,6 @@ Page({
swich_phone,
StyleType,
lite_style: data.lite_style,
timeList,
is_comments,
couponList,
isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
... ... @@ -725,19 +717,78 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
this.painterBtn(data.lite_style);
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
... ...
... ... @@ -65,6 +65,11 @@
font-family: PingFang SC;
margin-left: 4rpx;
font-weight: 600;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.contentDataPhone {
... ...
... ... @@ -51,6 +51,7 @@ Page({
colors: '', //导航栏颜色
couponData: '', //评价赠送优惠券数据
timeList: [], //餐段时间
isMany:'0',//0默认餐段 1多时段
temp_ddate: '', //展示的到店时间
lite_style: '', //小程序转发卡片样式
isMoreBtn: '', //再次预订按钮
... ... @@ -320,8 +321,8 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
... ... @@ -342,7 +343,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -546,13 +547,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -570,7 +572,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -699,16 +701,7 @@ Page({
if (store) store = this.processInfo(store, '2')
if (signboard) signboard = this.processInfo(signboard, '3')
if (chef) chef = this.processInfo(chef, '4')
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let bookType = this.data.bookType;
let urlsArr = this.data.urlsArr
marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
... ... @@ -724,7 +717,6 @@ Page({
swich_phone,
StyleType,
lite_style: data.lite_style,
timeList,
is_comments,
couponList,
isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
... ... @@ -747,19 +739,78 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
this.painterBtn(data.lite_style);
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
... ...
... ... @@ -51,6 +51,7 @@ Page({
colors: '', //导航栏颜色
couponData: '', //评价赠送优惠券数据
timeList: [], //餐段时间
isMany:'0',//0默认餐段 1多时段
temp_ddate: '', //展示的到店时间
lite_style: '', //小程序转发卡片样式
isMoreBtn: '', //再次预订按钮
... ... @@ -328,8 +329,8 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
... ... @@ -350,7 +351,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -555,13 +556,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -579,7 +581,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -708,16 +710,7 @@ Page({
if (store) store = this.processInfo(store, '2')
if (signboard) signboard = this.processInfo(signboard, '3')
if (chef) chef = this.processInfo(chef, '4')
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let bookType = this.data.bookType;
let urlsArr = this.data.urlsArr
marketing.wecomle = (reserve && reserve.swich_welcome == '1' && marketing && marketing.wecomle) ? marketing.wecomle : ''
... ... @@ -733,7 +726,6 @@ Page({
swich_phone,
StyleType,
lite_style: data.lite_style,
timeList,
is_comments,
couponList,
isMoreBtn: marketing && marketing.is_online_book == '1' && this.data.options.onlineReserve == '1',
... ... @@ -756,19 +748,78 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
this.painterBtn(data.lite_style);
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
... ...
... ... @@ -61,6 +61,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -289,9 +290,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail: this.formatDatail(reserev, dateSmart),
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -309,7 +311,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -514,13 +516,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -538,7 +541,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -713,16 +716,7 @@ Page({
themeSixteen = '#fbf6f1'
break;
}
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -737,7 +731,6 @@ Page({
themeColor,
themeSixteen,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -755,21 +748,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -44,6 +44,11 @@
line-height: 60rpx;
font-family: PingFang SC;
color: #FFD200;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.handleInfoBox {
... ...
... ... @@ -61,6 +61,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -289,9 +290,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
this.setData({
detail: this.formatDatail(reserev, dateSmart),
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -309,7 +311,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -514,13 +516,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -538,7 +541,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -669,16 +672,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -692,7 +686,6 @@ Page({
titleType,
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -710,21 +703,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -157,6 +157,11 @@
font-family: PingFang SC;
margin-left: 40rpx;
color: #FFD200;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.handleInfo {
... ...
... ... @@ -61,6 +61,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -289,9 +290,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
this.setData({
detail: this.formatDatail(reserev, dateSmart),
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -309,7 +311,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -514,13 +516,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -538,7 +541,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -669,16 +672,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -692,7 +686,6 @@ Page({
titleType,
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -710,22 +703,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -60,6 +60,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -288,9 +289,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
this.setData({
detail: this.formatDatail(reserev, dateSmart),
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -308,7 +310,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -513,13 +515,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -537,7 +540,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -668,16 +671,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -691,7 +685,6 @@ Page({
titleType,
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -709,21 +702,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -62,6 +62,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -246,8 +247,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail: this.formatDatail(reserev, dateSmart),
detail,
tableNum,
is_user_comments: res.data.is_user_comments,
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({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
lat: reserev.seller.lat,
long: reserev.seller.long,
... ... @@ -466,13 +469,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -490,7 +494,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -624,16 +628,7 @@ Page({
} else {
whiteBj = false
}
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -648,7 +643,6 @@ Page({
themeColor,
whiteBj,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -666,19 +660,78 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
... ...
... ... @@ -101,7 +101,12 @@
flex: 1;
line-height: 60rpx;
color: #000000;
font-family: PingFang SC;
font-family: PingFang SC;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.handleInfo {
... ... @@ -1137,12 +1142,12 @@
align-items: center;
}
.arrivalBox button{
.arrivalBox button {
display: flex;
font-size: 24rpx;
flex-direction: column;
height: 50rpx;
padding: 0 18rpx;
padding: 0 15rpx;
line-height: 48rpx;
font-family: PingFang SC;
border-radius: 40rpx;
... ...
... ... @@ -61,6 +61,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -289,9 +290,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
this.setData({
detail: this.formatDatail(reserev, dateSmart),
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -309,7 +311,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -514,13 +516,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -538,7 +541,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -669,16 +672,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -692,7 +686,6 @@ Page({
titleType,
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -710,21 +703,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -85,6 +85,11 @@
font-family: PingFang SC;
margin-left: 40rpx;
color: #FFD200;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.handleInfo {
... ...
... ... @@ -61,6 +61,7 @@ Page({
imgSrc:'',//canvas图片地址
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -289,9 +290,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
this.setData({
detail: this.formatDatail(reserev, dateSmart),
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -310,7 +312,7 @@ Page({
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
phone:reserev.phone,
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -513,13 +515,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -537,7 +540,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -668,16 +671,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj ={
chef,
marketing,
... ... @@ -691,7 +685,6 @@ Page({
titleType,
themeColor,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -709,21 +702,80 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(data.lite_style);
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
}).catch(res => {
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
gotoSellerGift(e){
this.couponModal.closeModal()
... ...
... ... @@ -91,6 +91,11 @@
font-family: PingFang SC;
margin-left: 80rpx;
color: #FFD200;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.handleInfo {
... ...
... ... @@ -69,6 +69,7 @@ Page({
colors:'',//导航栏颜色
couponData: '', //评价赠送优惠券数据
timeList: [],
isMany:'0',//0默认餐段 1多时段
temp_ddate:'',//展示的到店时间
lite_style:'',//小程序转发卡片样式
isMoreBtn:'',//再次预订按钮
... ... @@ -306,9 +307,10 @@ Page({
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
console.log('dateSmart', dateSmart);
let detail = this.formatDatail(reserev, dateSmart)
reserev.soltName = '';
this.setData({
detail: this.formatDatail(reserev, dateSmart),
detail,
tableNum,
tableinfo,
is_user_comments: res.data.is_user_comments,
... ... @@ -326,7 +328,7 @@ Page({
is_set_ddate: reserev.is_set_ddate,
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
tel: reserev.seller.seller_tel.split(','),
soltName: reserev.soltName,
soltName: reserev.soltName || detail.mname,
dateTime: util.unixtoTime(reserev.ddate, 'HH:II'),
time: util.unixtoTime(reserev.ddate, '星期WW HH:II'),
lat: reserev.seller.lat,
... ... @@ -533,13 +535,14 @@ Page({
let type1 = style[0];
let type2 = style[1];
let data = this.data.detail;
let isMany = this.data.isMany;
let img = data.seller.seller_image.replace(/^http:/, "https:");
let d = data.ddate_solt;
let date1 = util.unixtoTime(data.ddate, 'MM月DD日');
let date2 = util.unixtoTime(data.ddate, 'MM/DD');
let week = ' ' + util.unixtoTime(data.ddate, '周WW');
let timeSlot1 = ' ' + (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '');
let timeSlot2 = ' ' + (d == '1' ? '早餐' : d == '2' ? '午餐' : d == '3' ? '晚餐' : '');
let timeSlot1 = ' ' + (isMany == '0' ? (d == '1' ? '早上' : d == '2' ? '中午' : d == '3' ? '晚上' : '') : data.mname);
let timeSlot2 = ' ' + this.data.seller.soltName;
let time = this.data.temp_ddate ? ' ' + this.data.temp_ddate : ' ' + util.unixtoTime(data.ddate, 'HH:II')
time = timeStr ? timeStr : time;
let [day1, day2] = [...util.unixtoTime(data.ddate, '周WW')]
... ... @@ -557,7 +560,7 @@ Page({
section = type2 == '1' ? week + time + timeSlot2 : type2 == '2' ? week + timeSlot1 : type2 == '3' ? week + time : type2 == '4' ? week + timeSlot2 : '';
}
if (type1 == '3' || type1 == '4') {
section = type2 == '1' ? timeSlot2.trim() + time : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
section = type2 == '1' ? time + timeSlot2.trim() : type2 == '2' ? timeSlot1.trim() : type2 == '3' ? time.trim() : type2 == '4' ? timeSlot2.trim() : '';
}
}
this.setData({
... ... @@ -699,16 +702,7 @@ Page({
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
let solt = this.data.detail.ddate_solt;
let lunchDis = this.data.seller.daily;
let timeList = []
var morningStr = lunchDis.morning.split("-");
var morningArr = lunchDis.morning ? this.computeHour(morningStr[0], morningStr[1], 30) : [];
var noonStr = lunchDis.noon.split("-");
var noonArr = lunchDis.noon ? this.computeHour(noonStr[0], noonStr[1], 30) : [];
var nightStr = lunchDis.night.split("-");
var nightArr = lunchDis.night ? this.computeHour(nightStr[0], nightStr[1], 30) : [];
timeList = solt == '1' ? morningArr : solt == '2' ? noonArr : solt == '3' ? nightArr : []
this.getLocalLunchTime(data.lite_style);
let obj = {
chef,
marketing,
... ... @@ -725,7 +719,6 @@ Page({
inviteImgUrl,
colors,
lite_style:data.lite_style,
timeList,
couponList,
isMoreBtn:marketing && marketing.is_online_book=='1' && this.data.options.onlineReserve == '1',
isShareItem: this.data.options.isOrder != '1' && marketing && marketing.is_transpond=='1',
... ... @@ -743,19 +736,78 @@ Page({
})
this.textToSpeechFun(reserve.voice_info)
}
// 获取转发客人卡片设置
let detailInfo = this.data.detail;
data.lite_style = data.lite_style || '3';
let liteStyle = data.lite_style.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detailInfo.seller.seller_image
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(lite_style) {
let detail = this.data.detail;
let ddateStr = new Date(detail.ddate * 1000);
let year = ddateStr.getFullYear();
let month = ddateStr.getMonth() + 1;
let day = ddateStr.getDate();
let day1 = year + '-' + (month < 10 ? '0' + month : month) + '-' + day;
App.Seller.getMealSectionByDay({
sellerid: detail.seller.id,
day: day1,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
let isMany = '0';//0默认餐段 1多时段
if (data.length <= 3 && !data[0].ddate_solt) {
isMany = '0';
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
this.painterBtn(data.lite_style);
isMany = '1';
lunchDinnerList = data;
}
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == detail.ddate_solt
})
var timeList = [];
if (obj && obj.length > 0) {
var time = obj[0].mdate.split("-");
timeList = this.computeHour(time[0], time[1], 15);
}
this.setData({
timeList,
isMany,
})
// 获取转发客人卡片设置
let lite = lite_style || '3';
let liteStyle = lite.split('-');
if (liteStyle[0] == '0') {
this.setData({
imgSrc: detail.seller.seller_image
})
} else {
this.painterBtn(lite);
}
}).catch(res => {
console.log('GetSellerTemplateConf请求失败');
console.log(res, '获取多时段失败');
})
},
// 点击商家有礼
... ...
... ... @@ -88,6 +88,11 @@
font-family: PingFang SC;
margin-left: 40rpx;
font-weight: 600;
display: -webkit-box;
word-break: break-all;
word-wrap: break-word;
overflow: hidden;
text-align: left;
}
.pageSpacing {
... ...
// pages/customer/detail_owner_invitation2.js
// pages/customer/detail_owner_invitation_new.js
import App from '../../utils/api';
import TP from '../../utils/tpls';
import RS from '../../utils/reserveStatus'
... ... @@ -72,18 +72,57 @@ Page({
rid: this.data.options.id
}).then(res => {
let reserev = RS.reserve(res.data)
let daily = reserev.seller.daily;
this.getLocalLunchTime(reserev);
}).catch(res => {
console.log(res, '详情请求失败');
})
},
// 获取日期对应的时段
getLocalLunchTime(reserev) {
let ddateStr = new Date(reserev.ddate * 1000)
let year1 = ddateStr.getFullYear();
let month1 = ddateStr.getMonth() + 1;
let day1 = ddateStr.getDate();
let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + day1;
App.Seller.getMealSectionByDay({
sellerid: reserev.sid,
day: day2,
}).then(res => {
let data = res.data;
let lunchDinnerList = [];
if (data.length <= 3 && !data[0].ddate_solt) {
data.forEach(i => {
if (i.mname == '早餐') {
lunchDinnerList.push({
mname: "早餐",
mdate: i.mdate,
ddate_solt: 1,
})
}
if (i.mname == '午餐') {
lunchDinnerList.push({
mname: "午餐",
mdate: i.mdate,
ddate_solt: 2,
})
}
if (i.mname == '晚餐') {
lunchDinnerList.push({
mname: "晚餐",
mdate: i.mdate,
ddate_solt: 3,
})
}
})
} else {
lunchDinnerList = data;
}
let time;
switch (reserev.ddate_solt) {
case '1':
time = daily.morning.split("-")[1];
break;
case '2':
time = daily.noon.split("-")[1];
break;
case '3':
time = daily.night.split("-")[1];
break;
let obj = lunchDinnerList.filter(i => {
return i.ddate_solt == reserev.ddate_solt
})
if (obj && obj.length > 0) {
time = obj[0].mdate.split('-')[1];
}
let timeHour = time.split(":")[0]; //预订日期--预订餐段的截止时间--小时
let timeMinute = time.split(":")[1]; //预订日期--预订餐段的截止时间--分钟
... ... @@ -92,9 +131,9 @@ Page({
const month = date.getMonth() + 1;
const day = date.getDate();
let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1)
this.getSellerDetail(RS.reserve(res.data).sid, isOrder, reserev)
this.getSellerDetail(reserev.sid, isOrder, reserev)
}).catch(res => {
console.log(res, '详情请求失败');
console.log(res, '获取多时段失败');
})
},
// 获取店铺详情
... ...
... ... @@ -792,4 +792,9 @@ export default {
cachetime: 0,
},
//获取日期对应的时段
'App.Seller.getMealSectionByDay':{
alias:'App.Seller.getMealSectionByDay',
cachetime: 0,
},
}
\ No newline at end of file
... ...