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/reserve/detail.wxss */
 .pages{
 .pages{
-  width: 90%;
+  width: 100%;
   margin: 0 auto;
   margin: 0 auto;
   font-size: 30rpx;
   font-size: 30rpx;
   color:#353535;
   color:#353535;
   padding-bottom: 100rpx;
   padding-bottom: 100rpx;
+  background-color: #fefefe;
+  box-sizing: border-box;
+  padding: 0 5% 100rpx;
 }
 }
 .seller-banner{
 .seller-banner{
   width: 100%;
   width: 100%;

@@ -172,6 +172,10 @@ Page({
     },()=>{
     },()=>{
 			this.hasSubmit=true;
 			this.hasSubmit=true;
 		})
 		})
+    }).catch(()=>{
+      this.hasSubmit=true//出错后可再次提交
+      return util.toast('提交失败，请重试','none');
+    })
   },
   },
   getRdate(){
   getRdate(){
     let daily=this.data.seller.daily;
     let daily=this.data.seller.daily;
@@ -204,6 +208,9 @@ Page({
     stime=util.timetouUnix(today+' '+this.data.seller.rec_stime+':00')
     stime=util.timetouUnix(today+' '+this.data.seller.rec_stime+':00')
     etime=util.timetouUnix(today+' '+this.data.seller.rec_etime+':00')
     etime=util.timetouUnix(today+' '+this.data.seller.rec_etime+':00')
     if(etime<=stime){
     if(etime<=stime){
+      if(time<=etime){
+        return true
+      }
       etime+=86400
       etime+=86400
     }
     }
     if(time>=stime && time<=etime){
     if(time>=stime && time<=etime){