xt / xcx-book · Commits

Go to a project

Commit c4d72627b626f48d30e1c55fbee0ad2832f81af8

Authored by pengye
1 parent cc6a882f
build: skipped

语音播报加预定日期和桌位字段、时间00分不读

Inline Side-by-side
Showing 7 changed files with 49 additions and 21 deletions
... ... @@ -246,7 +246,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -274,6 +275,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -558,13 +560,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -247,7 +247,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -275,6 +276,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -523,13 +525,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -247,7 +247,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -275,6 +276,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -523,13 +525,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -246,7 +246,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -274,6 +275,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -522,13 +524,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -203,7 +203,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
let dateStrDivide = util.unixtoTime(reserev.ddate, 'II分')
this.setData({
detail: this.formatDatail(reserev, dateSmart),
tableNum,
... ... @@ -228,6 +229,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -471,13 +473,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -246,7 +246,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -274,6 +275,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -516,13 +518,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...
... ... @@ -246,7 +246,8 @@ Page({
}
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
let dateStr = util.unixtoTime(reserev.ddate, 'HH点II分')
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),
... ... @@ -273,6 +274,7 @@ Page({
yearMonth,
dateStr,
deskStr,
dateStrDivide:dateStrDivide == '00分' ? '' : dateStrDivide,
}
})
console.log('reserev reserev', reserev);
... ... @@ -515,13 +517,15 @@ Page({
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
"{就餐时间}": data.seller.dateStr,
"{就餐时间}": data.seller.dateStr + data.seller.dateStrDivide,
"{包间名}": data.seller.deskStr,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": data.seller.deskStr,
};
let newStr = voice_info.replace(/{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
let newStr = voice_info.replace(/{预订日期}|{桌位}|{年月日}|{月日}|{餐段}|{就餐时间}|{包间名}|{区域名\+包间名}|{经理名字}|{客人姓名}/g, function (matched) {
return replacements[matched];
});
console.log('newStr', newStr);
... ...