Showing
1 changed file
with
10 additions
and
49 deletions
| @@ -92,12 +92,19 @@ Page({ | @@ -92,12 +92,19 @@ Page({ | ||
| 92 | {date: util.unixtoTime(nt + 86400 * 2, 'YYYY-MM-DD'), background: '', text: '后 天'}, | 92 | {date: util.unixtoTime(nt + 86400 * 2, 'YYYY-MM-DD'), background: '', text: '后 天'}, |
| 93 | ]; | 93 | ]; |
| 94 | this.reserve_id = options.id || ''; | 94 | this.reserve_id = options.id || ''; |
| 95 | - await this.setDateStr(); | 95 | + let rev_time=parseInt(nt) |
| 96 | + if(options.hasQuick==1){ | ||
| 97 | + let rdate=options.ddate.split('-') | ||
| 98 | + if(rev_time<rdate[0] || rev_time>rdate[1]){ | ||
| 99 | + rev_time=rdate[0] | ||
| 100 | + } | ||
| 101 | + } | ||
| 102 | + await this.setDateStr(rev_time); | ||
| 96 | this.sellerid = util.cache('enter_params')['seller_id']; | 103 | this.sellerid = util.cache('enter_params')['seller_id']; |
| 97 | let timePickerArray = await comm.getDayTimeSpace(); | 104 | let timePickerArray = await comm.getDayTimeSpace(); |
| 98 | //判断hasUseDefDtime | 105 | //判断hasUseDefDtime |
| 99 | let hasUseDefDtime = true; | 106 | let hasUseDefDtime = true; |
| 100 | - let mmii = util.unixtoTime(new Date() / 1000, 'HH:II'); | 107 | + let mmii = util.unixtoTime(rev_time, 'HH:II'); |
| 101 | console.log('initLoad',mmii,this.data.defDtime[this.data.form.time],this.data.defDtime) | 108 | console.log('initLoad',mmii,this.data.defDtime[this.data.form.time],this.data.defDtime) |
| 102 | console.log('initLoad',mmii > this.data.defDtime[this.data.form.time]) | 109 | console.log('initLoad',mmii > this.data.defDtime[this.data.form.time]) |
| 103 | if (mmii > this.data.defDtime[this.data.form.time]) { | 110 | if (mmii > this.data.defDtime[this.data.form.time]) { |
| @@ -691,56 +698,10 @@ Page({ | @@ -691,56 +698,10 @@ Page({ | ||
| 691 | try { | 698 | try { |
| 692 | console.log('initQuick', options); | 699 | console.log('initQuick', options); |
| 693 | this.checkedTables[options.tid]=options.tname | 700 | this.checkedTables[options.tid]=options.tname |
| 694 | - //options.ddate=options.ddate.substr(0,10); | ||
| 695 | - options.ddate=options.ddate.split('-') | ||
| 696 | - let stime=parseInt(options.ddate[0]) | ||
| 697 | - let etime=parseInt(options.ddate[1]) | ||
| 698 | - let hasUseDefDtime=true | ||
| 699 | - let hasInSETime=false //当前时间在预订时段内 | ||
| 700 | - this.year=util.unixtoTime(stime,'YYYY'); | ||
| 701 | - //设置时间 | ||
| 702 | - let xt=parseInt(new Date()/1000) | ||
| 703 | - console.log('initQuickinitQuick',stime ,xt,etime) | ||
| 704 | - if(xt>stime && xt<etime){ | ||
| 705 | - options.ddate=xt | ||
| 706 | - hasInSETime=true | ||
| 707 | - }else{ | ||
| 708 | - options.ddate=stime | ||
| 709 | - } | ||
| 710 | - //设置日期 | ||
| 711 | - let obj = await this.setDateStr(options.ddate); | ||
| 712 | - | ||
| 713 | - let nd = util.unixtoTime(options.ddate, 'HH:II'); | ||
| 714 | - if (nd > this.data.defDtime[this.data.form.time] && hasInSETime) { | ||
| 715 | - hasUseDefDtime = false; | ||
| 716 | - } | ||
| 717 | - let timePickerIndex = this.data.timePickerIndex | ||
| 718 | - console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd) | ||
| 719 | - this.data.timePickerArray[obj.form.time].some((dd, ii) => { | ||
| 720 | - console.log('initQuick-', nd, dd) | ||
| 721 | - if (nd < dd) { | ||
| 722 | - timePickerIndex[obj.form.time] = ii; | ||
| 723 | - return true; | ||
| 724 | - } | ||
| 725 | - }) | ||
| 726 | - console.log('initQuick-timePickerIndex', timePickerIndex); | ||
| 727 | - | ||
| 728 | - obj.form.pnum = options.pnum || 6; | ||
| 729 | - obj.form.rname = ""; | ||
| 730 | - obj.form.phone = ""; | ||
| 731 | - obj.form.sex = 1; | ||
| 732 | - obj.form.cusdem = ""; | ||
| 733 | - obj.form.rid = ""; | ||
| 734 | - obj.form.tid = [options.tid]; | ||
| 735 | - this.setData({ | ||
| 736 | - timePickerIndex: timePickerIndex, | ||
| 737 | - form: obj.form, | ||
| 738 | - hasUseDefDtime: hasUseDefDtime, | ||
| 739 | - }) | 701 | + this.year=util.unixtoTime(options.ddate.substr(0,10),'YYYY'); |
| 740 | setTimeout(() => { | 702 | setTimeout(() => { |
| 741 | this.getTables(); | 703 | this.getTables(); |
| 742 | }, 300) | 704 | }, 300) |
| 743 | - | ||
| 744 | } catch (e) { | 705 | } catch (e) { |
| 745 | console.log('initQuick', e) | 706 | console.log('initQuick', e) |
| 746 | } | 707 | } |
-
Please register or login to post a comment