xt / xcx-book · Commits

Go to a project

Commit 200a5e5b54bc9014ed4e44d51f427857be842620

Authored by liuxuqinfhp1220
1 parent 6a74097c
build: skipped

no message

Inline Side-by-side
Showing 27 changed files with 323 additions and 75 deletions
@@ -63,7 +63,8 @@ @@ -63,7 +63,8 @@
63 "pages/book/smsbatch/update", 63 "pages/book/smsbatch/update",
64 "pages/book/smsbatch/detail", 64 "pages/book/smsbatch/detail",
65 "pages/book/smsbatch/list", 65 "pages/book/smsbatch/list",
66 - "pages/book/smsbatch/result" 66 + "pages/book/smsbatch/result",
  67 + "pages/book/roomtype/roomtype"
67 ] 68 ]
68 } 69 }
69 ], 70 ],
@@ -58,10 +58,6 @@ Component({ @@ -58,10 +58,6 @@ Component({
58 mark:'满' 58 mark:'满'
59 }) 59 })
60 }) 60 })
61 - marklist=[{  
62 - date:'2019-08-20',  
63 - mark:'满'  
64 - }]  
65 this.setData({ 61 this.setData({
66 marklist:marklist 62 marklist:marklist
67 }) 63 })
1 import App from '../../../utils/api'; 1 import App from '../../../utils/api';
2 import util from '../../../utils/util'; 2 import util from '../../../utils/util';
  3 +let dur=['morning','noon','night','midnight']
