Merge remote-tracking branch 'origin/master'

@@ -14,6 +14,7 @@
 	margin-right: 30rpx;
 	margin-right: 30rpx;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
+	line-height:1.2;
 }
 }
 .border-yellow{
 .border-yellow{
 	border:2rpx solid #C3A56C;
 	border:2rpx solid #C3A56C;

@@ -228,4 +228,11 @@ Page({
       url:url,
       url:url,
     })
     })
   },
   },
+	onUnload(){
+		let pages = getCurrentPages();
+		if(pages.length>2 && pages[pages.length-2].route=='pages/reserve/detail'){
+			wx.setStorageSync('order', 'complete')
+		}
+		console.log(pages)
+	}
 })
 })

@@ -99,6 +99,14 @@ Page({
         reserveDate:this.data.reserveDate
         reserveDate:this.data.reserveDate
       })
       })
     }
     }
+		//已经完成预订的情况---清除日期、时段、选中包间
+		if(wx.getStorageSync('order')){
+			this.setData({
+				reserveSection:null,
+				seletroomlist:[]
+			})
+			wx.removeStorageSync('order')
+		}
   },
   },
 
 
   /**
   /**

@@ -55,7 +55,7 @@
 					"id": 0,
 					"id": 0,
 					"name": "预订本-商家1",
 					"name": "预订本-商家1",
 					"pathName": "pack-book/pages/book/b_index",
 					"pathName": "pack-book/pages/book/b_index",
-					"query": "seller_id=1001&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
+					"query": "seller_id=1007&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": 1001
 					"scene": 1001
 				},
 				},
 				{
 				{