Commit 7e1fc74a91a31e9728efb0a263f1ee2c210f1f1e

Authored by liuxuqinfhp1220
2 parents be205149 10edd02a

Merge branch 'master' of http://123.56.79.57/xt/xcx-book

# By vking
# Via vking
* 'master' of http://123.56.79.57/xt/xcx-book:
  fix worktime
  fix worktime
  fix bgcolor

Conflicts:
	pages/reserve/submit.js
/* pages/reserve/detail.wxss */
.pages{
width: 90%;
width: 100%;
margin: 0 auto;
font-size: 30rpx;
color:#353535;
padding-bottom: 100rpx;
background-color: #fefefe;
box-sizing: border-box;
padding: 0 5% 100rpx;
}
.seller-banner{
width: 100%;
... ...
... ... @@ -172,6 +172,10 @@ Page({
},()=>{
this.hasSubmit=true;
})
}).catch(()=>{
this.hasSubmit=true//出错后可再次提交
return util.toast('提交失败,请重试','none');
})
},
getRdate(){
let daily=this.data.seller.daily;
... ... @@ -204,6 +208,9 @@ Page({
stime=util.timetouUnix(today+' '+this.data.seller.rec_stime+':00')
etime=util.timetouUnix(today+' '+this.data.seller.rec_etime+':00')
if(etime<=stime){
if(time<=etime){
return true
}
etime+=86400
}
if(time>=stime && time<=etime){
... ...