Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

pages.json

@@ -527,7 +527,11 @@
 			"pages": [{
 				"path":"jz_Line" //九寨-线路
 			},{
-				"path":"jz_LineDetail" //九寨-线路详情
+				"path":"jz_LineDetail",
+				"enablePullDownRefresh": true,
+				"style": {
+				    "navigationStyle": "custom"
+				}//九寨-线路详情
 			},{
 				"path":"jz_Reserve"  //线路-预定
 			},{

pages/jiuzhai/components/sign/day.js

+//节假日信息
+const day=[
+	
+	{
+		year:2022,
+		month:1,
+		festival:[
+			{name:'元旦',day:1},
+			{name:'除夕',day:31},
+			
+		]
+	},
+	{
+		year:2022,
+		month:2,
+		festival:[
+			{name:'春节',day:1},
+			{name:'元宵',day:15},
+			{name:'情人节',day:14}
+		]
+	},
+	{
+		year:2022,
+		month:3,
+		festival:[
+			{name:'妇女节',day:8},
+		]
+	},
+	{
+		year:2022,
+		month:4,
+		festival:[
+			{name:'清明',day:4},
+		]
+	},
+	{
+		year:2022,
+		month:5,
+		festival:[
+			{name:'劳动节',day:1},
+			{name:'青年节',day:4},
+			{name:'母亲节',day:10},
+		]
+	},
+	{
+		year:2021,
+		month:6,
+		festival:[
+			{name:'儿童节',day:1},
+			{name:'父亲节',day:21},
+			{name:'端午',day:14},
+		]
+	},
+	{
+		year:2021,
+		month:7,
+		festival:[
+			{name:'建党节',day:1}
+		]
+	},
+	{
+		year:2021,
+		month:8,
+		festival:[
+			{name:'建军节',day:1},
+			{name:'七夕',day:14},
+			{name:'中元节',day:22},
+		]
+	},
+	{
+		year:2021,
+		month:9,
+		festival:[
+			{name:'教师节',day:10},
+			{name:'中秋',day:21}
+		]
+	},
+	{
+		year:2021,
+		month:10,
+		festival:[
+			{name:'国庆',day:1},
+			{name:'重阳',day:14}
+		]
+	},
+	{
+		year:2021,
+		month:11,
+		festival:[
+			{name:'感恩节',day:26}
+			
+		]
+	},
+	{
+		year:2021,
+		month:12,
+		festival:[
+			{name:'平安夜',day:24},
+			{name:'圣诞节',day:25}
+			
+		]
+	}
+]
+export default day
\ No newline at end of file