xt / xcx-book · Commits

Go to a project

Commit be3f2355c9478bca4b0b6075c8bbbf20684bc66a

Authored by pengye
1 parent 27ee9bbc
build: skipped

增加“贵宾”选项

Inline Side-by-side
Showing 21 changed files with 111 additions and 65 deletions
... ... @@ -36,6 +36,10 @@ Page({
{
sex: '公司',
value: '3',
},
{
sex: '贵宾',
value: '4',
}
]
},
... ... @@ -259,7 +263,7 @@ Page({
}
},
getInfo() {
let sex = this.data.indexs * 1 + 1; //1男 2女 3公司
let sex = this.data.indexs * 1 + 1; //1男 2女 3公司 4贵宾
App.GuestManage.GetIsMemberByPhone({
sid: this.data.opt.sid,
phone: this.data.phone,
... ...
... ... @@ -45,7 +45,7 @@ Component({
if(item.sex==3){
item.rname_mask=item.rname.substr(0,10)
}else{
item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士')
item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':item.sex==2?'女士':item.sex==4?'贵宾':'')
}
}else{
item.rname_mask=''
... ...
... ... @@ -40,6 +40,11 @@ Page({
sex: 3,
grand_title: '公司',
isselect: false
},
{
sex: 4,
grand_title: '贵宾',
isselect: false
}
],
buttonhide: true,
... ...
... ... @@ -131,7 +131,7 @@ Page({
if(r.sex==3){
rname=r.rname.substr(0,10)
}else{
rname=r.rname.substr(0,1)+(r.sex==1?'先生':'女士')
rname=r.rname.substr(0,1)+(r.sex==1?'先生':r.sex==2?'女士':r.sex==4?'贵宾':'')
}
}else{
rname=" "
... ...
... ... @@ -75,7 +75,7 @@
</view>
<view class="flex-lr order-detail">
<text class="gray-deep-font font30r" space="true" decode="true">客户姓名</text>
<view class="black-font font34r" wx:if="{{bookInfo.rname}}">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':(bookInfo.sex==2?'女士':'')}}</view>
<view class="black-font font34r" wx:if="{{bookInfo.rname}}">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':bookInfo.sex==2?'女士':bookInfo.sex==4?'贵宾':''}}</view>
</view>
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">客户电话</view>
... ...
... ... @@ -28,7 +28,7 @@
<view class="flex-lr">
<view class="flex-ll">
<view class="label">预订客户：</view>
<view class="content">{{item.rname}} {{['','先生','女士',''][item.sex]}}</view>
<view class="content">{{item.rname}} {{['','先生','女士','','贵宾'][item.sex]}}</view>
</view>
<view class="button" wx:if="{{item.status==0}}">立即处理</view>
</view>
... ...
... ... @@ -159,7 +159,7 @@ Page({
if(r.sex==3){
rname=r.rname.substr(0,10)
}else{
rname=r.rname.substr(0,1)+(r.sex==1?'先生':'女士')
rname=r.rname.substr(0,1)+(r.sex==1?'先生':r.sex==2?'女士':r.sex==4?'贵宾':'')
}
}else{
rname=" "
... ...
... ... @@ -40,6 +40,11 @@ Page({
sex: 3,
grand_title: '公司',
isselect: false
},
{
sex: 4,
grand_title: '贵宾',
isselect: false
}
],
buttonhide: true,
... ...
... ... @@ -294,7 +294,7 @@ Page({
+ (detail.tables[0].tid == 2 ? '包间' : '');
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
} else {
detail.rnameStr = detail.rname
}
... ...
... ... @@ -279,7 +279,7 @@ cli(){
+ (detail.tables[0].tid == 2 ? '包间' : '');
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
} else {
detail.rnameStr = detail.rname
}
... ...
... ... @@ -291,7 +291,7 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
} else {
detail.rnameStr = detail.rname
}
... ...
... ... @@ -517,11 +517,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -696,8 +698,9 @@ Page({
textToSpeechFun(voice_info) {
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
let data = this.data;
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -709,7 +712,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ... @@ -862,7 +865,7 @@ Page({
if (this.audioCtx) {
this.audioCtx.destroy(); // 释放音频资源
}
z },
},
/**
* 页面相关事件处理函数--监听用户下拉动作
... ...
... ... @@ -517,11 +517,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -652,7 +654,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -664,7 +667,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -517,11 +517,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -652,7 +654,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -664,7 +667,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -516,11 +516,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -651,7 +653,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -663,7 +666,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -467,7 +467,9 @@ Page({
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
... ... @@ -603,11 +605,12 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
let charArray = data.seller.deskStr.split('');
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
const replacements = {
const replacements = {
"{年月日}": data.seller.yearMonthDay,
"{月日}": data.seller.yearMonth,
"{餐段}": data.seller.soltName,
... ... @@ -615,7 +618,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -517,11 +517,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -652,7 +654,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -664,7 +667,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -516,11 +516,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -651,7 +653,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -663,7 +666,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -536,11 +536,13 @@ Page({
(detail.tables[0].tid == 2 ? '包间' : '');
}
detail.rname = detail.rname.trim()
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')
} else {
detail.rnameStr = detail.rname
}
if (detail.rname && detail.sex != 3) {
detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
} else if (!detail.rname && detail.sex == 4) {
detail.rnameStr = '贵宾'
} else {
detail.rnameStr = detail.rname
}
detail.eatStr = '邀请您共进晚餐';
let hi = util.unixtoTime(detail.ddate, 'HHII');
if (hi < '10:00') {
... ... @@ -688,7 +690,8 @@ Page({
console.log('voice_info', voice_info);
let that = this;
let data = this.data;
let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';
data.detail.rname = data.detail.rname.trim()
let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
let charArray = data.seller.deskStr.split('');
let modifiedArray = charArray.map(char => char + ' ');
let resultString = modifiedArray.join('').slice(0, -1);
... ... @@ -700,7 +703,7 @@ Page({
"{包间名}": resultString,
"{区域名+包间名}": data.seller.tablesText,
"{经理名字}": data.staffinfo.name,
"{客人姓名}": data.detail.rname + str,
"{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
"{预订日期}": data.seller.yearMonthDay,
"{桌位}": resultString,
};
... ...
... ... @@ -25,6 +25,10 @@
data-key="sex"
data-val="3"
class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
<view bindtap="changeInput"
data-key="sex"
data-val="4"
class="text-bold margin-left-sm {{user.sex==4?'checked':''}}">贵宾</view>
</view>
</view>
</view>
... ...
... ... @@ -33,6 +33,10 @@
data-key="sex"
data-val="3"
class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
<view bindtap="changeInput"
data-key="sex"
data-val="4"
class="text-bold margin-left-sm {{user.sex==4?'checked':''}}">贵宾</view>
</view>
</view>
</view>
... ...