查找包间在线预订调整

-.idea
-.DS_Store
-package-lock.json
-
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-miniprogram_dist
-miniprogram_dev
-node_modules
-miniprogram_npm

-[submodule "components/painter"]
-	path = components/painter
-	url = https://github.com/Kujiale-Mobile/PainterCore.git

@@ -35,7 +35,9 @@ Page({
         activeTab:options.activeTab||'detail',
         activeTab:options.activeTab||'detail',
       })
       })
     }
     }
-
+    this.setData({
+      reserveDate: options.date ? options.date : util.unixtoTime(new Date() / 1000, 'YYYY-MM-DD'),
+    })
     App.Customer.IsCollectionSeller({
     App.Customer.IsCollectionSeller({
       sid:options.id,
       sid:options.id,
       openid:getApp().openid
       openid:getApp().openid
@@ -100,7 +102,7 @@ Page({
    */
    */
   onShow: function () {
   onShow: function () {
     this.selectComponent('#getpos').getPos();
     this.selectComponent('#getpos').getPos();
-		if(this.data.reserveDate){//后退进入等情况刷新时段
+    if (this.data.reserveDate && this.data.seletroomlist){//后退进入等情况刷新时段
 		  this.setData({
 		  this.setData({
 		    reserveDate:this.data.reserveDate
 		    reserveDate:this.data.reserveDate
 		  })
 		  })
@@ -336,6 +338,9 @@ Page({
 		this.reserve.sid=this.options.id
 		this.reserve.sid=this.options.id
 		this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
 		this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
 		this.reserve.room_demand=JSON.stringify(this.data.seletroomlist)
 		this.reserve.room_demand=JSON.stringify(this.data.seletroomlist)
+    if(this.options.pnum){
+      this.reserve.pnum = this.options.pnum;
+    }
 		wx.navigateTo({
 		wx.navigateTo({
 		  url:util.http_build_query(this.reserve,'./submit')
 		  url:util.http_build_query(this.reserve,'./submit')
 		})
 		})

@@ -211,7 +211,7 @@
 </view>
 </view>
 <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
 <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
     <view class="olreserve bg_white">
     <view class="olreserve bg_white">
-        <calendar seller="{{seller}}" bindselectdate="selectdate"></calendar>
+        <calendar seller="{{seller}}" bindselectdate="selectdate" date="{{reserveDate}}"></calendar>
         <view class="reserve-time Semibold">预订时段</view>
         <view class="reserve-time Semibold">预订时段</view>
 		<section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>
 		<section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>
 		<block wx:if="{{reserveSection}}">
 		<block wx:if="{{reserveSection}}">

@@ -152,6 +152,7 @@ Page({
       cusdem:this.user.remark||'',
       cusdem:this.user.remark||'',
 			ddate_solt:dur.indexOf(this.options.section)+1,
 			ddate_solt:dur.indexOf(this.options.section)+1,
 			roomids:roomids.toString(),
 			roomids:roomids.toString(),
+      pnum: this.options.pnum ? this.options.pnum : 4,
     }).then(res=>{
     }).then(res=>{
 			console.log('ceshi',this.hasSubmit,res);
 			console.log('ceshi',this.hasSubmit,res);
       if(res.ret!=200){
       if(res.ret!=200){

@@ -29,9 +29,7 @@
 	"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
 	"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
 	"isGameTourist": false,
 	"isGameTourist": false,
 	"simulatorType": "wechat",
 	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {
-		"qywx_simulator_plugin": "1.2.0"
-	},
+	"simulatorPluginLibVersion": {},
 	"condition": {
 	"condition": {
 		"search": {
 		"search": {
 			"current": -1,
 			"current": -1,
@@ -576,6 +574,13 @@
 					"pathName": "pack-book/pages/book/b_addnew",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"query": "",
 					"query": "",
 					"scene": null
 					"scene": null
+				},
+				{
+					"id": 71,
+					"name": "pages/reserve/detail",
+					"pathName": "pages/reserve/detail",
+					"query": "id=1001&activeTab=reserve&date=2020-02-16&pnum=6",
+					"scene": null
 				}
 				}
 			]
 			]
 		}
 		}