Commit 2ec3a0c61d5993706fbfa51307c97dd647818605

Authored by vking
1 parent 7109f65c

使用默认时间

@@ -232,7 +232,7 @@ Page({ @@ -232,7 +232,7 @@ Page({
232 onShareAppMessage: function () { 232 onShareAppMessage: function () {
233 233
234 }, 234 },
235 - async selectedValue(e){ 235 + async selectedValueAsync(e){
236 console.log(e); 236 console.log(e);
237 let key = util.attr(e, 'key'); 237 let key = util.attr(e, 'key');
238 let val; 238 let val;
@@ -352,6 +352,119 @@ Page({ @@ -352,6 +352,119 @@ Page({
352 352
353 this.setData(sobj) 353 this.setData(sobj)
354 }, 354 },
  355 + selectedValue(e){
  356 + console.log(e);
  357 + let key = util.attr(e, 'key');
  358 + let val;
  359 + let sobj = {};
  360 + if (key == 'date') {
  361 + this.year=util.unixtoTime(new Date() / 1000,'YYYY');
  362 + }
  363 + if (e.type == 'input' || e.type == 'confirm') {
  364 + val = util.val(e);
  365 + if (key == 'phone') {
  366 + var that = this;
  367 + if (e.detail.value != '' && e.detail.value.length >= 3) {
  368 + App.Reserve.GetReserveUser(
  369 + {
  370 + keywords: e.detail.value,
  371 + sid: this.sellerid
  372 + }
  373 + ).then(function (json) {
  374 + if (json.ret == 200 && json.data.length > 0) {
  375 + that.setData({
  376 + searchlist: json.data
  377 + })
  378 + } else {
  379 + that.setData({
  380 + searchlist: null
  381 + })
  382 + }
  383 + })
  384 + } else {
  385 + this.setData({
  386 + searchlist: null
  387 + })
  388 + }
  389 + }
  390 + if (key == 'pnum') {
  391 + sobj.pnumInputFocus = true;
  392 + }
  393 + } else {
  394 + val = util.attr(e, 'value');
  395 + }
  396 + if (key == 'time') {
  397 + if (this.data.timeOpt[val]) return;
  398 + }
  399 + if ((key == 'time' && this.data.form.time == val) || (key == 'date' && this.data.form.date == val)) {
  400 + if (util.attr(e, 'display') != 'block') {
  401 + return;
  402 + }
  403 + }
  404 + let form = this.data.form;
  405 +
  406 + if (key == 'tid') {
  407 + let ts = this.data.tables;
  408 + if (ts[val].isselect) {
  409 + ts[val].isselect = false;
  410 + form.tid.remove(ts[val].id);
  411 + delete this.checkedTables[ts[val].id]
  412 + } else {
  413 + ts[val].isselect = true;
  414 + form.tid.push(ts[val].id);
  415 + this.checkedTables[ts[val].id]=ts[val].name
  416 + }
  417 + sobj.tables = ts;
  418 + } else {
  419 + form[key] = val;
  420 + }
  421 + console.log('ts', sobj.tables,this.checkedTables);
  422 + //console.log(e.type,key,val,form);
  423 + sobj.form = form;
  424 + sobj.buttonhide = this.data.buttonhide;
  425 + if (form.tid.length > 0 && form.rname.length > 0) {
  426 + sobj.buttonhide = false;
  427 + }else{
  428 + sobj.buttonhide = true;
  429 + }
  430 + let displayTimes = false;
  431 + if (key == 'time') {
  432 + if (util.attr(e, 'display') == 'block') {
  433 + displayTimes = true;
  434 + sobj.timePickerMask = true;
  435 + }
  436 + }
  437 + //判断hasUseDefDtime
  438 + if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
  439 + sobj.hasUseDefDtime = true
  440 + let ntime = parseInt(new Date() / 1000)
  441 + let xtime =ntime
  442 + if(key == 'time'){
  443 + xtime=util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[this.data.form.date].substr(0, 5)) + ' HH:II:SS');
  444 + xtime=util.timetouUnix(xtime)
  445 + }
  446 + this.setDateStr(xtime,sobj.hasUseDefDtime);
  447 + }
  448 + if (this.data.form.date == 0) {//
  449 + let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
  450 + if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {
  451 + sobj.hasUseDefDtime = false;
  452 + }
  453 + }
  454 + if ('date,time,pnum,pnum_str,tabid'.indexOf(key) > -1) {
  455 + if (!displayTimes) {
  456 + //sobj.form.tid = []; //切换日期时间清空桌位
  457 + //sobj.buttonhide = true;
  458 + this.getTables();
  459 + }
  460 + if (key == 'date') {
  461 + let xtime = util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[val].substr(0, 5)) + ' HH:II:SS');
  462 + this.setDateStr(util.timetouUnix(xtime),sobj.hasUseDefDtime);
  463 + }
  464 + }
  465 +
  466 + this.setData(sobj)
  467 + },
355 async getTables(){ 468 async getTables(){
356 let form = this.data.form; 469 let form = this.data.form;
357 let tableid = util.cache('tableid'); 470 let tableid = util.cache('tableid');
@@ -44,17 +44,17 @@ @@ -44,17 +44,17 @@
44 <view class="tab flex-ll"> 44 <view class="tab flex-ll">
45 <formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}" 45 <formids class="item {{form.time==0?'checked':''}} {{timeOpt[0]}}"
46 wx:if="{{timePickerArray[0].length>0}}" 46 wx:if="{{timePickerArray[0].length>0}}"
47 - bindtap="selectedValue" data-key="time" data-value="0"> 47 + bindtap="selectedValueAsync" data-key="time" data-value="0">
48 <view class="picker">早市</view> 48 <view class="picker">早市</view>
49 </formids> 49 </formids>
50 <formids class="item {{form.time==1?'checked':''}} {{timeOpt[1]}}" 50 <formids class="item {{form.time==1?'checked':''}} {{timeOpt[1]}}"
51 wx:if="{{timePickerArray[1].length>0}}" 51 wx:if="{{timePickerArray[1].length>0}}"
52 - bindtap="selectedValue" data-key="time" data-value="1"> 52 + bindtap="selectedValueAsync" data-key="time" data-value="1">
53 <view class="picker">午市</view> 53 <view class="picker">午市</view>
54 </formids> 54 </formids>
55 <formids class="item {{form.time==2?'checked':''}} {{timeOpt[2]}}" 55 <formids class="item {{form.time==2?'checked':''}} {{timeOpt[2]}}"
56 wx:if="{{timePickerArray[2].length>0}}" 56 wx:if="{{timePickerArray[2].length>0}}"
57 - bindtap="selectedValue" data-key="time" data-value="2"> 57 + bindtap="selectedValueAsync" data-key="time" data-value="2">
58 <view class="picker">晚市</view> 58 <view class="picker">晚市</view>
59 </formids> 59 </formids>
60 </view> 60 </view>