Showing
1 changed file
with
10 additions
and
17 deletions
| @@ -93,28 +93,20 @@ Page({ | @@ -93,28 +93,20 @@ Page({ | ||
| 93 | ]; | 93 | ]; |
| 94 | this.reserve_id = options.id || ''; | 94 | this.reserve_id = options.id || ''; |
| 95 | let rev_time=parseInt(nt) | 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 | - await this.setDateStr(rev_time); | ||
| 102 | - } | ||
| 103 | - //判断hasUseDefDtime | ||
| 104 | - let hasUseDefDtime = true; | ||
| 105 | - let mmii = util.unixtoTime(rev_time, 'HH:II'); | ||
| 106 | - if (mmii > this.data.defDtime[this.data.form.time]) { | ||
| 107 | - hasUseDefDtime = false; | ||
| 108 | - } | ||
| 109 | - console.log('initLoad::setDateStr',util.unixtoTime(rev_time,'YYYY-MM-DD HH:II'),this.data.defDtime[this.data.form.time]) | ||
| 110 | - await this.setDateStr(rev_time,hasUseDefDtime); | ||
| 111 | this.sellerid = util.cache('enter_params')['seller_id']; | 96 | this.sellerid = util.cache('enter_params')['seller_id']; |
| 112 | let timePickerArray = await comm.getDayTimeSpace(); | 97 | let timePickerArray = await comm.getDayTimeSpace(); |
| 113 | this.setData({ | 98 | this.setData({ |
| 114 | timePickerArray: timePickerArray, | 99 | timePickerArray: timePickerArray, |
| 115 | speciallist: speciallist, | 100 | speciallist: speciallist, |
| 116 | - hasUseDefDtime: hasUseDefDtime, | 101 | + //hasUseDefDtime: hasUseDefDtime, |
| 117 | }) | 102 | }) |
| 103 | + if(options.hasQuick==1){ | ||
| 104 | + let rdate=options.ddate.split('-') | ||
| 105 | + if(!(rev_time>=rdate[0] && rev_time<=rdate[1])){ | ||
| 106 | + rev_time=rdate[0] | ||
| 107 | + } | ||
| 108 | + } | ||
| 109 | + await this.setDateStr(rev_time); | ||
| 118 | if (this.reserve_id > 0) { | 110 | if (this.reserve_id > 0) { |
| 119 | this.initModify(this.reserve_id); | 111 | this.initModify(this.reserve_id); |
| 120 | } else if(options.hasQuick==1){ | 112 | } else if(options.hasQuick==1){ |
| @@ -125,7 +117,8 @@ Page({ | @@ -125,7 +117,8 @@ Page({ | ||
| 125 | }, | 117 | }, |
| 126 | 118 | ||
| 127 | hasInTimeSpace(hhii,timeIndex){ | 119 | hasInTimeSpace(hhii,timeIndex){ |
| 128 | - if(this.data.timePickerArray.length)return false | 120 | + console.log('hasInTimeSpace',this.data.timePickerArray) |
| 121 | + if(this.data.timePickerArray.length<1)return false | ||
| 129 | let timePickerArray=this.data.timePickerArray[timeIndex]; | 122 | let timePickerArray=this.data.timePickerArray[timeIndex]; |
| 130 | let tl=timePickerArray.length | 123 | let tl=timePickerArray.length |
| 131 | if(tl<1) return false | 124 | if(tl<1) return false |
-
Please register or login to post a comment