Commit ec8c21d3ea89dd1b1cb0c7694862195d59c1bc63

Authored by vking
1 parent b3e532d4

使用默认时间

@@ -80,7 +80,7 @@ Page({ @@ -80,7 +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.options=options
84 this.initLoad(options) 84 this.initLoad(options)
85 this.getCustomRemark(); 85 this.getCustomRemark();
86 }, 86 },
@@ -307,13 +307,15 @@ Page({ @@ -307,13 +307,15 @@ Page({
307 } 307 }
308 } 308 }
309 //判断hasUseDefDtime 309 //判断hasUseDefDtime
310 - if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {  
311 - sobj.hasUseDefDtime = true  
312 - }  
313 - if (this.data.form.date == 0) {//  
314 - let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');  
315 - if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {  
316 - sobj.hasUseDefDtime = false; 310 + if(this.options.hasQuick!=1){
  311 + if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
  312 + sobj.hasUseDefDtime = true
  313 + }
  314 + if (this.data.form.date == 0) {//
  315 + let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
  316 + if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {
  317 + sobj.hasUseDefDtime = false;
  318 + }
317 } 319 }
318 } 320 }
319 this.setData(sobj) 321 this.setData(sobj)