Showing
1 changed file
with
6 additions
and
3 deletions
| @@ -80,6 +80,7 @@ Page({ | @@ -80,6 +80,7 @@ Page({ | ||
| 80 | checkedTables:{},//已选中的桌子集合 | 80 | checkedTables:{},//已选中的桌子集合 |
| 81 | year:util.unixtoTime(new Date() / 1000,'YYYY'), | 81 | year:util.unixtoTime(new Date() / 1000,'YYYY'), |
| 82 | onLoad: async function (options) { | 82 | onLoad: async function (options) { |
| 83 | + console.log('onLoad',options) | ||
| 83 | this.initLoad(options) | 84 | this.initLoad(options) |
| 84 | this.getCustomRemark(); | 85 | this.getCustomRemark(); |
| 85 | }, | 86 | }, |
| @@ -97,6 +98,8 @@ Page({ | @@ -97,6 +98,8 @@ Page({ | ||
| 97 | //判断hasUseDefDtime | 98 | //判断hasUseDefDtime |
| 98 | let hasUseDefDtime = true; | 99 | let hasUseDefDtime = true; |
| 99 | let mmii = util.unixtoTime(new Date() / 1000, 'HH:II'); | 100 | let mmii = util.unixtoTime(new Date() / 1000, 'HH:II'); |
| 101 | + 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]) | ||
| 100 | if (mmii > this.data.defDtime[this.data.form.time]) { | 103 | if (mmii > this.data.defDtime[this.data.form.time]) { |
| 101 | hasUseDefDtime = false; | 104 | hasUseDefDtime = false; |
| 102 | } | 105 | } |
| @@ -688,12 +691,12 @@ Page({ | @@ -688,12 +691,12 @@ Page({ | ||
| 688 | //设置日期 | 691 | //设置日期 |
| 689 | let obj = await this.setDateStr(options.ddate); | 692 | let obj = await this.setDateStr(options.ddate); |
| 690 | //设置时间 | 693 | //设置时间 |
| 691 | - let nd = util.unixtoTime(options.ddate, 'HH:II'); | 694 | + let nd = util.unixtoTime(new Date()/1000, 'HH:II'); |
| 692 | let timePickerIndex = this.data.timePickerIndex | 695 | let timePickerIndex = this.data.timePickerIndex |
| 693 | console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd) | 696 | console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd) |
| 694 | - this.data.timePickerArray[obj.form.time].forEach((dd, ii) => { | 697 | + this.data.timePickerArray[obj.form.time].some((dd, ii) => { |
| 695 | console.log('initQuick-', nd, dd) | 698 | console.log('initQuick-', nd, dd) |
| 696 | - if (nd == dd) { | 699 | + if (nd < dd) { |
| 697 | timePickerIndex[obj.form.time] = ii; | 700 | timePickerIndex[obj.form.time] = ii; |
| 698 | return true; | 701 | return true; |
| 699 | } | 702 | } |
-
Please register or login to post a comment