xt / xcx-book · Commits

Go to a project

Commit e9ede7e882cc228d0c3c6585983946632f3b83fd

Authored by vking
2 parents 6dc01e2a 4c70d029
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 2 changed files with 26 additions and 18 deletions
... ... @@ -27,20 +27,27 @@ Component({
this.changesectionstyle(this.data.section);
}else{
this.changesectionstyle(this.data.sectionlist[0].section);
//2019-12-13修改优化
let obj={
section:this.data.sectionlist[0].section,
action:'defalut',
time:this.data.sectionlist[0].sectiondur.split('-')[0]
}
this.triggerEvent('selectsection',obj)
}
let obj={
section:this.data.section ? this.data.section : this.data.sectionlist[0].section,
action:'defalut',
time:this.data.sectionlist[0].sectiondur.split('-')[0]
}
if(this.data.section){
this.data.sectionlist.forEach((v,i)=>{
if(this.data.section==v.section){
obj.time=v.sectiondur.split('-')[0]
}
})
}
this.triggerEvent('selectsection',obj)
// let obj={
// section:this.data.section ? this.data.section : this.data.sectionlist[0].section,
// action:'defalut',
// time:this.data.sectionlist[0].sectiondur.split('-')[0]
// }
// if(this.data.section){
// this.data.sectionlist.forEach((v,i)=>{
// if(this.data.section==v.section){
// obj.time=v.sectiondur.split('-')[0]
// }
// })
// }
// this.triggerEvent('selectsection',obj)
}
}
},
... ... @@ -127,11 +134,12 @@ Component({
//通知时段
tellsection(selectsection,action,index){
console.log(index);
let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
//2019-12-13修改
// let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
let curtimestamp=new Date()/1000;
let sectionarr=this.data.sectionlist[index].sectiondur.split('-');
let starttimestamp=Number(util.timetouUnix(today+' '+sectionarr[0]+':00'));
let endtimestamp=Number(util.timetouUnix(today+' '+sectionarr[1]+':00'));
let starttimestamp=Number(util.timetouUnix(this.data.date+' '+sectionarr[0]+':00'));
let endtimestamp=Number(util.timetouUnix(this.data.date+' '+sectionarr[1]+':00'));
let obj={
section:selectsection,
action:action
... ...
... ... @@ -21,7 +21,7 @@
}
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"libVersion": "2.9.4",
"appid": "wxd3dc4206c76f14fc",
"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
"isGameTourist": false,
... ... @@ -55,7 +55,7 @@
"id": 0,
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=1007&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"query": "seller_id=1001&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"scene": 1001
},
{
... ...