Merge remote-tracking branch 'remotes/origin/master' into online-reserve

# Conflicts:
#	project.config.json

@@ -349,7 +349,7 @@ Page({
               }
               }
             })
             })
           })
           })
-          console.log('toastTables',toastTables);
+          console.log('toastTables',toastTables,this.data.form.tid,this.checkedTables);
           //清理已选中的桌位
           //清理已选中的桌位
           let toastTablesInfo=[];
           let toastTablesInfo=[];
           let tid=this.data.form.tid
           let tid=this.data.form.tid
@@ -590,6 +590,7 @@ Page({
         t.isselect = true
         t.isselect = true
         t["isselected"] = 1
         t["isselected"] = 1
         tablesed.push(t);
         tablesed.push(t);
+        this.checkedTables[t.id]=t.name;
       })
       })
       this.setData({
       this.setData({
         timePickerIndex: timePickerIndex,
         timePickerIndex: timePickerIndex,

@@ -92,8 +92,8 @@
 					"id": 8,
 					"id": 8,
 					"name": "邀请进入 pages/customer/index",
 					"name": "邀请进入 pages/customer/index",
 					"pathName": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=1196&fromid=test",
-					"scene": "1001"
+					"query": "id=2639&fromid=test&hasInvitation=1&hasSellerShare=1",
+					"scene": 1001
 				},
 				},
 				{
 				{
 					"id": -1,
 					"id": -1,
@@ -169,8 +169,8 @@
 					"id": 17,
 					"id": 17,
 					"name": "预定本-编辑预定信息",
 					"name": "预定本-编辑预定信息",
 					"pathName": "pages/book/b_addnew",
 					"pathName": "pages/book/b_addnew",
-					"query": "id=152",
-					"scene": "1001"
+					"query": "id=2745",
+					"scene": 1001
 				},
 				},
 				{
 				{
 					"id": -1,
 					"id": -1,