Merge remote-tracking branch 'remotes/origin/timespace'

# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json

@@ -47,12 +47,18 @@ Page({
           { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' },
           { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' },
           { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
           { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
       ],
       ],
+      timePickerArray:[
+          ['6:00','6:30','7:00'],
+          ['10:00','10:30','11:00'],
+          [],
+      ],
+      timePickerIndex:[0,0,0],
   },
   },
     tablesAll:[],
     tablesAll:[],
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
-  onLoad: function (options) {
+  onLoad: async function (options) {
     this.setDateStr();
     this.setDateStr();
     this.sellerid=util.cache('sellerid');
     this.sellerid=util.cache('sellerid');
       let timePickerArray= await comm.getDayTimeSpace();
       let timePickerArray= await comm.getDayTimeSpace();
@@ -249,7 +255,7 @@ Page({
                     })
                     })
                     App.Reserve.Detail({rid:_id,openid:''},true)
                     App.Reserve.Detail({rid:_id,openid:''},true)
                     wx.navigateTo({
                     wx.navigateTo({
-                        url:'b_detail?id='+res.data.id,
+                        url:'b_detail?id='+_id,
                     });
                     });
                 }else{
                 }else{
                     util.toast(res.msg,'none')
                     util.toast(res.msg,'none')