Merge remote-tracking branch 'origin/master'

 //获取当前时间
 //获取当前时间
-const date=new Date();
 import App from '../../../utils/api';
 import App from '../../../utils/api';
 import util from '../../../utils/util';
 import util from '../../../utils/util';
 Component({
 Component({
@@ -13,7 +12,7 @@ Component({
 		//日期
 		//日期
 		date:{
 		date:{
 			type:String,
 			type:String,
-			value:util.unixtoTime(date/1000,'YYYY-MM-DD')
+			value:util.unixtoTime(new Date()/1000,'YYYY-MM-DD')
 		}
 		}
 	},
 	},
 	attached(){
 	attached(){
@@ -38,6 +37,7 @@ Component({
 		//获得默认所有可订时间段
 		//获得默认所有可订时间段
 		getdurlist(houseFull){
 		getdurlist(houseFull){
 			console.log(houseFull)
 			console.log(houseFull)
+			const date=new Date();
 			let currenttimemark=date.getHours()+date.getMinutes()/60;
 			let currenttimemark=date.getHours()+date.getMinutes()/60;
 			let timedur=this.data.seller.daily;
 			let timedur=this.data.seller.daily;
 			let durlist=[];
 			let durlist=[];

@@ -21,7 +21,7 @@
 		}
 		}
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
-	"libVersion": "2.7.0",
+	"libVersion": "2.7.7",
 	"appid": "wxd3dc4206c76f14fc",
 	"appid": "wxd3dc4206c76f14fc",
 	"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,
@@ -45,7 +45,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 39,
+			"current": 56,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -467,7 +467,7 @@
 					"id": 56,
 					"id": 56,
 					"name": "测试组件",
 					"name": "测试组件",
 					"pathName": "pages/reserve/detail",
 					"pathName": "pages/reserve/detail",
-					"query": "id=80&activeTab=reserve",
+					"query": "id=154&activeTab=reserve",
 					"scene": null
 					"scene": null
 				},
 				},
 				{
 				{