3 Component({ 4 Component({
4 properties:{ 5 properties:{
5 seller:Object, 6 seller:Object,
@@ -8,59 +9,77 @@ Component({ @@ -8,59 +9,77 @@ Component({
8 value:util.unixtoTime(new Date()/1000,'YYYY-MM-DD') 9 value:util.unixtoTime(new Date()/1000,'YYYY-MM-DD')
9 }, 10 },
10 section:String, 11 section:String,
11 - seletroom:{  
12 - type:Array,  
13 - value:[] 12 + usecondition:{
  13 + type:String,
  14 + value:'custom'
14 } 15 }
15 }, 16 },
16 data:{ 17 data:{
17 - roomlist:[  
18 - {  
19 - id:1,  
20 - name:'6人间',  
21 - mostpnum:8,  
22 - lastmoney:3000,  
23 - isfull:0,  
24 - selectnum:0,  
25 - },  
26 - {  
27 - id:2,  
28 - name:'8人间',  
29 - mostpnum:8,  
30 - lastmoney:3000,  
31 - isfull:1,  
32 - selectnum:0,  
33 - },  
34 - {  
35 - id:3,  
36 - name:'10人间',  
37 - mostpnum:8,  
38 - lastmoney:3000,  
39 - isfull:0,  
40 - selectnum:0,  
41 - },  
42 - {  
43 - id:4,  
44 - name:'16人间',  
45 - mostpnum:8,  
46 - lastmoney:3000,  
47 - isfull:0,  
48 - selectnum:0, 18 + roomlist:[],
  19 + },
  20 + observers: {
  21 + 'date,section': function(newdate,newsection) {
  22 + console.log('room',newdate,newsection)
  23 + if(newdate && newsection){
  24 + this.getroomtype();
49 } 25 }
50 - ] 26 + }
51 }, 27 },
52 methods:{ 28 methods:{
53 getroomtype(){ 29 getroomtype(){
54 - 30 + let parmdata={
  31 + sellerid:this.data.seller.id,
  32 + day:this.data.date,
  33 + interval:dur.indexOf(this.data.section)+1
  34 + }
  35 + App.Seller.GetSellerTableClass(parmdata).then((json)=>{
  36 + console.log('roomlist',json)
  37 + if(json.ret==200){
  38 + if(json.data.length>0){
  39 + if(this.data.usecondition=="custom"){
  40 + json.data.forEach((v,i)=>{
  41 + v.selectnum=0;
  42 + })
  43 + }
  44 + }
  45 + this.setData({
  46 + roomlist:json.data
  47 + })
  48 + }
  49 + })
55 }, 50 },
56 selectroom(e){ 51 selectroom(e){
57 let _target=e.currentTarget.dataset; 52 let _target=e.currentTarget.dataset;
58 - console.log(typeof _target.selectnum)  
59 - let setkey='roomlist['+_target.index+'].selectnum';  
60 - this.setData({  
61 - [setkey]:_target.selectnum+1  
62 - })  
63 - this.triggerEvent('selectroom',this.data.roomlist[_target.index]) 53 + console.log(typeof _target.selectnum,this.data.usecondition)
  54 + if(this.data.usecondition=='custom'){
  55 + let setkey='roomlist['+_target.index+'].selectnum';
  56 + this.setData({
  57 + [setkey]:_target.selectnum+1
  58 + })
  59 + let obj={
  60 + id:_target.id,
  61 + name:this.data.roomlist[_target.index].name
  62 + }
  63 + this.triggerEvent('selectroom',obj)
  64 + }else{
  65 + //////
  66 + console.log('置满')
  67 + let parmdata={
  68 + classid:_target.id,
  69 + day:this.data.date,
  70 + interval:dur.indexOf(this.data.section)+1
  71 + }
  72 + if(_target.fid){
  73 + parmdata.id=_target.fid;
  74 + }
  75 + App.Seller.SetTableClassFull(parmdata).then((json)=>{
  76 + console.log(json)
  77 + if(json.ret==200){
  78 + this.triggerEvent('changeroom',{id:_target.id,action:parmdata.id ? 'cancel' : 'confirm'})
  79 + this.getroomtype();
  80 + }
  81 + })
  82 + }
64 }, 83 },
65 cancelroom(id){ 84 cancelroom(id){
66 let roomlist=this.data.roomlist; 85 let roomlist=this.data.roomlist;
1 <view class="room-list flex-rs"> 1 <view class="room-list flex-rs">
2 <block wx:for="{{roomlist}}" wx:key="{{index}}"> 2 <block wx:for="{{roomlist}}" wx:key="{{index}}">
3 - <view class="room-item black-font {{item.isfull==1 ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum}}" catchtap="{{item.isfull==1 ? '' : 'selectroom'}}"> 3 + <view class="room-item black-font {{item.isFull && item.isFull==1 ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="{{usecondition=='seller' ? 'selectroom' : (item.isFull && item.isFull==1 ? '' : 'selectroom')}}">
4 <view class="font30r font-bold">{{item.name}}</view> 4 <view class="font30r font-bold">{{item.name}}</view>
5 - <view class="font24r room-more">最多可坐8人</view>  
6 - <view class="font20r room-consume">最低消费300元</view>  
7 - <block wx:if="{{item.isfull==1}}">  
8 - <view class="room-full black-font font24r">订满</view> 5 + <block wx:if="{{item.max}}">
  6 + <view class="font24r room-more">最多可坐{{item.max}}人</view>
9 </block> 7 </block>
10 - <block wx:if="{{item.selectnum>0}}">  
11 - <view class="room-select white-font font24r flex-cc">已选{{item.selectnum}}</view> 8 + <block wx:if="{{item.low}}">
  9 + <view class="font20r room-consume">最低消费{{item.low}}元</view>
  10 + </block>
  11 + <block wx:if="{{item.selectnum && item.selectnum>0}}">
  12 + <view class="room-select white-font font24r flex-cc yellow">已选{{item.selectnum}}</view>
  13 + </block>
  14 + <block wx:if="{{usecondition=='seller'}}">
  15 + <block wx:if="{{item.isFull && item.isFull==1}}">
  16 + <view class="room-select black-font font24r flex-cc gray">置满</view>
  17 + </block>
  18 + </block>
  19 + <block wx:else>
  20 + <block wx:if="{{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)}}">
  21 + <view class="room-full black-font font24r">订满</view>
  22 + </block>
12 </block> 23 </block>
13 </view> 24 </view>
14 </block> 25 </block>
@@ -51,8 +51,13 @@ @@ -51,8 +51,13 @@
51 position: absolute; 51 position: absolute;
52 right:0; 52 right:0;
53 top:0; 53 top:0;
54 - background: #C6A96E;  
55 border-bottom-left-radius: 10rpx; 54 border-bottom-left-radius: 10rpx;
56 padding:0 4rpx; 55 padding:0 4rpx;
57 box-sizing: border-box; 56 box-sizing: border-box;
58 } 57 }
  58 +.room-select.yellow{
  59 + background: #C6A96E;
  60 +}
  61 +.room-select.gray{
  62 + background: #E0E0E0;
  63 +}
@@ -10,12 +10,12 @@ Component({ @@ -10,12 +10,12 @@ Component({
10 } 10 }
11 }, 11 },
12 attached(){ 12 attached(){
13 - console.log('xxxxx',this.data.seller);  
14 }, 13 },
15 observers: { 14 observers: {
16 'date'(newdate){ 15 'date'(newdate){
17 - if(newdate!=''){  
18 - //今天日期 16 + console.log('section',this.data.date,newdate)
  17 + //今天日期
  18 + if(newdate){
19 let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD'); 19 let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
20 this.getsectionlist(); 20 this.getsectionlist();
21 if(today==newdate){ 21 if(today==newdate){
@@ -30,7 +30,6 @@ Component({ @@ -30,7 +30,6 @@ Component({
30 this.triggerEvent('selectsection',obj) 30 this.triggerEvent('selectsection',obj)
31 } 31 }
32 } 32 }
33 -  
34 } 33 }
35 }, 34 },
36 ready(){ 35 ready(){
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 } 9 }
10 .section-single{ 10 .section-single{
11 height:100%; 11 height:100%;
  12 + border-radius:10rpx;
12 } 13 }
13 .section-single.bg-yellow{ 14 .section-single.bg-yellow{
14 background: -webkit-linear-gradient(top, #F2D190, #C0A369); /* Safari 5.1 - 6.0 */ 15 background: -webkit-linear-gradient(top, #F2D190, #C0A369); /* Safari 5.1 - 6.0 */
@@ -16,6 +16,16 @@ Component({ @@ -16,6 +16,16 @@ Component({
16 this.room=this.selectComponent('#room'); 16 this.room=this.selectComponent('#room');
17 console.log('xxxxx',this.data.seller); 17 console.log('xxxxx',this.data.seller);
18 }, 18 },
  19 + observers: {
  20 + 'date,section': function(newdate,newsection) {
  21 + console.log('room',newdate,newsection)
  22 + if(newdate && newsection){
  23 + this.setData({
  24 + seletroomlist:[]
  25 + })
  26 + }
  27 + }
  28 + },
19 methods:{ 29 methods:{
20 selectroom(e){ 30 selectroom(e){
21 console.log(e) 31 console.log(e)
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 </view> 9 </view>
10 </block> 10 </block>
11 </view> 11 </view>
12 -<room bindselectroom="selectroom" id="room"></room>  
  12 +<room bindselectroom="selectroom" seller="{{seller}}" date="{{date}}" section="{{section}}" id="room"></room>
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <view class="line"></view> 29 <view class="line"></view>
30 <view class="right info Medium" wx:if="{{hasOnlineReserve}}"> 30 <view class="right info Medium" wx:if="{{hasOnlineReserve}}">
31 <view class="label">包间</view> 31 <view class="label">包间</view>
32 - <view class="value">{{util.getRoomName(detail.selectroom)}}</view> 32 + <view class="value">{{util.getRoomName(detail.room_demand)}}</view>
33 </view> 33 </view>
34 <view class="right info Medium" wx:else=""> 34 <view class="right info Medium" wx:else="">
35 <view class="label">包间{{detail.tables.length>1?(" ("+detail.tables.length+"个)"):""}}</view> 35 <view class="label">包间{{detail.tables.length>1?(" ("+detail.tables.length+"个)"):""}}</view>
  1 +import util from '../../../../utils/util';
  2 +import App from '../../../../utils/api';
  3 +Component({
  4 + properties:{
  5 + seller:Object,
  6 + date:{
  7 + type:String,
  8 + value:util.unixtoTime(new Date()/1000,'YYYY-MM-DD'),
  9 + },
  10 + setroom:{
  11 + type:Object,
  12 + value:{}
  13 + }
  14 + },
  15 + data:{
  16 + marklist:[]
  17 + },
  18 + attached(){
  19 + this.setData({
  20 + date:util.unixtoTime(new Date()/1000,'YYYY-MM-DD')
  21 + })
  22 + this.showYearMonth=this.getshowmonth();
  23 + this.gethousefulldate(this.data.seller,this.showYearMonth);
  24 + this.getFillDate(this.data.seller,this.showYearMonth);
  25 + this.triggerEvent('tellselectdate',{date:util.unixtoTime(new Date()/1000,'YYYY-MM-DD'),action:'defalut'});
  26 + },
  27 + observers: {
  28 + 'setroom'(newsetroom){
  29 + console.log('calendar-room',newsetroom)
  30 + if(newsetroom && newsetroom.id){
  31 + this.gethousefulldate(this.data.seller,this.showYearMonth);
  32 + this.getFillDate(this.data.seller,this.showYearMonth);
  33 + }
  34 + }
  35 + },
  36 + methods:{
  37 + //获取当前选中日期
  38 + getshowmonth(){
  39 + let datearr=this.data.date.split('-');
  40 + return{
  41 + showyear:Number(datearr[0]),
  42 + showmonth:Number(datearr[1]),
  43 + }
  44 + },
  45 + //切换月份
  46 + getmonth(e){
  47 + console.log('tellmonth',e)
  48 + this.showYearMonth=e.detail;
  49 + if(e.detail.action='click'){
  50 + this.gethousefulldate(this.data.seller,this.showYearMonth);
  51 + this.getFillDate(this.data.seller,this.showYearMonth);
  52 + }
  53 + },
  54 + //根据指定年份月份获取当月满房的日期
  55 + gethousefulldate(seller,showYearMonth){
  56 + let parmdata={
  57 + sid:seller.id,
  58 + type:'month',
  59 + date:showYearMonth.showyear+'-'+(showYearMonth.showmonth<10 ? '0'+showYearMonth.showmonth : showYearMonth.showmonth)
  60 + }
  61 + App.Customer.GetHouseFullDate(parmdata).then((json)=>{
  62 + console.log(json)
  63 + if(json.ret==200){
  64 + if(json.data && json.data.length>0){
  65 + let marklist=this.data.marklist;
  66 + json.data.forEach((v,i)=>{
  67 + marklist.push({
  68 + date:v,
  69 + mark:'满'
  70 + })
  71 + })
  72 + this.setData({
  73 + marklist:marklist
  74 + })
  75 + }
  76 +
  77 + }
  78 + })
  79 + },
  80 + getFillDate(seller,showYearMonth){
  81 + let parmdata={
  82 + sid:seller.id,
  83 + type:'month',
  84 + date:showYearMonth.showyear+'-'+(showYearMonth.showmonth<10 ? '0'+showYearMonth.showmonth : showYearMonth.showmonth)
  85 + }
  86 + App.Customer.GetTableFillUpDate(parmdata).then((json)=>{
  87 + if(json.data && json.data.length>0){
  88 + let marklist=this.data.marklist;
  89 + json.data.forEach((v,i)=>{
  90 + marklist.push({
  91 + date:v,
  92 + mark:'置'
  93 + })
  94 + })
  95 + this.setData({
  96 + marklist:marklist
  97 + })
  98 + }
  99 + })
  100 + },
  101 + tellselectdate(e){
  102 + this.triggerEvent('tellselectdate',e.detail);
  103 + }
  104 + }
  105 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {
  4 + "calendar":"/components/reserve/calendar/calendar"
  5 + }
  6 +}
  1 +<view class="calendar-cover">
  2 + <calendar seller="{{seller}}" date="{{date}}" marklist="{{marklist}}" bind:tellselectdate="tellselectdate" bind:tellmonth="getmonth"></calendar>
  3 +</view>
  1 +.calendar-cover{
  2 + width:100%;
  3 + background: #FFFBF2;
  4 +}
  1 +import util from '../../../../utils/util';
  2 +import App from '../../../../utils/api';
  3 +Page({
  4 + enter_params: {},
  5 + onLoad(options) {
  6 + this.enter_params = util.cache('enter_params');
  7 + App.Reserve.SellerInfo(this.enter_params).then(res => {
  8 + res.data.seller.daily=JSON.parse(res.data.seller.daily)
  9 + this.setData({
  10 + seller: res.data.seller,
  11 + })
  12 + })
  13 + },
  14 + selectdate(e){//日期改变
  15 + console.log('selectdate',e);
  16 + this.setData({
  17 + reserveDate:e.detail.date,
  18 + })
  19 + },
  20 + //时段改变
  21 + selectsection(e){
  22 + console.log(e);
  23 + let t=setTimeout(()=>{
  24 + this.setData({
  25 + reserveSection:e.detail.section,
  26 + })
  27 + clearTimeout(t);
  28 + },0)
  29 + },
  30 + setroom(e){
  31 + console.log(e)
  32 + this.setData({
  33 + reserveRoom:e.detail
  34 + })
  35 + }
  36 +})
  1 +{
  2 + "backgroundTextStyle":"light",
  3 + "navigationBarBackgroundColor": "#fff",
  4 + "navigationBarTextStyle":"white",
  5 + "usingComponents": {
  6 + "nav":"/components/nav/nav",
  7 + "calendar":"../../../components/book/calendar/calendar",
  8 + "section":"/components/reserve/section/section",
  9 + "select-room":"/components/reserve/room/room"
  10 + }
  11 +}
  1 +<nav id="nav">订座</nav>
  2 +<block wx:if="{{seller && seller.id}}">
  3 + <calendar seller="{{seller}}" date="{{reserveDate}}" bindtellselectdate="selectdate" setroom="{{reserveRoom}}"></calendar>
  4 + <view style="height:40rpx;"></view>
  5 + <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection"></section>
  6 + <view style="height:80rpx;"></view>
  7 + <select-room seller="{{seller}}" date="{{reserveDate}}" section="{{reserveSection}}" usecondition="seller" bindchangeroom="setroom"></select-room>
  8 +</block>
@@ -44,6 +44,14 @@ @@ -44,6 +44,14 @@
44 </view> 44 </view>
45 </view> 45 </view>
46 </formids> 46 </formids>
  47 + <formids url="/pack-book/pages/book/roomtype/roomtype">
  48 + <view class="row flex-lr" style="padding-top: 34rpx;">
  49 + <view>在线预订包间置满</view>
  50 + <view class="flex-rr">
  51 + <view class="more"></view>
  52 + </view>
  53 + </view>
  54 + </formids>
47 <formids url="/pages/customer/index?islove=customer"> 55 <formids url="/pages/customer/index?islove=customer">
48 <view class="row flex-lr" style="padding-top: 34rpx;"> 56 <view class="row flex-lr" style="padding-top: 34rpx;">
49 <view>切换到顾客模式</view> 57 <view>切换到顾客模式</view>
@@ -211,6 +211,8 @@ Page({ @@ -211,6 +211,8 @@ Page({
211 rid: this.id 211 rid: this.id
212 }).then(res => { 212 }).then(res => {
213 let detail=this.formatDatail(res.data) 213 let detail=this.formatDatail(res.data)
  214 + detail.room_demand=JSON.parse(detail.room_demand);
  215 + detail.ddate_solt=Number(detail.ddate_solt);
214 this.setData({ 216 this.setData({
215 detail: detail, 217 detail: detail,
216 hasOnlineReserve:res.data.type==1, 218 hasOnlineReserve:res.data.type==1,
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </block> 80 </block>
81 81
82 <view style="height: 40rpx;"></view> 82 <view style="height: 40rpx;"></view>
83 - <card seller="{{detail.seller}}" detail="{{detail}}" bindevent="cardEvent"></card> 83 + <card seller="{{detail.seller}}" detail="{{detail}}" bindevent="cardEvent" hasOnlineReserve="{{true}}"></card>
84 <view class="detail-info Medium" style="margin-top: 56rpx;"> 84 <view class="detail-info Medium" style="margin-top: 56rpx;">
85 <view class="flex-lr"> 85 <view class="flex-lr">
86 <view>预订人</view> 86 <view>预订人</view>
@@ -32,7 +32,8 @@ Page({ @@ -32,7 +32,8 @@ Page({
32 pages[pages.length-2].setData({ 32 pages[pages.length-2].setData({
33 user:this.data.concatlist[index] 33 user:this.data.concatlist[index]
34 }) 34 })
35 - wx.navigateBack() 35 + pages[pages.length-2].user=this.data.concatlist[index];
  36 + wx.navigateBack();
36 }else{ 37 }else{
37 let path='setting'; 38 let path='setting';
38 let i=0; 39 let i=0;
@@ -289,10 +289,10 @@ Page({ @@ -289,10 +289,10 @@ Page({
289 //包间类型改变 289 //包间类型改变
290 selectroom(e){ 290 selectroom(e){
291 console.log(e) 291 console.log(e)
292 - this.reserve.selectroom=JSON.stringify(e.detail.selectroom); 292 + this.reserve.room_demand=JSON.stringify(e.detail.selectroom);
293 }, 293 },
294 complete(){ 294 complete(){
295 - if(!this.reserve.selectroom || (this.reserve.selectroom && this.reserve.selectroom.length==0)){ 295 + if(!this.reserve.room_demand || (this.reserve.room_demand && this.reserve.room_demand.length==0)){
296 return util.toast('请选择包间类型','none'); 296 return util.toast('请选择包间类型','none');
297 } 297 }
298 this.reserve.sid=this.options.id 298 this.reserve.sid=this.options.id
@@ -335,7 +335,6 @@ Page({ @@ -335,7 +335,6 @@ Page({
335 reserveDate:e.detail.date, 335 reserveDate:e.detail.date,
336 hasFullHouse:false, 336 hasFullHouse:false,
337 fullHouseMsg:'今日所有包间已订满', 337 fullHouseMsg:'今日所有包间已订满',
338 - reserveSection:e.detail.section  
339 }) 338 })
340 } 339 }
341 }) 340 })
@@ -7,6 +7,7 @@ const _u = { @@ -7,6 +7,7 @@ const _u = {
7 phone: '', 7 phone: '',
8 remark: '', 8 remark: '',
9 } 9 }
  10 +let dur=['morning','noon','night','midnight']
10 Page({ 11 Page({
11 user: _u, 12 user: _u,
12 /** 13 /**
@@ -24,7 +25,7 @@ Page({ @@ -24,7 +25,7 @@ Page({
24 options:null, 25 options:null,
25 onLoad: function (options) { 26 onLoad: function (options) {
26 console.log(options) 27 console.log(options)
27 - options.selectroom=JSON.parse(decodeURIComponent(options.selectroom)) 28 + options.room_demand=JSON.parse(decodeURIComponent(options.room_demand))
28 this.options=options 29 this.options=options
29 this.GetSellerDetail(); 30 this.GetSellerDetail();
30 App.Customer.GetCustomerInfo().then(res=>{ 31 App.Customer.GetCustomerInfo().then(res=>{
@@ -126,15 +127,20 @@ Page({ @@ -126,15 +127,20 @@ Page({
126 return util.toast('请填写手机','none') 127 return util.toast('请填写手机','none')
127 } 128 }
128 this.hasSubmit=false; 129 this.hasSubmit=false;
  130 + let roomids=[];
  131 + this.options.room_demand.forEach((v,i)=>{
  132 + roomids.push(v.id)
  133 + })
129 App.Customer.SetReserveInfo({ 134 App.Customer.SetReserveInfo({
130 sid:this.options.sid, 135 sid:this.options.sid,
131 - pnum:this.options.pnum,  
132 ddate:this.options.ddate, 136 ddate:this.options.ddate,
133 rdate:this.getRdate(), 137 rdate:this.getRdate(),
134 rname:this.user.name, 138 rname:this.user.name,
135 sex:this.user.sex, 139 sex:this.user.sex,
136 phone:this.user.phone, 140 phone:this.user.phone,
137 cusdem:this.user.remark||'', 141 cusdem:this.user.remark||'',
  142 + ddate_solt:dur.indexOf(this.options.section)+1,
  143 + roomids:roomids.toString(),
138 }).then(res=>{ 144 }).then(res=>{
139 if(res.ret!=200){ 145 if(res.ret!=200){
140 this.hasSubmit=true; 146 this.hasSubmit=true;
@@ -49,14 +49,14 @@ @@ -49,14 +49,14 @@
49 "list": [] 49 "list": []
50 }, 50 },
51 "miniprogram": { 51 "miniprogram": {
52 - "current": 55, 52 + "current": 0,
53 "list": [ 53 "list": [
54 { 54 {
55 "id": 0, 55 "id": 0,
56 "name": "预订本-商家1", 56 "name": "预订本-商家1",
57 "pathName": "pack-book/pages/book/b_index", 57 "pathName": "pack-book/pages/book/b_index",
58 - "query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",  
59 - "scene": "1001" 58 + "query": "seller_id=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
  59 + "scene": 1001
60 }, 60 },
61 { 61 {
62 "id": 1, 62 "id": 1,
@@ -487,6 +487,13 @@ @@ -487,6 +487,13 @@
487 "pathName": "pages/me/list", 487 "pathName": "pages/me/list",
488 "query": "id=1017&act=quanzi", 488 "query": "id=1017&act=quanzi",
489 "scene": null 489 "scene": null
  490 + },
  491 + {
  492 + "id": 59,
  493 + "name": "pack-book/pages/roomtype/roomtype",
  494 + "pathName": "pack-book/pages/book/roomtype/roomtype",
  495 + "query": "seller_id=154",
  496 + "scene": null
490 } 497 }
491 ] 498 ]
492 } 499 }
@@ -307,6 +307,16 @@ export default { @@ -307,6 +307,16 @@ export default {
307 //根据openid及联系电话删除对应的数据 将其状态改为0 307 //根据openid及联系电话删除对应的数据 将其状态改为0
308 'App.Customer.DelCustomerInfo':{ 308 'App.Customer.DelCustomerInfo':{
309 openid:'openid' 309 openid:'openid'
310 - } 310 + },
  311 +
  312 + //在线预订配置-获取商家包间分类
  313 + 'App.Seller.GetSellerTableClass':null,
  314 +
  315 +
  316 + //置满包间分类
  317 + 'App.Seller.SetTableClassFull':null,
  318 +
  319 + //获取包间置满日期
  320 + 'App.Customer.GetTableFillUpDate':null
311 321
312 } 322 }
@@ -55,9 +55,9 @@ module.exports = { @@ -55,9 +55,9 @@ module.exports = {
55 reserveTimeSpace:function(enspace){ 55 reserveTimeSpace:function(enspace){
56 var names=['早餐','午餐','晚餐','夜宵']; 56 var names=['早餐','午餐','晚餐','夜宵'];
57 if(typeof enspace=='string'){ 57 if(typeof enspace=='string'){
58 - enspace={morning: 0, noon: 1, night: 2}[enspace] 58 + enspace={morning: 1, noon: 2, night: 3}[enspace]
59 } 59 }
60 - return names[enspace]||names[3] 60 + return names[enspace-1]||names[3]
61 }, 61 },
62 getRoomName:function(rooms=[]){ 62 getRoomName:function(rooms=[]){
63 if(rooms.length<1) return "" 63 if(rooms.length<1) return ""