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

App.vue

@@ -104,6 +104,7 @@ export default {
 
 <style lang="scss">
 @import "uview-ui/index.scss";
+
 // @font-face {
 //   font-family: "oswald";
 //   src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");

asset/css/iconfont.css

-@font-face {
-    font-family: 'iconfont';
-    /* project id 1830471 */
-    src: url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.eot');
-    src: url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.eot?#iefix') format('embedded-opentype'), url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.woff2') format('woff2'), url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.woff') format('woff'), url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.ttf') format('truetype'), url('https://at.alicdn.com/t/font_1830471_h2mse3jucma.svg#iconfont') format('svg');
-}
-
-.iconfont {
-    font-family: "iconfont" !important;
-    font-size: 16px;
-    font-style: normal;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}
-
-.iconweibiaoti-:before {
-    content: "\e607";
-}
\ No newline at end of file

node_modules/uview-ui/ali-iconfont.css

+@font-face {
+  font-family: "iconfont"; /* Project id 1830471 */
+  src: url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.woff2?t=1622518908789') format('woff2'),
+       url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.woff?t=1622518908789') format('woff'),
+       url('//at.alicdn.com/t/font_1830471_b1q5b9z71n.ttf?t=1622518908789') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.iconartboard9-copy:before {
+  content: "\e726";
+}
+
+.iconerweima:before {
+  content: "\e654";
+}
+
+.iconweibiaoti-:before {
+  content: "\e607";
+}

node_modules/uview-ui/components/u-icon/u-icon.vue

@@ -60,7 +60,11 @@ export default {
 	computed: {
 		customClass() {
 			let classes = [];
-			classes.push(this.customPrefix + '-' + this.name);
+			if(this.customPrefix!='iconfont'){
+				classes.push(this.customPrefix + '-' + this.name);
+			}else{
+				classes.push(this.name)
+			}
 			// uView的自定义图标类名为u-iconfont
 			if (this.customPrefix == 'uicon') classes.push('u-iconfont');
 			else classes.push(this.customPrefix);
@@ -93,6 +97,7 @@ export default {
 <style scoped lang="scss">
 // @import '../../iconfont.css';
 @import '../../vantfont.css';
+@import '../../ali-iconfont.css';
 
 .uicon {
 	display: inline-flex;

node_modules/uview-ui/components/u-search/u-search.vue

@@ -9,7 +9,7 @@
 				height: height + 'rpx'
 			}"
 		>
-			<view class="u-icon-wrap"><u-icon class="u-clear-icon" :size="30" name="search" color="#909399"></u-icon></view>
+			<view class="u-icon-wrap"><u-icon class="u-clear-icon" :size="32" name="iconartboard9-copy" customPrefix="iconfont" color="#000"></u-icon></view>
 			<input
 				confirm-type="search"
 				@blur="blur"

pages/jiuzhai/components/time/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