|
@@ -223,10 +223,10 @@
|
|
|
const year = date.getFullYear()
|
|
|
const month = date.getMonth()+1
|
|
|
const day = date.getDate()
|
|
|
- const amMax = [year,month,day].join('-') + ' ' + '12:59:59'
|
|
|
- const pmMax = [year,month,day].join('-') + ' ' + '18:00:00'
|
|
|
+ const amMax = [year,month,day].join('/') + ' ' + '12:59:59'
|
|
|
+ const pmMax = [year,month,day].join('/') + ' ' + '18:00:00'
|
|
|
const nowTime = date.getTime()
|
|
|
- console.log([year,month,day].join('-'))
|
|
|
+ console.log([year,month,day].join('/'))
|
|
|
console.log(date.getTime(),'now time')
|
|
|
console.log(new Date(amMax).getTime(),'am time')
|
|
|
console.log(new Date(pmMax).getTime(),'pm time')
|
|
@@ -278,6 +278,7 @@
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+ console.log(this.list,'--------------时间数组')
|
|
|
// return
|
|
|
this.show=true
|
|
|
},
|
|
@@ -317,22 +318,7 @@
|
|
|
this.reserveDateEnd=this.nowDate = year + "-" +( month<10? '0'+month:month ) + "-" + (day<10? '0'+(day+2):day+2)+' 18:00:00';
|
|
|
}
|
|
|
}
|
|
|
- console.log(new Date(this.reserveDateEnd).getTime(),'--------------结束时间戳')
|
|
|
- // if((new Date(this.reserveDateEnd).getTime())-(new Date().getTime())<=0){
|
|
|
- // this.time=''
|
|
|
- // this.show=true
|
|
|
- // console.log(this.show,'------------展开')
|
|
|
- // uni.showToast({
|
|
|
- // title: '请选择合适的预约时间',
|
|
|
- // icon: 'none'
|
|
|
- // })
|
|
|
- // return false
|
|
|
- // }else{
|
|
|
- // this.time=e[0].label + e[1].label
|
|
|
- // }
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
// 选择用户信息
|
|
|
selectUserInfo(){
|
|
@@ -351,6 +337,7 @@
|
|
|
getDetailData(){
|
|
|
userDetail().then(res=>{
|
|
|
if(res.status==200){
|
|
|
+ this.$u.vuex('vuex_userInfoData',res.data)
|
|
|
this.form.info=res.data.contactName
|
|
|
this.userId=res.data.id
|
|
|
this.userLatitude=res.data.lat // 用户位置经度
|