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({ @@ -36,6 +36,10 @@ Page({
36 { 36 {
37 sex: '公司', 37 sex: '公司',
38 value: '3', 38 value: '3',
  39 + },
  40 + {
  41 + sex: '贵宾',
  42 + value: '4',
39 } 43 }
40 ] 44 ]
41 }, 45 },
@@ -259,7 +263,7 @@ Page({ @@ -259,7 +263,7 @@ Page({
259 } 263 }
260 }, 264 },
261 getInfo() { 265 getInfo() {
262 - let sex = this.data.indexs * 1 + 1; //1男 2女 3公司 266 + let sex = this.data.indexs * 1 + 1; //1男 2女 3公司 4贵宾
263 App.GuestManage.GetIsMemberByPhone({ 267 App.GuestManage.GetIsMemberByPhone({
264 sid: this.data.opt.sid, 268 sid: this.data.opt.sid,
265 phone: this.data.phone, 269 phone: this.data.phone,
@@ -45,7 +45,7 @@ Component({ @@ -45,7 +45,7 @@ Component({
45 if(item.sex==3){ 45 if(item.sex==3){
46 item.rname_mask=item.rname.substr(0,10) 46 item.rname_mask=item.rname.substr(0,10)
47 }else{ 47 }else{
48 - item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士') 48 + item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':item.sex==2?'女士':item.sex==4?'贵宾':'')
49 } 49 }
50 }else{ 50 }else{
51 item.rname_mask='' 51 item.rname_mask=''
@@ -40,6 +40,11 @@ Page({ @@ -40,6 +40,11 @@ Page({
40 sex: 3, 40 sex: 3,
41 grand_title: '公司', 41 grand_title: '公司',
42 isselect: false 42 isselect: false
  43 + },
  44 + {
  45 + sex: 4,
  46 + grand_title: '贵宾',
  47 + isselect: false
43 } 48 }
44 ], 49 ],
45 buttonhide: true, 50 buttonhide: true,
@@ -131,7 +131,7 @@ Page({ @@ -131,7 +131,7 @@ Page({
131 if(r.sex==3){ 131 if(r.sex==3){
132 rname=r.rname.substr(0,10) 132 rname=r.rname.substr(0,10)
133 }else{ 133 }else{
134 - rname=r.rname.substr(0,1)+(r.sex==1?'先生':'女士') 134 + rname=r.rname.substr(0,1)+(r.sex==1?'先生':r.sex==2?'女士':r.sex==4?'贵宾':'')
135 } 135 }
136 }else{ 136 }else{
137 rname=" " 137 rname=" "
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 </view> 75 </view>
76 <view class="flex-lr order-detail"> 76 <view class="flex-lr order-detail">
77 <text class="gray-deep-font font30r" space="true" decode="true">客户姓名</text> 77 <text class="gray-deep-font font30r" space="true" decode="true">客户姓名</text>
78 - <view class="black-font font34r" wx:if="{{bookInfo.rname}}">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':(bookInfo.sex==2?'女士':'')}}</view> 78 + <view class="black-font font34r" wx:if="{{bookInfo.rname}}">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':bookInfo.sex==2?'女士':bookInfo.sex==4?'贵宾':''}}</view>
79 </view> 79 </view>
80 <view class="flex-lr order-detail"> 80 <view class="flex-lr order-detail">
81 <view class="gray-deep-font font30r">客户电话</view> 81 <view class="gray-deep-font font30r">客户电话</view>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <view class="flex-lr"> 28 <view class="flex-lr">
29 <view class="flex-ll"> 29 <view class="flex-ll">
30 <view class="label">预订客户：</view> 30 <view class="label">预订客户：</view>
31 - <view class="content">{{item.rname}} {{['','先生','女士',''][item.sex]}}</view> 31 + <view class="content">{{item.rname}} {{['','先生','女士','','贵宾'][item.sex]}}</view>
32 </view> 32 </view>
33 <view class="button" wx:if="{{item.status==0}}">立即处理</view> 33 <view class="button" wx:if="{{item.status==0}}">立即处理</view>
34 </view> 34 </view>
@@ -159,7 +159,7 @@ Page({ @@ -159,7 +159,7 @@ Page({
159 if(r.sex==3){ 159 if(r.sex==3){
160 rname=r.rname.substr(0,10) 160 rname=r.rname.substr(0,10)
161 }else{ 161 }else{
162 - rname=r.rname.substr(0,1)+(r.sex==1?'先生':'女士') 162 + rname=r.rname.substr(0,1)+(r.sex==1?'先生':r.sex==2?'女士':r.sex==4?'贵宾':'')
163 } 163 }
164 }else{ 164 }else{
165 rname=" " 165 rname=" "
@@ -40,6 +40,11 @@ Page({ @@ -40,6 +40,11 @@ Page({
40 sex: 3, 40 sex: 3,
41 grand_title: '公司', 41 grand_title: '公司',
42 isselect: false 42 isselect: false
  43 + },
  44 + {
  45 + sex: 4,
  46 + grand_title: '贵宾',
  47 + isselect: false
43 } 48 }
44 ], 49 ],
45 buttonhide: true, 50 buttonhide: true,
@@ -294,7 +294,7 @@ Page({ @@ -294,7 +294,7 @@ Page({
294 + (detail.tables[0].tid == 2 ? '包间' : ''); 294 + (detail.tables[0].tid == 2 ? '包间' : '');
295 } 295 }
296 if (detail.rname && detail.sex != 3) { 296 if (detail.rname && detail.sex != 3) {
297 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士') 297 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
298 } else { 298 } else {
299 detail.rnameStr = detail.rname 299 detail.rnameStr = detail.rname
300 } 300 }
@@ -279,7 +279,7 @@ cli(){ @@ -279,7 +279,7 @@ cli(){
279 + (detail.tables[0].tid == 2 ? '包间' : ''); 279 + (detail.tables[0].tid == 2 ? '包间' : '');
280 } 280 }
281 if (detail.rname && detail.sex != 3) { 281 if (detail.rname && detail.sex != 3) {
282 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士') 282 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
283 } else { 283 } else {
284 detail.rnameStr = detail.rname 284 detail.rnameStr = detail.rname
285 } 285 }
@@ -291,7 +291,7 @@ Page({ @@ -291,7 +291,7 @@ Page({
291 (detail.tables[0].tid == 2 ? '包间' : ''); 291 (detail.tables[0].tid == 2 ? '包间' : '');
292 } 292 }
293 if (detail.rname && detail.sex != 3) { 293 if (detail.rname && detail.sex != 3) {
294 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士') 294 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '' )
295 } else { 295 } else {
296 detail.rnameStr = detail.rname 296 detail.rnameStr = detail.rname
297 } 297 }
@@ -517,11 +517,13 @@ Page({ @@ -517,11 +517,13 @@ Page({
517 (detail.tables[0].tid == 2 ? '包间' : ''); 517 (detail.tables[0].tid == 2 ? '包间' : '');
518 } 518 }
519 detail.rname = detail.rname.trim() 519 detail.rname = detail.rname.trim()
520 - if (detail.rname && detail.sex != 3) {  
521 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
522 - } else {  
523 - detail.rnameStr = detail.rname  
524 - } 520 + if (detail.rname && detail.sex != 3) {
  521 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  522 + } else if (!detail.rname && detail.sex == 4) {
  523 + detail.rnameStr = '贵宾'
  524 + } else {
  525 + detail.rnameStr = detail.rname
  526 + }
525 detail.eatStr = '邀请您共进晚餐'; 527 detail.eatStr = '邀请您共进晚餐';
526 let hi = util.unixtoTime(detail.ddate, 'HHII'); 528 let hi = util.unixtoTime(detail.ddate, 'HHII');
527 if (hi < '10:00') { 529 if (hi < '10:00') {
@@ -696,8 +698,9 @@ Page({ @@ -696,8 +698,9 @@ Page({
696 textToSpeechFun(voice_info) { 698 textToSpeechFun(voice_info) {
697 console.log('voice_info', voice_info); 699 console.log('voice_info', voice_info);
698 let that = this; 700 let that = this;
699 - let data = this.data;  
700 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 701 + let data = this.data;
  702 + data.detail.rname = data.detail.rname.trim()
  703 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
701 let charArray = data.seller.deskStr.split(''); 704 let charArray = data.seller.deskStr.split('');
702 let modifiedArray = charArray.map(char => char + ' '); 705 let modifiedArray = charArray.map(char => char + ' ');
703 let resultString = modifiedArray.join('').slice(0, -1); 706 let resultString = modifiedArray.join('').slice(0, -1);
@@ -709,7 +712,7 @@ Page({ @@ -709,7 +712,7 @@ Page({
709 "{包间名}": resultString, 712 "{包间名}": resultString,
710 "{区域名+包间名}": data.seller.tablesText, 713 "{区域名+包间名}": data.seller.tablesText,
711 "{经理名字}": data.staffinfo.name, 714 "{经理名字}": data.staffinfo.name,
712 - "{客人姓名}": data.detail.rname + str, 715 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
713 "{预订日期}": data.seller.yearMonthDay, 716 "{预订日期}": data.seller.yearMonthDay,
714 "{桌位}": resultString, 717 "{桌位}": resultString,
715 }; 718 };
@@ -862,7 +865,7 @@ Page({ @@ -862,7 +865,7 @@ Page({
862 if (this.audioCtx) { 865 if (this.audioCtx) {
863 this.audioCtx.destroy(); // 释放音频资源 866 this.audioCtx.destroy(); // 释放音频资源
864 } 867 }
865 -z }, 868 + },
866 869
867 /** 870 /**
868 * 页面相关事件处理函数--监听用户下拉动作 871 * 页面相关事件处理函数--监听用户下拉动作
@@ -517,11 +517,13 @@ Page({ @@ -517,11 +517,13 @@ Page({
517 (detail.tables[0].tid == 2 ? '包间' : ''); 517 (detail.tables[0].tid == 2 ? '包间' : '');
518 } 518 }
519 detail.rname = detail.rname.trim() 519 detail.rname = detail.rname.trim()
520 - if (detail.rname && detail.sex != 3) {  
521 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
522 - } else {  
523 - detail.rnameStr = detail.rname  
524 - } 520 + if (detail.rname && detail.sex != 3) {
  521 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  522 + } else if (!detail.rname && detail.sex == 4) {
  523 + detail.rnameStr = '贵宾'
  524 + } else {
  525 + detail.rnameStr = detail.rname
  526 + }
525 detail.eatStr = '邀请您共进晚餐'; 527 detail.eatStr = '邀请您共进晚餐';
526 let hi = util.unixtoTime(detail.ddate, 'HHII'); 528 let hi = util.unixtoTime(detail.ddate, 'HHII');
527 if (hi < '10:00') { 529 if (hi < '10:00') {
@@ -652,7 +654,8 @@ Page({ @@ -652,7 +654,8 @@ Page({
652 console.log('voice_info', voice_info); 654 console.log('voice_info', voice_info);
653 let that = this; 655 let that = this;
654 let data = this.data; 656 let data = this.data;
655 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 657 + data.detail.rname = data.detail.rname.trim()
  658 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
656 let charArray = data.seller.deskStr.split(''); 659 let charArray = data.seller.deskStr.split('');
657 let modifiedArray = charArray.map(char => char + ' '); 660 let modifiedArray = charArray.map(char => char + ' ');
658 let resultString = modifiedArray.join('').slice(0, -1); 661 let resultString = modifiedArray.join('').slice(0, -1);
@@ -664,7 +667,7 @@ Page({ @@ -664,7 +667,7 @@ Page({
664 "{包间名}": resultString, 667 "{包间名}": resultString,
665 "{区域名+包间名}": data.seller.tablesText, 668 "{区域名+包间名}": data.seller.tablesText,
666 "{经理名字}": data.staffinfo.name, 669 "{经理名字}": data.staffinfo.name,
667 - "{客人姓名}": data.detail.rname + str, 670 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
668 "{预订日期}": data.seller.yearMonthDay, 671 "{预订日期}": data.seller.yearMonthDay,
669 "{桌位}": resultString, 672 "{桌位}": resultString,
670 }; 673 };
@@ -517,11 +517,13 @@ Page({ @@ -517,11 +517,13 @@ Page({
517 (detail.tables[0].tid == 2 ? '包间' : ''); 517 (detail.tables[0].tid == 2 ? '包间' : '');
518 } 518 }
519 detail.rname = detail.rname.trim() 519 detail.rname = detail.rname.trim()
520 - if (detail.rname && detail.sex != 3) {  
521 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
522 - } else {  
523 - detail.rnameStr = detail.rname  
524 - } 520 + if (detail.rname && detail.sex != 3) {
  521 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  522 + } else if (!detail.rname && detail.sex == 4) {
  523 + detail.rnameStr = '贵宾'
  524 + } else {
  525 + detail.rnameStr = detail.rname
  526 + }
525 detail.eatStr = '邀请您共进晚餐'; 527 detail.eatStr = '邀请您共进晚餐';
526 let hi = util.unixtoTime(detail.ddate, 'HHII'); 528 let hi = util.unixtoTime(detail.ddate, 'HHII');
527 if (hi < '10:00') { 529 if (hi < '10:00') {
@@ -652,7 +654,8 @@ Page({ @@ -652,7 +654,8 @@ Page({
652 console.log('voice_info', voice_info); 654 console.log('voice_info', voice_info);
653 let that = this; 655 let that = this;
654 let data = this.data; 656 let data = this.data;
655 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 657 + data.detail.rname = data.detail.rname.trim()
  658 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
656 let charArray = data.seller.deskStr.split(''); 659 let charArray = data.seller.deskStr.split('');
657 let modifiedArray = charArray.map(char => char + ' '); 660 let modifiedArray = charArray.map(char => char + ' ');
658 let resultString = modifiedArray.join('').slice(0, -1); 661 let resultString = modifiedArray.join('').slice(0, -1);
@@ -664,7 +667,7 @@ Page({ @@ -664,7 +667,7 @@ Page({
664 "{包间名}": resultString, 667 "{包间名}": resultString,
665 "{区域名+包间名}": data.seller.tablesText, 668 "{区域名+包间名}": data.seller.tablesText,
666 "{经理名字}": data.staffinfo.name, 669 "{经理名字}": data.staffinfo.name,
667 - "{客人姓名}": data.detail.rname + str, 670 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
668 "{预订日期}": data.seller.yearMonthDay, 671 "{预订日期}": data.seller.yearMonthDay,
669 "{桌位}": resultString, 672 "{桌位}": resultString,
670 }; 673 };
@@ -516,11 +516,13 @@ Page({ @@ -516,11 +516,13 @@ Page({
516 (detail.tables[0].tid == 2 ? '包间' : ''); 516 (detail.tables[0].tid == 2 ? '包间' : '');
517 } 517 }
518 detail.rname = detail.rname.trim() 518 detail.rname = detail.rname.trim()
519 - if (detail.rname && detail.sex != 3) {  
520 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
521 - } else {  
522 - detail.rnameStr = detail.rname  
523 - } 519 + if (detail.rname && detail.sex != 3) {
  520 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  521 + } else if (!detail.rname && detail.sex == 4) {
  522 + detail.rnameStr = '贵宾'
  523 + } else {
  524 + detail.rnameStr = detail.rname
  525 + }
524 detail.eatStr = '邀请您共进晚餐'; 526 detail.eatStr = '邀请您共进晚餐';
525 let hi = util.unixtoTime(detail.ddate, 'HHII'); 527 let hi = util.unixtoTime(detail.ddate, 'HHII');
526 if (hi < '10:00') { 528 if (hi < '10:00') {
@@ -651,7 +653,8 @@ Page({ @@ -651,7 +653,8 @@ Page({
651 console.log('voice_info', voice_info); 653 console.log('voice_info', voice_info);
652 let that = this; 654 let that = this;
653 let data = this.data; 655 let data = this.data;
654 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 656 + data.detail.rname = data.detail.rname.trim()
  657 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
655 let charArray = data.seller.deskStr.split(''); 658 let charArray = data.seller.deskStr.split('');
656 let modifiedArray = charArray.map(char => char + ' '); 659 let modifiedArray = charArray.map(char => char + ' ');
657 let resultString = modifiedArray.join('').slice(0, -1); 660 let resultString = modifiedArray.join('').slice(0, -1);
@@ -663,7 +666,7 @@ Page({ @@ -663,7 +666,7 @@ Page({
663 "{包间名}": resultString, 666 "{包间名}": resultString,
664 "{区域名+包间名}": data.seller.tablesText, 667 "{区域名+包间名}": data.seller.tablesText,
665 "{经理名字}": data.staffinfo.name, 668 "{经理名字}": data.staffinfo.name,
666 - "{客人姓名}": data.detail.rname + str, 669 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
667 "{预订日期}": data.seller.yearMonthDay, 670 "{预订日期}": data.seller.yearMonthDay,
668 "{桌位}": resultString, 671 "{桌位}": resultString,
669 }; 672 };
@@ -467,7 +467,9 @@ Page({ @@ -467,7 +467,9 @@ Page({
467 } 467 }
468 detail.rname = detail.rname.trim() 468 detail.rname = detail.rname.trim()
469 if (detail.rname && detail.sex != 3) { 469 if (detail.rname && detail.sex != 3) {
470 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士') 470 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  471 + } else if (!detail.rname && detail.sex == 4) {
  472 + detail.rnameStr = '贵宾'
471 } else { 473 } else {
472 detail.rnameStr = detail.rname 474 detail.rnameStr = detail.rname
473 } 475 }
@@ -603,11 +605,12 @@ Page({ @@ -603,11 +605,12 @@ Page({
603 console.log('voice_info', voice_info); 605 console.log('voice_info', voice_info);
604 let that = this; 606 let that = this;
605 let data = this.data; 607 let data = this.data;
606 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : '';  
607 - let charArray = data.seller.deskStr.split(''); 608 + data.detail.rname = data.detail.rname.trim()
  609 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
  610 + let charArray = data.seller.deskStr.split('');
608 let modifiedArray = charArray.map(char => char + ' '); 611 let modifiedArray = charArray.map(char => char + ' ');
609 let resultString = modifiedArray.join('').slice(0, -1); 612 let resultString = modifiedArray.join('').slice(0, -1);
610 - const replacements = { 613 + const replacements = {
611 "{年月日}": data.seller.yearMonthDay, 614 "{年月日}": data.seller.yearMonthDay,
612 "{月日}": data.seller.yearMonth, 615 "{月日}": data.seller.yearMonth,
613 "{餐段}": data.seller.soltName, 616 "{餐段}": data.seller.soltName,
@@ -615,7 +618,7 @@ Page({ @@ -615,7 +618,7 @@ Page({
615 "{包间名}": resultString, 618 "{包间名}": resultString,
616 "{区域名+包间名}": data.seller.tablesText, 619 "{区域名+包间名}": data.seller.tablesText,
617 "{经理名字}": data.staffinfo.name, 620 "{经理名字}": data.staffinfo.name,
618 - "{客人姓名}": data.detail.rname + str, 621 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
619 "{预订日期}": data.seller.yearMonthDay, 622 "{预订日期}": data.seller.yearMonthDay,
620 "{桌位}": resultString, 623 "{桌位}": resultString,
621 }; 624 };
@@ -517,11 +517,13 @@ Page({ @@ -517,11 +517,13 @@ Page({
517 (detail.tables[0].tid == 2 ? '包间' : ''); 517 (detail.tables[0].tid == 2 ? '包间' : '');
518 } 518 }
519 detail.rname = detail.rname.trim() 519 detail.rname = detail.rname.trim()
520 - if (detail.rname && detail.sex != 3) {  
521 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
522 - } else {  
523 - detail.rnameStr = detail.rname  
524 - } 520 + if (detail.rname && detail.sex != 3) {
  521 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  522 + } else if (!detail.rname && detail.sex == 4) {
  523 + detail.rnameStr = '贵宾'
  524 + } else {
  525 + detail.rnameStr = detail.rname
  526 + }
525 detail.eatStr = '邀请您共进晚餐'; 527 detail.eatStr = '邀请您共进晚餐';
526 let hi = util.unixtoTime(detail.ddate, 'HHII'); 528 let hi = util.unixtoTime(detail.ddate, 'HHII');
527 if (hi < '10:00') { 529 if (hi < '10:00') {
@@ -652,7 +654,8 @@ Page({ @@ -652,7 +654,8 @@ Page({
652 console.log('voice_info', voice_info); 654 console.log('voice_info', voice_info);
653 let that = this; 655 let that = this;
654 let data = this.data; 656 let data = this.data;
655 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 657 + data.detail.rname = data.detail.rname.trim()
  658 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
656 let charArray = data.seller.deskStr.split(''); 659 let charArray = data.seller.deskStr.split('');
657 let modifiedArray = charArray.map(char => char + ' '); 660 let modifiedArray = charArray.map(char => char + ' ');
658 let resultString = modifiedArray.join('').slice(0, -1); 661 let resultString = modifiedArray.join('').slice(0, -1);
@@ -664,7 +667,7 @@ Page({ @@ -664,7 +667,7 @@ Page({
664 "{包间名}": resultString, 667 "{包间名}": resultString,
665 "{区域名+包间名}": data.seller.tablesText, 668 "{区域名+包间名}": data.seller.tablesText,
666 "{经理名字}": data.staffinfo.name, 669 "{经理名字}": data.staffinfo.name,
667 - "{客人姓名}": data.detail.rname + str, 670 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
668 "{预订日期}": data.seller.yearMonthDay, 671 "{预订日期}": data.seller.yearMonthDay,
669 "{桌位}": resultString, 672 "{桌位}": resultString,
670 }; 673 };
@@ -516,11 +516,13 @@ Page({ @@ -516,11 +516,13 @@ Page({
516 (detail.tables[0].tid == 2 ? '包间' : ''); 516 (detail.tables[0].tid == 2 ? '包间' : '');
517 } 517 }
518 detail.rname = detail.rname.trim() 518 detail.rname = detail.rname.trim()
519 - if (detail.rname && detail.sex != 3) {  
520 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
521 - } else {  
522 - detail.rnameStr = detail.rname  
523 - } 519 + if (detail.rname && detail.sex != 3) {
  520 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  521 + } else if (!detail.rname && detail.sex == 4) {
  522 + detail.rnameStr = '贵宾'
  523 + } else {
  524 + detail.rnameStr = detail.rname
  525 + }
524 detail.eatStr = '邀请您共进晚餐'; 526 detail.eatStr = '邀请您共进晚餐';
525 let hi = util.unixtoTime(detail.ddate, 'HHII'); 527 let hi = util.unixtoTime(detail.ddate, 'HHII');
526 if (hi < '10:00') { 528 if (hi < '10:00') {
@@ -651,7 +653,8 @@ Page({ @@ -651,7 +653,8 @@ Page({
651 console.log('voice_info', voice_info); 653 console.log('voice_info', voice_info);
652 let that = this; 654 let that = this;
653 let data = this.data; 655 let data = this.data;
654 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 656 + data.detail.rname = data.detail.rname.trim()
  657 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
655 let charArray = data.seller.deskStr.split(''); 658 let charArray = data.seller.deskStr.split('');
656 let modifiedArray = charArray.map(char => char + ' '); 659 let modifiedArray = charArray.map(char => char + ' ');
657 let resultString = modifiedArray.join('').slice(0, -1); 660 let resultString = modifiedArray.join('').slice(0, -1);
@@ -663,7 +666,7 @@ Page({ @@ -663,7 +666,7 @@ Page({
663 "{包间名}": resultString, 666 "{包间名}": resultString,
664 "{区域名+包间名}": data.seller.tablesText, 667 "{区域名+包间名}": data.seller.tablesText,
665 "{经理名字}": data.staffinfo.name, 668 "{经理名字}": data.staffinfo.name,
666 - "{客人姓名}": data.detail.rname + str, 669 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
667 "{预订日期}": data.seller.yearMonthDay, 670 "{预订日期}": data.seller.yearMonthDay,
668 "{桌位}": resultString, 671 "{桌位}": resultString,
669 }; 672 };
@@ -536,11 +536,13 @@ Page({ @@ -536,11 +536,13 @@ Page({
536 (detail.tables[0].tid == 2 ? '包间' : ''); 536 (detail.tables[0].tid == 2 ? '包间' : '');
537 } 537 }
538 detail.rname = detail.rname.trim() 538 detail.rname = detail.rname.trim()
539 - if (detail.rname && detail.sex != 3) {  
540 - detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : '女士')  
541 - } else {  
542 - detail.rnameStr = detail.rname  
543 - } 539 + if (detail.rname && detail.sex != 3) {
  540 + detail.rnameStr = detail.rname.substr(0, 1) + (detail.sex == 1 ? '先生' : detail.sex == 2 ? '女士' : detail.sex == 4 ? '贵宾' : '')
  541 + } else if (!detail.rname && detail.sex == 4) {
  542 + detail.rnameStr = '贵宾'
  543 + } else {
  544 + detail.rnameStr = detail.rname
  545 + }
544 detail.eatStr = '邀请您共进晚餐'; 546 detail.eatStr = '邀请您共进晚餐';
545 let hi = util.unixtoTime(detail.ddate, 'HHII'); 547 let hi = util.unixtoTime(detail.ddate, 'HHII');
546 if (hi < '10:00') { 548 if (hi < '10:00') {
@@ -688,7 +690,8 @@ Page({ @@ -688,7 +690,8 @@ Page({
688 console.log('voice_info', voice_info); 690 console.log('voice_info', voice_info);
689 let that = this; 691 let that = this;
690 let data = this.data; 692 let data = this.data;
691 - let str = data.detail.sex == '1' ? '先生' : data.detail.sex == '2' ? '女士' : ''; 693 + data.detail.rname = data.detail.rname.trim()
  694 + let str = data.detail.sex == 1 ? '先生' : data.detail.sex == 2 ? '女士' : data.detail.sex == 4 ? '贵宾' : '';
692 let charArray = data.seller.deskStr.split(''); 695 let charArray = data.seller.deskStr.split('');
693 let modifiedArray = charArray.map(char => char + ' '); 696 let modifiedArray = charArray.map(char => char + ' ');
694 let resultString = modifiedArray.join('').slice(0, -1); 697 let resultString = modifiedArray.join('').slice(0, -1);
@@ -700,7 +703,7 @@ Page({ @@ -700,7 +703,7 @@ Page({
700 "{包间名}": resultString, 703 "{包间名}": resultString,
701 "{区域名+包间名}": data.seller.tablesText, 704 "{区域名+包间名}": data.seller.tablesText,
702 "{经理名字}": data.staffinfo.name, 705 "{经理名字}": data.staffinfo.name,
703 - "{客人姓名}": data.detail.rname + str, 706 + "{客人姓名}": data.detail.rname ? (data.detail.rname + str) : str=='贵宾' ? '贵宾' : '',
704 "{预订日期}": data.seller.yearMonthDay, 707 "{预订日期}": data.seller.yearMonthDay,
705 "{桌位}": resultString, 708 "{桌位}": resultString,
706 }; 709 };
@@ -25,6 +25,10 @@ @@ -25,6 +25,10 @@
25 data-key="sex" 25 data-key="sex"
26 data-val="3" 26 data-val="3"
27 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view> 27 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
  28 + <view bindtap="changeInput"
  29 + data-key="sex"
  30 + data-val="4"
  31 + class="text-bold margin-left-sm {{user.sex==4?'checked':''}}">贵宾</view>
28 </view> 32 </view>
29 </view> 33 </view>
30 </view> 34 </view>
@@ -33,6 +33,10 @@ @@ -33,6 +33,10 @@
33 data-key="sex" 33 data-key="sex"
34 data-val="3" 34 data-val="3"
35 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view> 35 class="text-bold margin-left-sm {{user.sex==3?'checked':''}}">公司</view>
  36 + <view bindtap="changeInput"
  37 + data-key="sex"
  38 + data-val="4"
  39 + class="text-bold margin-left-sm {{user.sex==4?'checked':''}}">贵宾</view>
36 </view> 40 </view>
37 </view> 41 </view>
38 </view> 42 </view>