|
@@ -19,7 +19,7 @@ Page({ |
|
@@ -19,7 +19,7 @@ Page({ |
|
19
|
keywords:'',
|
19
|
keywords:'',
|
|
20
|
sort:'',
|
20
|
sort:'',
|
|
21
|
form:{
|
21
|
form:{
|
|
22
|
- time:0,
|
22
|
+ time:-1,
|
|
23
|
}
|
23
|
}
|
|
24
|
},
|
24
|
},
|
|
25
|
sellerid:0,
|
25
|
sellerid:0,
|
|
@@ -28,7 +28,6 @@ Page({ |
|
@@ -28,7 +28,6 @@ Page({ |
|
28
|
let dateStr=util.unixtoTime(d,'MM-DD DAY');
|
28
|
let dateStr=util.unixtoTime(d,'MM-DD DAY');
|
|
29
|
var radio=750/util.getsystem().windowWidth;
|
29
|
var radio=750/util.getsystem().windowWidth;
|
|
30
|
var contentHeight=util.getsystem().windowHeight-Math.ceil(120/radio)
|
30
|
var contentHeight=util.getsystem().windowHeight-Math.ceil(120/radio)
|
|
31
|
- var todayobj=bookOrder.changedate(d*1000);
|
|
|
|
32
|
if(opt.seller_id){
|
31
|
if(opt.seller_id){
|
|
33
|
this.sellerid=opt.seller_id;
|
32
|
this.sellerid=opt.seller_id;
|
|
34
|
util.cache('sellerid',opt.seller_id)
|
33
|
util.cache('sellerid',opt.seller_id)
|
|
@@ -42,16 +41,9 @@ Page({ |
|
@@ -42,16 +41,9 @@ Page({ |
|
42
|
//this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
|
41
|
//this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
|
|
43
|
this.setData({
|
42
|
this.setData({
|
|
44
|
sellerid:this.sellerid,
|
43
|
sellerid:this.sellerid,
|
|
45
|
- systemInfo:util.getsystem(),
|
|
|
|
46
|
- contentHeight:contentHeight,
|
|
|
|
47
|
listHeight:contentHeight-Math.ceil(210/radio),
|
44
|
listHeight:contentHeight-Math.ceil(210/radio),
|
|
48
|
dateStr:dateStr,
|
45
|
dateStr:dateStr,
|
|
49
|
- showyear:todayobj.year,
|
|
|
|
50
|
- showmonth:todayobj.month,
|
|
|
|
51
|
- showday:todayobj.day
|
|
|
|
52
|
-
|
|
|
|
53
|
})
|
46
|
})
|
|
54
|
- console.log(this.data.sellerid)
|
|
|
|
55
|
//util.setBarTitle('预定本');
|
47
|
//util.setBarTitle('预定本');
|
|
56
|
let openid=getApp().openid;
|
48
|
let openid=getApp().openid;
|
|
57
|
if(openid){
|
49
|
if(openid){
|
|
@@ -72,6 +64,12 @@ Page({ |
|
@@ -72,6 +64,12 @@ Page({ |
|
72
|
this.selectComponent('#nav').init();
|
64
|
this.selectComponent('#nav').init();
|
|
73
|
},
|
65
|
},
|
|
74
|
async getbooklist(){
|
66
|
async getbooklist(){
|
|
|
|
67
|
+ let time=0;
|
|
|
|
68
|
+ if(this.data.form.time<0){
|
|
|
|
69
|
+ time=await bookOrder.getTimeSpaceIndex();
|
|
|
|
70
|
+ }else{
|
|
|
|
71
|
+ time=this.data.form.time;
|
|
|
|
72
|
+ }
|
|
75
|
var formdata={};
|
73
|
var formdata={};
|
|
76
|
if(this.data.sort!=''){
|
74
|
if(this.data.sort!=''){
|
|
77
|
formdata.sort=this.data.sort
|
75
|
formdata.sort=this.data.sort
|
|
@@ -79,22 +77,19 @@ Page({ |
|
@@ -79,22 +77,19 @@ Page({ |
|
79
|
if(this.data.keywords!=''){
|
77
|
if(this.data.keywords!=''){
|
|
80
|
formdata.keywords=this.data.keywords
|
78
|
formdata.keywords=this.data.keywords
|
|
81
|
}
|
79
|
}
|
|
82
|
- formdata.sid=this.data.sellerid;
|
80
|
+ formdata.sid=this.sellerid;
|
|
83
|
formdata.x=1;
|
81
|
formdata.x=1;
|
|
84
|
formdata.y=200;
|
82
|
formdata.y=200;
|
|
85
|
- let rdate=await bookOrder.getTimeSpace(this.data.dateStr,this.data.form.time);
|
83
|
+ let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time);
|
|
86
|
formdata.rdate=rdate;
|
84
|
formdata.rdate=rdate;
|
|
87
|
var that=this;
|
85
|
var that=this;
|
|
88
|
App.Reserve.GetReserveList(formdata).then(function(json){
|
86
|
App.Reserve.GetReserveList(formdata).then(function(json){
|
|
89
|
console.log(json)
|
87
|
console.log(json)
|
|
90
|
if(json.ret==200){
|
88
|
if(json.ret==200){
|
|
91
|
- json.data.forEach(function(v,i){
|
|
|
|
92
|
- var obj=bookOrder.changedate(Number(v.rdate)*1000);
|
|
|
|
93
|
- v.order_time=(obj.hour<10 ? '0'+obj.hour : obj.hour)+':'+(obj.minute==0 ? '0'+obj.minute : obj.minute);
|
|
|
|
94
|
- })
|
|
|
|
95
|
that.setData({
|
89
|
that.setData({
|
|
96
|
isloading:true,
|
90
|
isloading:true,
|
|
97
|
- bookList:json.data.length==0 ? null : json.data
|
91
|
+ bookList:json.data.length==0 ? null : json.data,
|
|
|
|
92
|
+ form:{time:time},
|
|
98
|
})
|
93
|
})
|
|
99
|
that.boolists=that.selectAllComponents('.orderbook');
|
94
|
that.boolists=that.selectAllComponents('.orderbook');
|
|
100
|
that.boolists.forEach(function(v,i){
|
95
|
that.boolists.forEach(function(v,i){
|
|
@@ -132,25 +127,12 @@ Page({ |
|
@@ -132,25 +127,12 @@ Page({ |
|
132
|
console.log(this.data.calendarMask)
|
127
|
console.log(this.data.calendarMask)
|
|
133
|
},
|
128
|
},
|
|
134
|
dateChange(event){
|
129
|
dateChange(event){
|
|
135
|
- var currentdate=event.detail.year+'-'+(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day);
|
|
|
|
136
|
- var currentime=bookOrder.gettimestamp(currentdate+' 00:00:00');
|
|
|
|
137
|
- var myDate = new Date(parseInt(currentime)*1000);
|
|
|
|
138
|
- var week=bookOrder.getweek(myDate.getDay());
|
|
|
|
139
|
- var dateStr=(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day);
|
|
|
|
140
|
- if(currentime-new Date()/1000<=86400 && currentime-new Date()/1000>0){
|
|
|
|
141
|
- dateStr+=' 明天'
|
|
|
|
142
|
- }else{
|
|
|
|
143
|
- dateStr+=' '+week
|
|
|
|
144
|
- }
|
|
|
|
145
|
- let clickDay = event.detail.day;
|
|
|
|
146
|
- let changeDay = `dayStyle[1].day`;
|
|
|
|
147
|
- let changeBg = `dayStyle[1].background`;
|
|
|
|
148
|
- console.log(changeBg)
|
130
|
+ let cktime=util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day)
|
|
|
|
131
|
+ let clickDay = event.detail.day;
|
|
|
|
132
|
+ let changeDay = `dayStyle[1].day`;
|
|
|
|
133
|
+ let changeBg = `dayStyle[1].background`;
|
|
149
|
this.setData({
|
134
|
this.setData({
|
|
150
|
- showyear:event.detail.year,
|
|
|
|
151
|
- showmonth:event.detail.month,
|
|
|
|
152
|
- showday:event.detail.day,
|
|
|
|
153
|
- dateStr:dateStr,
|
135
|
+ dateStr:util.unixtoTime(cktime,'MM-DD `DAY/周WW`'),
|
|
154
|
[changeDay]: clickDay,
|
136
|
[changeDay]: clickDay,
|
|
155
|
[changeBg]: "#84e7d0"
|
137
|
[changeBg]: "#84e7d0"
|
|
156
|
})
|
138
|
})
|
