Merge remote-tracking branch 'origin/master'

vking
2 parents a46a97a8 b67b4f26
Showing 2 changed files with 2 additions and 2 deletions
components/reserve/calendar/calendar.js
project.config.json
--- a/components/reserve/calendar/calendar.js
View file @08e5aa5
+++ b/components/reserve/calendar/calendar.js
View file @08e5aa5
@@ -33,7 +33,7 @@ Component({
 	getspeciallist(){
 		let speciallist = [
 		  {date: util.unixtoTime(date/1000, 'YYYY-MM-DD'), background: '', text: '今'},
- 		  {date: util.unixtoTime(date + 86400, 'YYYY-MM-DD'), background: '', text: '明'}
+ 		  {date: util.unixtoTime(date/1000 + 86400, 'YYYY-MM-DD'), background: '', text: '明'}
 		];
 		this.setData({
 			speciallist:speciallist
--- a/project.config.json
View file @08e5aa5
+++ b/project.config.json
View file @08e5aa5
@@ -45,7 +45,7 @@
 			"list": []
 		},
 		"miniprogram": {
- 			"current": 39,
+ 			"current": 56,
 			"list": [
 				{
 					"id": 0,