Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/book/b_addnew.js

@@ -251,8 +251,8 @@ calendarShow(){
 dateChange(event){
 dateChange(event){
     console.log(event);
     console.log(event);
     let clickDay = event.detail.day;
     let clickDay = event.detail.day;
-    let changeDay = 'dayStyle[1].day';
-    let changeBg = 'dayStyle[1].background';
+    let changeDay = `dayStyle[1].day`;
+    let changeBg = `dayStyle[1].background`;
     this.setData({
     this.setData({
         [changeDay]: clickDay,
         [changeDay]: clickDay,
         [changeBg]: "#84e7d0"
         [changeBg]: "#84e7d0"
@@ -267,6 +267,8 @@ calendarClose(){
 },
 },
 async  selectdesk(){
 async  selectdesk(){
     console.log('xxxxx')
     console.log('xxxxx')
+    console.log('11111111111')
+    console.log('1111111115551')
     let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
     let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
     console.log(this.data.form)
     console.log(this.data.form)
     wx.navigateTo({
     wx.navigateTo({