Merge remote-tracking branch 'origin/master'

@@ -118,7 +118,7 @@ Component({
 				if(i>=dayweek && i<monthdays+dayweek){
 					let thisday=i-dayweek+1;
 					let thisdate=year+'-'+(month<10 ? '0'+month : month)+'-'+(thisday<10 ? '0'+thisday : thisday);
-					let thistimestamp=Number(util.timetouUnix(thisdate,'-'));
+					let thistimestamp=Number(util.timetouUnix(thisdate+' 00:00:00'));
 					thisdayobj={
 						year:year,
 						month:month,
@@ -126,7 +126,7 @@ Component({
 						week:i%7,
 						date:thisdate,
 						istoday:false,
-						overdate:thistimestamp<(new Date()/1000)-86400 ? true : false,         //日期是否过期,
+						overdate:thistimestamp<=(new Date()/1000)-86400 ? true : false,         //日期是否过期,
 					}
 					if(thisdate==this.today.curdate){
 						thisdayobj.automark=true;

@@ -24,18 +24,17 @@ Component({
 	observers: {
 		'date,section': function(newdate,newsection) {
 			console.log('room',newdate,newsection)
+			this.setData({
+				roomlist:[]
+			})
 			if(newdate && newsection){
-				this.setData({
-					roomlist:[]
-				})
 				this.getroomtype();
-			}else{
-				this.setData({
-					roomlist:[]
-				})
 			}
 		}
 	},
+	attached(){
+		console.log('初次进入详情页---小米8测试',this.data.date ? this.data.date : '没有日期','openid:',getApp().openid)
+	},
 	methods:{
 		getroomtype(){
 			let parmdata={

@@ -50,7 +50,7 @@ Component({
 		//获取日期列表
 		getdaylist(){
 			//选中时间时间戳
-			let selectedtime=Number(util.timetouUnix(this.data.date,'-'));
+			let selectedtime=Number(util.timetouUnix(this.data.date+' 00:00:00'));
 			//选中日期星期几
 			let selectedweek=new Date(this.data.date).getDay();
 			//今天日期
@@ -68,7 +68,7 @@ Component({
 					day:thisdate.getDate(),
 					week:thisdate.getDay(),
 					date:util.unixtoTime(thistimestamp,'YYYY-MM-DD'),
-					overdate:thistimestamp<(new Date()/1000)-86400 ? true : false,         //日期是否过期
+					overdate:thistimestamp<=(new Date()/1000)-86400 ? true : false,         //日期是否过期
 					istoday:false
 				}
 				//是否是今天

@@ -24,6 +24,7 @@ Page({
    */
   onLoad: function (options) {
     console.log('onLoad', options)
+		console.log('初次进入详情页---小米8测试',this.data.reserveDate ? this.data.reserveDate : '没有日期','openid:',getApp().openid)
     this.options=options
     if(options.activeTab && options.activeTab!='detail'){
       this.setData({