项目优化调整

center/center.vue

@@ -78,6 +78,7 @@
 					// {name:'观看记录',url:'/center/viewrecord',ico:this.$commonConfig.staticUrl+'/img/center-record.png',checkauth:true},
 					// {name:'领券中心',url:'/center/mycoupon',ico:this.$commonConfig.staticUrl+'/img/center-coupon.png',checkauth:true},
 					// {name:'开具发票',url:'center/invoice',ico:this.$commonConfig.staticUrl+'/img/center-ticket.png',checkauth:true},
+					{name:'我的订单',url:'center/order',ico:this.$commonConfig.staticUrl+'/img/center-order.png',checkauth:true},
 					{name:'客服热线',url:'',ico:this.$commonConfig.staticUrl+'/img/center-call.png',checkauth:true,phone:''},
 					// {name:'在线客服',chat:'1',ico:this.$commonConfig.staticUrl+'/img/center-call.png'},
 				]
@@ -116,7 +117,7 @@
 				let that = this;
 				console.log('item',item);
 				
-				if(item.name!=='在线客服'&&item.name!=='客服热线'&&item.name!=='实名认证'){
+				if(item.name!=='在线客服'&&item.name!=='客服热线'&&item.name!=='实名认证'&&item.name!=='我的订单'){
 					uni.showToast({
 						title:'开发中',
 						icon:"none"

center/orderdetails.vue

@@ -120,7 +120,7 @@
 					<text class="con">{{refundInfo.status|filterRefundState}}</text>
 				</view>
 			</view>
-			<view class="box tips">
+			<view class="box tips parse-content">
 				<view class="title">观影须知</view>
 				<u-parse :content="formerNotice"></u-parse>
 				<!-- <view class="tips-item" v-for="(item,index) in tipsArr" :key="index">
@@ -605,15 +605,17 @@
 		.btn{
 			height: 64rpx;
 			line-height: 64rpx;
-			padding: 0 28rpx;
+			padding: 0 42rpx;
 			border-radius: 8rpx;
 			border: 2rpx solid #FFFFFF;
+			background-color: #ffffff;
 			font-size: 24rpx;
-			font-weight: 500;
-			color: #FFFFFF;
+			font-weight: bold;
+			color: #EE0B0B;
 			&.cancel{
-				border-color: #F9B4B4;
-				color: #F9B4B4;
+				border-color: #FFE2E2;
+				color: #FFE2E2;
+				background-color: transparent;
 			}
 			&:not(:last-of-type){
 				margin-right: 100rpx;

manifest.json

@@ -96,6 +96,9 @@
         },
         "sdkConfigs" : {
             "maps" : {}
+        },
+        "router" : {
+            "mode" : "history"
         }
     },
     "fallbackLocale" : "zh-Hans"

package-lock.json

@@ -0,0 +1,11 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    }
+  }
+}

package.json

@@ -20,5 +20,8 @@
         }
       }
     }
+  },
+  "dependencies": {
+    "moment": "^2.29.4"
   }
 }

pages/bookticket.vue

@@ -91,7 +91,7 @@
 				<view class="title u-flex u-row-between u-border-bottom">
 					<text>购票须知</text>
 				</view>
-				<view class="notice-item">
+				<view class="notice-item parse-content">
 					<u-parse :content="pageContent.ticketNotice"></u-parse>
 				</view>
 				<!-- <view class="notice-item">
@@ -203,6 +203,7 @@
 		},
 		onShow() {
 			this.getMemberAll();
+			this.getSettlement();
 		},
 		onLoad(page) {
 			console.log('page',page);
@@ -533,6 +534,10 @@
 		}
 		.num-wrap{
 			padding-top: 36rpx;
+			.title{
+				font-size: 14px;
+				color: #4E4E4E;
+			}
 		}
 	}
 }

pages/login/login.vue

@@ -106,7 +106,7 @@
 				bname:'旭烁集团',
 				//屏幕高度
 				screenHeight: "",
-				logoSrc: "/static/logo.png",
+				logoSrc: "/static/logo.svg",
 				// sitename:"/static/sitename.png",
 				miniappLoginInfo:null,
 				hasUserInfo:false,
@@ -418,14 +418,14 @@
 	box-sizing: border-box;
 	text-align: center;
 	.logo-wrap {
-		padding-top: 248rpx;
+		padding-top: 100rpx;
 		img{
 			display: block;
 			margin: 0 auto;
 		}
 		.logo{
-			width: 306rpx;
-			height: 258rpx;
+			width: 400rpx;
+			height: 400rpx;
 		}
 		.sitename{
 			width: 460rpx;

pages/login/regulation.vue

@@ -8,7 +8,7 @@
 		>
 		</u-navbar>
 		<!-- <view class="title">积分规则</view> -->
-		<view class="page-wrap">
+		<view class="page-wrap parse-content">
 			<u-parse :content="content"></u-parse>
 		</view>
 		

pages/news.vue

@@ -32,7 +32,7 @@
 							<view class="con u-line-2" v-html="item.centent"></view>
 							<view class="time">{{ $u.timeFormat(item.onlineTime, 'yyyy-mm-dd') }}</view>
 						</view>
-						<image class="img" :src="item.mainImg||staticUrl+'/img/newsdetails-banner.png'" mode=""></image>
+						<image class="img" :src="item.mainImg" mode=""></image>
 					</view>
 				</view>
 			</mescroll-body>
@@ -203,7 +203,8 @@
 			height: 200rpx;
 			box-sizing: border-box;
 			padding:24rpx 28rpx;
-			flex: 1;
+			// flex: 1;
+			width: calc( 100% - 220rpx );
 			.title{
 				font-size: 28rpx;
 				font-weight: bold;

pages/newsdetails.vue

@@ -10,7 +10,7 @@
 		<view class="content-wrap">
 			<view class="title">{{details.title}}</view>
 			<view class="time">{{ $u.timeFormat(details.onlineTime, 'yyyy-mm-dd') }}</view>
-			<view class="centent">
+			<view class="centent parse-content">
 				<u-parse :content="details.centent"></u-parse>
 			</view>
 		</view>

pages/ticketlist.vue

@@ -5,7 +5,17 @@
 		</view>
 		<view class="banner">
 			<!-- <image class="img" :src="staticUrl+'/img/bookticket-banner.png'" alt=""> -->
-			<image class="img" :src="theatre.showImg" alt="">
+<!-- 			<image class="img" :src="theatre.showImg" alt=""> -->
+			<u-swiper
+				:list="performInfo.photoList"
+				height="554rpx"
+				indicatorMode="dot"
+				:indicatorStyle="{bottom:'100rpx'}"
+				keyName="imageUrl"
+				radius="0"
+				:indicator="false"
+				circular
+			></u-swiper>
 			<view class="content">
 				<view class="share" @click="openShare(item)">
 					<image class="icon" :src="staticUrl+'/img/share-ico.png'" ></image>
@@ -14,7 +24,7 @@
 		</view>
 		<view class="base-info">
 			<view class="inner">
-				<view class="name">{{theatre.name}}</view>
+				<view class="name">{{performInfo.name}}</view>
 				<view class="addr u-flex u-row-between">
 					<view class="text">演出地址：{{theatre.address||''}}</view>
 					<view class="menu u-flex">
@@ -47,14 +57,6 @@
 		</view>
 		<view class="page-wrap">
 			<view class="ticket" v-if="tabsIndex==0">
-				<view class="date-block auditorium">
-					<view class="title">演出厅</view>
-					<view class="date-list u-flex u-flex-wrap">
-						<view class="date-item" :class="{active:auditoriumIndex==index}" @click="auditoriumClick(index)" v-for="(date,index) in auditoriumList" :key="index">
-							<view class="name">{{ date.name }}</view>
-						</view>
-					</view>
-				</view>
 				<view class="date-block">
 					<view class="title">演出日期</view>
 					<view class="date-list u-flex">
@@ -63,8 +65,14 @@
 						@click="dateClick(index)" 
 						v-for="(date,index) in dateList" :key="index">
 							<!-- <view class="name">{{ date.name || ' ' }}</view> -->
-							<view class="name">{{ performDateList.find(item => item.performDate === `${date.year}-${date.month}-${date.day}`) !== undefined?'有演出':'无演出' }}</view>
+						<!-- 	<view class="name">
+								{{ performDateList.find(item => item.performDate === date.fullDay ) !== undefined?'有演出':'无演出' }}
+							</view> -->
+							<view class="name">
+								{{date.fullDay|checkWeekDate}}
+							</view>
 							<view class="date">{{ date.month }} - {{ date.day }}</view>
+							<image class="selected-img" :src="staticUrl+'/img/selected.png'"></image>
 						</view>
 						<view class="date-item more-date u-flex u-row-center" @click="calendarShow = true">
 							<view class="text">
@@ -75,6 +83,14 @@
 						</view>
 					</view>
 				</view>
+				<view class="date-block auditorium">
+					<view class="title">演出厅</view>
+					<view class="date-list u-flex u-flex-wrap">
+						<view class="date-item" :class="{active:auditoriumIndex==index}" @click="auditoriumClick(index)" v-for="(date,index) in auditoriumList" :key="index">
+							<view class="name">{{ date.name }}</view>
+						</view>
+					</view>
+				</view>
 				<view class="date-block session-wrap">
 					<view class="title">演出场次</view>
 					<view class="session">
@@ -115,7 +131,7 @@
 			<view class="details" v-if="tabsIndex==1">
 				<view class="details-block">
 					<view class="title">剧情简介</view>
-					<view class="intro">
+					<view class="intro parse-content">
 						<u-parse :content="performInfo.performSnapshot"></u-parse>
 					</view>
 				</view>
@@ -141,14 +157,16 @@
 					</view>
 				</view>
 			</view>
-			<view class="viewingTips" v-if="tabsIndex==2">
+			<view class="viewingTips parse-content" v-if="tabsIndex==2">
 				<u-parse :content="formerNotice"></u-parse>
 			</view>
 		</view>
+		<!-- :maxDate="maxDate" -->
 		<u-calendar
 			ref="calendar"
 			:formatter="formatter"
 			:maxDate="maxDate"
+			monthNum="12"
 			:show="calendarShow" 
 			color="#EF1010"
 			:closeOnClickOverlay="true"
@@ -183,6 +201,7 @@
 </template>
 
 <script>
+	import moment from 'moment';
 	import { systemInfo } from "@/mixin.js";
 	// 日历
 	const d = new Date()
@@ -191,6 +210,16 @@
 	month = month < 10 ? `0${month}` : month
 	const date = d.getDate()
 	// 日历
+	// 算最大日期
+	const maxd = new Date()
+	maxd.setMonth(maxd.getMonth() + 12)  // 将月份加3
+	const maxdyear = maxd.getFullYear()
+	let maxdmonth = maxd.getMonth() + 1
+	maxdmonth = maxdmonth < 10 ? `0${maxdmonth}` : maxdmonth
+	const maxddate = maxd.getDate()
+	const theMaxDate = `${maxdyear}-${maxdmonth}-${maxddate}`
+	// console.log('theMaxDate=============================',theMaxDate)  //输出：
+	//算最大日期
 	let parentThis= null;
 	export default {
 		mixins:[systemInfo],
@@ -208,7 +237,8 @@
 				dateList:[],
 				dateIndex:0,
 				calendarShow:false,//日历
-				maxDate:`${year}-${month}-${date + 30}`,
+				// maxDate:`${year}-${month}-${date + 30}`,
+				maxDate:theMaxDate,
 				auditoriumList:[],//演艺厅
 				auditoriumIndex:0,
 				sessionList:[],//演出场次
@@ -222,6 +252,7 @@
 				performInfo:{},//节目详情
 				formerNotice:{},//节目观影须知
 				performDateList:[],//有票的日期
+				firstGet:0,
 			}
 		},
 		onShow() {
@@ -282,6 +313,7 @@
 				})
 			},
 			getTimes(){
+				this.firstGet++;
 				uni.showLoading();
 				let auditoriumId= this.auditoriumList[this.auditoriumIndex]?.id;
 				if(!auditoriumId){return}
@@ -300,16 +332,18 @@
 						item.performTimeEnd = item.performTimeEnd;
 						return item
 					});
+					this.setDate();
 					uni.hideLoading();
 				}).catch(err=>{
 					console.log('getPoster',err);
 				})
 			},
 			 formatter: (day) => {
+				 day.date = moment(day.date).format("YYYY-MM-DD HH:mm:ss")
 				 // console.log('day',day);
 				 // console.log('thisthisthisthisthisthisthisthisthis',parentThis);
 				 // console.log('==================================',day.date.toISOString().split('T')[0]);
-				let ticket = parentThis.performDateList.find(item => item.performDate === day.date.toISOString().split('T')[0]);
+				let ticket = parentThis.performDateList.find(item => item.performDate === day.date.split(' ')[0]);
 				if(ticket){
 					day.dot = true
 				}
@@ -322,8 +356,23 @@
 			    return day
 			  },
 			setDate(firstDay,isSelect){
-				if(this.performDateList[0]&&!isSelect){
-					firstDay = new Date(this.performDateList[0].day);
+				if(this.performDateList[0]?.performDate&&!isSelect){
+					// firstDay = new Date(this.performDateList[0].performDate);
+					const uniquePerformDateList = Array.from(new Set(this.performDateList.map(JSON.stringify))).map(JSON.parse);//去重
+					// console.log('uniquePerformDateList',uniquePerformDateList);
+					let arr =  uniquePerformDateList.slice(0, 3);//只要前三项
+					this.dateList = arr.map(item=>{
+						// console.log('uniquePerformDateList item',item);
+						let day = item.performDate.split('-');
+						// console.log('setDate day',day);
+						return { year:day[0],month:String(day[1]),day:String(day[2]), fullDay:`${day[0]}-${String(day[1])}-${String(day[2])}`}
+					});
+					// console.log('this.firstGet',this.firstGet);
+					if(this.firstGet<=1){
+						this.getTimes();
+					}
+					// 
+					return 
 				}
 				// console.log('this.dateListthis.dateListthis.dateListthis.dateList',this.dateList);
 				// 前端写演出日期（今天，明天，后天）
@@ -333,13 +382,29 @@
 				let afterTomorrow = new Date();
 				afterTomorrow.setDate(today.getDate() + 2);
 				this.dateList = [
-				  { year: today.getFullYear(), month: today.getMonth() + 1, day: today.getDate(),name:'日期' },
-				  { year: tomorrow.getFullYear(), month: tomorrow.getMonth() + 1, day: tomorrow.getDate() ,name:'日期'},
-				  { year: afterTomorrow.getFullYear(), month: afterTomorrow.getMonth() + 1, day: afterTomorrow.getDate(),name:'日期' }
+				  { 
+					  year: today.getFullYear(), 
+					  month: String(today.getMonth() + 1).padStart(2, '0'), 
+					  day: String(today.getDate()).padStart(2, '0'), 
+					  name: '日期',
+					  fullDay:`${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${ String(today.getDate()).padStart(2, '0')}`
+					},
+				  { 
+					  year: tomorrow.getFullYear(), 
+					  month: String(tomorrow.getMonth() + 1).padStart(2, '0'), 
+					  day: String(tomorrow.getDate()).padStart(2, '0'), 
+					  name: '日期',
+					  fullDay:`${tomorrow.getFullYear()}-${String(tomorrow.getMonth() + 1).padStart(2, '0')}-${ String(tomorrow.getDate()).padStart(2, '0')}`
+					},
+				  { 
+					  year: afterTomorrow.getFullYear(), 
+					  month: String(afterTomorrow.getMonth() + 1).padStart(2, '0'), 
+					  day: String(afterTomorrow.getDate()).padStart(2, '0'), 
+					  name: '日期',
+					  fullDay:`${afterTomorrow.getFullYear()}-${String(afterTomorrow.getMonth() + 1).padStart(2, '0')}-${ String(afterTomorrow.getDate()).padStart(2, '0')}`
+					}
 				];
-					
-				this.getTimes()
-				
+				// console.log('this.dateList ',this.dateList);
 			},
 			dateClick(index){
 				this.dateIndex = index;
@@ -388,6 +453,24 @@
 			},
 			openShare(){
 				this.shareShow = true;
+				
+			},
+			// 海报相关开始
+			getPoster(item){
+				this.posterShow = true;
+				this.shareShow = false;
+				// 后端生成海报
+				// this.$u.api.performQrcode({performId:this.performId}).then(res=>{
+				// 	this.posterSrc = res.data.imageUrl;
+				// 	// console.log('getPoster',res.data);
+				// }).catch(err=>{
+				// 	console.log('getPoster',err);
+				// })
+				
+				//前端生成海报
+				uni.showLoading({
+					title: '生成海报中'
+				});
 				// 前端生成海报开始
 				let that = this;
 				 const ctx = uni.createCanvasContext('canvas', this);
@@ -396,19 +479,19 @@
 				  src: this.performInfo.posterImg,
 				  success: res1 => {
 					const img1 = res1.path;
-			
+							
 					// 加载海报二维码
 					uni.getImageInfo({
 					  src: this.performInfo.appletQrcode,
 					  success: res2 => {
 						const img2 = res2.path;
-			
+							
 						// 绘制海报背景图
 						ctx.drawImage(img1, 0, 0, 670, 900);
-			
+							
 						// 绘制海报二维码
 						ctx.drawImage(img2, 468, 724, 188, 166);
-			
+							
 						// 绘制完成后导出图片并显示
 						ctx.draw(false, () => {
 						  uni.canvasToTempFilePath({
@@ -431,21 +514,12 @@
 				  fail: err1 => {
 					console.error(err1);
 				  },
+				  complete: () => {
+				  	uni.hideLoading()
+				  }
 				});
 				// 前端生成海报结束
 			},
-			// 海报相关开始
-			getPoster(item){
-				this.posterShow = true;
-				this.shareShow = false;
-				// 后端生成海报
-				// this.$u.api.performQrcode({performId:this.performId}).then(res=>{
-				// 	this.posterSrc = res.data.imageUrl;
-				// 	// console.log('getPoster',res.data);
-				// }).catch(err=>{
-				// 	console.log('getPoster',err);
-				// })
-			},
 			saveImage() {
 				let that = this;
 					uni.showLoading({
@@ -540,7 +614,7 @@
 			phoneCall(){
 				// console.log('this.theatre',this.theatre);
 				uni.makePhoneCall({
-					phoneNumber: this.theatre.contactMobile,
+					phoneNumber: this.theatre.customerServiceMobile,
 					success() {
 						console.log('success');
 					},

static/css/common.scss

@@ -112,6 +112,7 @@ $pagegap:32rpx;
 .date-list{
 	.date-item{
 		position: relative;
+		overflow: hidden;
 		flex: 1;
 		background: #FFFFFF;
 		border-radius: 16rpx;
@@ -121,10 +122,21 @@ $pagegap:32rpx;
 		box-sizing: border-box;
 		&.active{
 			border-color: #ED0000;
+			background-color: #FFC8C8 ;
 			.name,.date{
 				color: #ED0000;
 			}
-			
+			.selected-img{
+				display: block;
+			}
+		}
+		.selected-img{
+			width: 32rpx;
+			height: 32rpx;
+			position: absolute;
+			right: 0;
+			bottom: 0;
+			display: none;
 		}
 		&.dot::after{
 			content: '';
@@ -295,4 +307,17 @@ $pagegap:32rpx;
 		background: linear-gradient(90deg, #FF7979 0%, #ED0000 100%);
 	}
 }
-// 分享 海报
+// 分享 海报
+
+// 富文本
+.parse-content{
+	font-size: 26rpx;
+	font-family: SourceHanSansCN, SourceHanSansCN;
+	font-weight: 400;
+	color: #4E4E4E;
+	line-height: 40rpx;
+	rich-text,p{
+		display: block;
+		margin-bottom: 8px;
+	}
+}

static/logo.svg

@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 750 422" style="enable-background:new 0 0 750 422;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_00000140000486157882826870000007221579918701196449_);}
+	.st2{fill:url(#SVGID_00000036931254733988851740000009953821978700827530_);}
+	.st3{fill:url(#SVGID_00000158731152278408604530000000055075175893880453_);}
+	.st4{fill:url(#SVGID_00000080928632844849270810000017537741479220234144_);}
+	.st5{fill:url(#SVGID_00000091015095995676809280000009079845705063013795_);}
+	.st6{fill:url(#SVGID_00000151545769631247894970000005004757807824389025_);}
+	.st7{fill:url(#SVGID_00000128475466696929793450000010403830378602305940_);}
+	.st8{fill:url(#SVGID_00000036248896964300413530000004462419411256015785_);}
+	.st9{fill:url(#SVGID_00000022548248585355353180000005833023100168402343_);}
+	.st10{fill:url(#SVGID_00000099640502816314516610000015645311528596044965_);}
+	.st11{fill:url(#SVGID_00000143599212459675872200000007240227900190114986_);}
+	.st12{fill:url(#SVGID_00000153699669491735575770000010502572629283511947_);}
+	.st13{fill:url(#SVGID_00000139271213937430465080000012685673228554600854_);}
+	.st14{fill:url(#SVGID_00000160165960824655412760000004520554627207360142_);}
+	.st15{fill:url(#SVGID_00000030488478326947421440000017588227068186671240_);}
+	.st16{fill:url(#SVGID_00000053527995893557589750000003927760824008387238_);}
+	.st17{fill:url(#SVGID_00000100355412462811441330000011505244038520995482_);}
+	.st18{fill:url(#SVGID_00000178199887920956096310000018072506848948699044_);}
+	.st19{fill:url(#SVGID_00000140727996621273254330000008246246362703009698_);}
+	.st20{fill:url(#SVGID_00000053507488083599379620000009634741184751434682_);}
+</style>
+<g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="527.5886" y1="139.4055" x2="527.5886" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path class="st0" d="M538.99,272.42c-0.19-1.2,0.01-2.05,0.62-2.89c1.6-2.19,2.46-4.71,2.34-7.75
+				c-0.24-6.09,0.25-12.15,0.67-18.2c0.01-0.13,0-0.27-0.13-0.54c-1.01,1.35-2.07,2.65-3.02,4.06c-2.26,3.38-3.72,7.21-4.18,11.57
+				c-0.06,0.54-0.07,1.09-0.1,1.63c-0.11,1.78-1.07,2.61-2.38,1.85c-1.19-0.69-2.31-1.71-2.71-3.34c-0.21-0.86-0.13-1.88-0.04-2.81
+				c0.68-6.73,1.4-13.45,2.12-20.17c0.2-1.89,0.42-3.78,0.62-5.67c0.03-0.25,0-0.52,0-0.89c-0.27,0.29-0.49,0.51-0.7,0.74
+				c-3.36,3.83-6.72,7.67-10.09,11.49c-0.3,0.34-0.41,0.65-0.36,1.19c0.49,4.73,0.93,9.46,1.38,14.2c0.02,0.21,0,0.43,0,0.69
+				c-0.92,0.3-1.42,1.17-1.76,2.17c-0.36,1.05-0.63,2.15-0.95,3.22c-0.12,0.38-0.25,1.02-0.44,1.05c-0.56,0.1-1.17,0.26-1.71-0.32
+				c-1.33-1.45-2.7-2.85-4.05-4.28c-0.93-0.99-0.92-0.99-0.78-2.65c0.27-0.04,0.55-0.08,0.83-0.13c0.93-0.18,1.38-0.79,1.38-1.93
+				c0.01-1.71,0-3.42,0-5.36c-1.08,1.28-2.05,2.38-2.98,3.54c-2.2,2.76-4.34,5.59-5.88,8.97c-0.65,1.41-1.05,2.98-1.6,4.47
+				c-0.08,0.21-0.3,0.46-0.47,0.48c-0.51,0.06-1.03,0.04-1.54,0.02c-0.54-0.02-2.55-2.5-2.58-3.16c0-0.03,0-0.06,0-0.08
+				c-0.18-1.56,0.27-2.72,1.17-3.91c4.58-6.01,9.07-12.11,13.57-18.2c0.18-0.25,0.28-0.67,0.29-1.02c0.02-2.43,0.06-4.86,0-7.28
+				c-0.06-2.28,0.18-4.5,0.61-6.71c0.06-0.31,0.09-0.63,0.14-0.95c-0.58-0.32-0.92,0.1-1.28,0.47c-2.77,2.82-5.76,5.22-9.14,6.82
+				c-2.28,1.08-4.64,1.79-7.09,1.77c-1.37-0.01-2.46-0.9-3.34-2.11c-0.49-0.68-0.28-1.47,0.37-1.91c4.7-3.16,9.41-6.31,14.11-9.49
+				c1.32-0.89,2.69-1.73,3.88-2.86c2.7-2.58,3.83-6.17,4.03-10.27c0.03-0.64,0.1-1.31,0.29-1.9c0.85-2.8,1.73-5.6,2.64-8.37
+				c0.26-0.77,0.65-1.49,1.05-2.17c0.35-0.59,1.09-0.61,1.54-0.15c3.17,3.3,4.56,4.13,8.8,5.27c0.23,1.96,0.48,3.95,0.67,5.94
+				c0.03,0.27-0.15,0.65-0.33,0.87c-2.15,2.69-4.39,5.28-6.46,8.05c-1.7,2.28-2.91,4.91-3.05,8.16c-0.09,2.11-0.44,4.21-0.67,6.31
+				c-0.23,2.1-0.45,4.21-0.68,6.31c0.07,0.02,0.12,0.06,0.14,0.05c4.06-3.31,7.9-6.95,10.9-11.73c1.88-3,2.89-6.34,3.33-10.15
+				c0.5-4.4,1.55-8.72,3.28-12.7c0.19-0.43,0.44-0.82,0.69-1.2c0.4-0.62,0.91-0.95,1.57-0.85c0.09,0.01,0.18,0.01,0.27,0
+				c0.98-0.1,1.76,0.16,2.6,0.97c1.95,1.89,4.35,2.7,6.73,3.45c2.22,0.7,4.47,1.23,6.71,1.84c0.21,0.06,0.43,0.13,0.62,0.19
+				c0.19,1.12,0.01,1.97-0.68,2.81c-2,2.46-3.96,4.96-6.3,6.96c-1.25,1.06-2.55,1.99-4.26,2.19c0.82,1,1.53,1.97,2.33,2.82
+				c0.54,0.58,0.65,1.14,0.49,1.98c-0.34,1.82-0.74,3.65-0.6,5.56c0.01,0.16,0.02,0.31,0.03,0.64c1.54-1.25,2.99-2.43,4.49-3.65
+				c-0.42-0.78-0.79-1.55-1.23-2.26c-0.26-0.43-0.23-0.77-0.02-1.18c0.71-1.39,1.84-1.82,3.07-2c0.51-0.07,1.03-0.02,1.54-0.1
+				c0.85-0.13,1.43,0.29,2.05,1c0.69,0.79,0.73,1.62,0.56,2.58c-0.39,2.25-1.46,4.06-2.77,5.58c-2.08,2.42-4.31,4.65-6.46,6.98
+				c-0.28,0.3-0.5,0.74-0.62,1.16c-0.58,2-0.71,4.08-0.65,6.19c0.05,2.02,0.09,4.04-0.01,6.05c-0.15,3.23-0.39,6.46-0.62,9.69
+				c-0.05,0.75-0.04,1.34,0.4,2.01c0.29,0.43,0.3,1.41,0.11,1.98c-0.37,1.08-0.86,2.18-1.51,3.03c-2.04,2.66-4.62,4.43-7.24,6.08
+				C540.15,272.51,539.55,272.37,538.99,272.42z M544.91,220.07c-0.06-0.06-0.12-0.13-0.17-0.19c-0.67,0.4-1.38,0.73-2.02,1.21
+				c-1.72,1.31-2.73,3.33-3.46,5.56c-1.17,3.55-1.57,7.3-1.74,11.09c-0.06,1.37-0.01,2.74-0.01,4.19c0.32-0.26,0.64-0.5,0.94-0.76
+				c3.37-3.01,4.93-7.26,5.48-12.15c0.24-2.1,0.35-4.22,0.56-6.32C544.58,221.81,544.77,220.94,544.91,220.07z M541.17,217.23
+				c0.43-0.09,0.71-0.07,0.94-0.2c2.66-1.61,5.33-3.17,7.65-5.48c0.46-0.46,0.83-1.07,1.32-1.71c-2.63-1.29-5.08-2.5-7.54-3.68
+				c-0.23-0.11-0.52-0.05-0.84-0.08C542.18,209.77,541.69,213.41,541.17,217.23z M524.55,203.52c-0.21,2.04-0.87,3.98-0.68,5.94
+				c0.95-1.15,1.9-2.31,2.77-3.37C525.99,205.29,525.3,204.43,524.55,203.52z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_00000155830357604304887680000002910475876380659645_" gradientUnits="userSpaceOnUse" x1="461.3712" y1="139.4055" x2="461.3712" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000155830357604304887680000002910475876380659645_);" d="M484.35,197.92
+				c-1.26,0.58-0.8,2.06-0.58,3.19c0.43,2.22,1.63,3.84,3,5.28c0.4,0.41,0.6,0.84,0.69,1.49c0.21,1.58,0.97,2.85,1.78,4.06
+				c0.21,0.32,0.44,0.62,0.66,0.92c0.63,0.85,0.66,1.12,0.21,2.17c-1.35,3.13-2.84,6.14-5.14,8.38c-0.86,0.84-1.85,1.47-2.85,2.24
+				c0.4,3.42,0.85,6.97,1.22,10.53c0.38,3.67,1.08,7.29,1.03,11.02c-0.02,1.35-0.44,2.36-1.29,3.15c-1.36,1.27-2.96,1.87-4.6,2.32
+				c-2.94,0.81-5.92,1.31-8.94,1.31c-0.73,0-1.34,0.17-1.91,0.73c-0.4,0.39-0.85,0.7-1.29,1.06c-1.71-1.5-3.72-1.5-5.69-1.71
+				c-0.67-0.07-1.34-0.04-2.01-0.05c-0.94-0.02-1.4-0.59-1.4-1.76c-0.01-3.34,1.53-5.35,4.29-5.56c0.96-0.07,1.92-0.06,2.88-0.04
+				c0.27,0.01,0.56,0.15,0.79,0.33c1.24,0.98,2.45,1.99,3.69,2.97c0.23,0.18,0.54,0.33,0.79,0.29c2.83-0.45,5.66-0.9,8.36-2.1
+				c1.01-0.45,2-1.08,2.9-1.8c0.97-0.78,1.28-1.92,1.05-3.41c-0.74-4.76-1.39-9.54-2.08-14.31c-0.01-0.07-0.05-0.14-0.11-0.28
+				c-0.16,0.11-0.3,0.2-0.44,0.32c-1.7,1.49-3.62,2.18-5.69,2.3c-1.13,0.06-1.7-1.06-1.17-2.28c1.79-4.11,3.57-8.22,5.39-12.31
+				c0.38-0.86,0.53-1.7,0.4-2.74c-0.17,0.18-0.32,0.31-0.45,0.47c-8.49,10.38-16.98,20.75-25.48,31.12
+				c-0.27,0.33-0.4,0.62-0.32,1.13c0.72,4.46,0.78,8.98,0.69,13.51c-0.01,0.31-0.08,0.66-0.22,0.9c-2.43,3.99-5.62,6.19-9.77,6.1
+				c-0.12,0-0.25-0.03-0.47-0.05c0.23-0.3,0.39-0.52,0.56-0.72c2.4-2.93,4.79-5.87,7.2-8.79c0.3-0.37,0.46-0.73,0.45-1.27
+				c-0.02-2.75-0.01-5.51-0.01-8.32c-0.12,0.04-0.21,0.04-0.27,0.09c-3.86,3.59-7.61,7.32-10.78,11.85
+				c-1.15,1.64-2.19,3.39-2.81,5.43c-0.25,0.83-0.38,1.72-0.62,2.86c1.85-0.35,3.5-0.66,5.15-0.97c0.02,0.04,0.04,0.09,0.06,0.13
+				c-1.06,1.11-2.11,2.22-3.17,3.33c-0.47,0.5-0.93,1.03-1.44,1.47c-0.28,0.25-0.65,0.4-0.99,0.49c-0.72,0.19-1.19-0.31-1.74-0.85
+				c-1.21-1.18-1.61-2.58-1.51-4.45c0.11-2.19,0.64-4.16,1.49-6.03c1.48-3.3,3.42-6.21,5.64-8.79c3.07-3.57,6.28-6.96,9.46-10.37
+				c0.55-0.59,0.8-1.08,0.6-1.97c-0.25-1.07-0.51-2.3-0.51-3.32c0-0.28-0.06-1.69-0.06-2.54c0-2.13-0.05-4.26,0.01-6.38
+				c0.05-1.69-0.18-3.32-0.59-4.9c-0.26-0.98-0.17-1.85,0.28-2.63c0.93-1.63,1.88-3.24,2.89-4.8c0.8-1.23,1.68-2.38,2.53-3.56
+				c-0.03-0.07-0.06-0.14-0.09-0.21c-0.32,0.15-0.68,0.24-0.95,0.47c-3.3,2.93-6.6,5.86-9.87,8.85c-0.7,0.64-1.37,1.06-2.25,0.91
+				c-0.3-0.05-0.62-0.01-1.03-0.01c-0.25-1.67-0.5-3.32-0.71-4.98c-0.03-0.27,0.08-0.67,0.25-0.87c2.01-2.38,4.24-4.34,7.06-5.02
+				c0.5-0.12,1.01-0.17,1.6-0.27c-0.16-0.23-0.29-0.41-0.42-0.58c-0.34-0.45-0.36-0.96-0.07-1.41c1.89-2.87,3.82-5.71,6.35-7.8
+				c0.56-0.47,1.23-0.76,1.86-1.08c0.41-0.21,0.75-0.11,1,0.44c0.28,0.62,0.64,1.18,0.96,1.77c0.34,0.64,0.36,1.24-0.13,1.82
+				c-0.58,0.68-0.57,1.16,0.01,1.86c0.87,1.06,1.74,2.11,2.62,3.18c-1.98,3.23-3.92,6.39-5.86,9.55c-0.96,1.57-1.94,3.13-2.88,4.72
+				c-0.16,0.27-0.29,0.63-0.3,0.95c-0.02,5.16-0.01,10.31-0.01,15.47c0,0.13,0.03,0.26,0.05,0.38c0.06,0.06,0.13,0.12,0.19,0.19
+				c0.13-0.25,0.23-0.54,0.4-0.75c4.74-5.86,9.43-11.77,14.24-17.54c2.08-2.5,4.22-5.04,6.64-6.96c2.58-2.05,4.19-5.05,6.21-7.65
+				c0.11-0.14,0.16-0.38,0.19-0.59c0.22-1.53,0.51-3.05,0.61-4.59c0.05-0.74-0.17-1.55-0.4-2.27c-0.25-0.76-0.21-1.41,0.12-2.08
+				c0.3-0.6,0.58-1.22,0.88-1.82c0.46-0.91,1.69-1.14,2.28-0.19c0.45,0.73,1.05,1.56,1.73,1.93
+				C484.46,197.65,484.52,197.85,484.35,197.92z M487.32,213.5c-1.37-0.22-1.35-1.58-1.53-2.78c-0.74,0.07-1.25,0.58-1.57,1.27
+				c-0.56,1.23-1.13,2.48-1.51,3.79c-0.55,1.88-0.94,3.83-1.42,5.85C484.5,220.42,487.28,216.65,487.32,213.5z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_00000131327206248398065760000005869725996311911043_" gradientUnits="userSpaceOnUse" x1="352.6551" y1="139.4055" x2="352.6551" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000131327206248398065760000005869725996311911043_);" d="M351.45,208.97
+				c-0.66-0.13-1.26-0.19-1.84-0.37c-0.51-0.16-0.96-0.49-1.08-1.2c-0.13-0.73,0.21-1.25,0.66-1.56c1.53-1.05,3.06-2.1,4.65-3.01
+				c0.57-0.32,0.74-0.73,0.82-1.38c0.41-3.09,0.82-6.18,1.24-9.27c0.03-0.24,0.1-0.47,0.14-0.7c1.55-0.38,2.77,0.35,3.82,1.61
+				c1.07,1.28,1.4,2.92,1.42,4.85c0.46-0.15,0.86-0.2,1.2-0.41c2.68-1.61,5.33-3.26,8.01-4.86c0.36-0.22,0.76-0.34,1.16-0.37
+				c1.1-0.06,2.2-0.06,3.3-0.01c0.31,0.02,0.77,0.23,1.01,0.48c0.66,0.69,1.26,1.45,1.95,2.26c-2.53,3.06-4.99,6.04-7.55,9.14
+				c1.11,0.13,2.08,0.19,3.02,0.35c0.42,0.07,0.84,0.21,1.24,0.4c1.09,0.53,1.2,0.98,0.49,1.58c-5.4,4.59-10.8,9.18-16.2,13.77
+				c-0.18,0.16-0.36,0.32-0.55,0.47c-0.8,0.65-1.07,1.55-0.78,2.77c0.21-0.14,0.44-0.27,0.66-0.42c3.61-2.48,7.23-4.96,10.83-7.46
+				c0.31-0.22,0.69-0.17,0.97,0.1c0.8,0.78,1.64,1.52,2.52,2.34c0.71,0.63-1.17,1.2-2.29,2.04c-2.38,1.78-4.58,3.81-6.89,5.72
+				c-0.39,0.32-0.63,0.87-0.59,1.45c0.04,0.57,0.01,1.15,0.01,1.78c0,0,1.07,0.03,1.46,0.08c0.56,0.07,0.55,2.63,0,2.74
+				c-0.96,0.18-4.49,0.94-4.49,0.94c0.78,0.94,1.41,1.83,2.16,2.54c0.24,0.23,0.83,0.15,1.15-0.05c1.05-0.67,2.03-1.48,3.06-2.18
+				c0.26-0.18,0.65-0.27,0.92-0.17c1.15,0.41,2.3,0.83,3.41,1.38c0.69,0.34,1.19,0.95,1.31,1.8c0.08,0.58-1.29,0.61-1.95,0.79
+				c-2.69,0.73-5.29,1.75-7.49,3.89c-2.21,2.16-3.31,4.97-3.29,8.62c0.41-0.12,0.79-0.14,1.11-0.32c1.5-0.88,3.01-1.77,4.48-2.74
+				c0.78-0.52,1.53-0.71,2.42-0.49c1.3,0.32,2.63,0.48,4.02,0.72c0,0.81,0.03,1.57-0.02,2.33c-0.01,0.2-0.26,0.5-0.44,0.54
+				c-4.26,1.09-8.11,3.41-11.86,5.99c-0.36,0.25-0.49,0.47-0.38,1.02c0.25,1.24,0.41,2.5,0.62,3.81c0.3,2.19,0.02,4.83-0.07,5.87
+				c-0.33,3.69-1.64,6.81-3.87,9.33c-0.67,0.76-1.23,0.75-1.64-0.29c-0.42-1.06-0.79-2.24-0.85-3.39
+				c-0.19-3.72-0.22-7.46-0.31-11.19c-0.02-0.95,0-1.9,0-3.02c-0.44,0.11-0.81,0.14-1.14,0.3c-0.55,0.28-1.12,0.58-1.61,0.99
+				c-0.75,0.61-1.47,0.61-2.25,0.16c-0.34-0.2-0.71-0.31-1.05-0.51c-1.77-1.06-1.47-1.4-1.46-3.53c0-0.17,0.11-0.35,0.2-0.5
+				c0.57-0.95,1.17-1.88,1.73-2.84c0.18-0.3,0.48-0.43,0.77-0.35c0.52,0.16,1.07,0.19,1.57,0.39c1.18,0.49,2.29,0.32,3.43-0.24
+				c0.47-0.23,0.63-0.52,0.55-1.08c-0.2-1.28-0.36-2.58-0.62-3.84c-0.14-0.65-0.13-1.24,0.28-1.63c0.33-0.32,0.46-0.49,0.9-0.86
+				c-1.9-0.89-1.73-2.9-2.08-4.83c0.47,0,0.87,0.02,1.28-0.01c0.99-0.07,1.77-1.1,1.77-2.31c0-1.3,0-2.61,0-4.09l-2.19,1.74
+				c-1.17,0.97-1.41-1.34-2.1-2.06c-0.23-0.24-0.28-0.66-0.1-0.96c1.17-1.89,2.55-4.05,3.73-5.96c0.88-1.44,1.78-2.86,2.64-4.33
+				c0.2-0.34,0.24-0.8,0.36-1.21c-0.07-0.06-0.13-0.12-0.2-0.18c-0.45,0.33-0.94,0.59-1.33,1c-2.41,2.59-4.86,5.14-7.19,7.84
+				c-2.8,3.25-5.48,6.64-8.23,9.94c-0.26,0.31-0.6,0.53-0.96,0.59c-2.05,0.36-2.98,1.73-3.28,4.68c-0.34,3.35-0.73,6.69-1.17,10.02
+				c-0.23,1.71-0.43,3.38,0.26,5c0.19,0.45,0.04,0.7-0.27,0.92c-0.31,0.22-0.63,0.43-0.89,0.73c-0.77,0.9-1.72,0.86-2.63,0.69
+				c-0.36-0.07-0.79-0.55-0.95-0.97c-0.24-0.65-0.24-1.42-0.4-2.13c-0.06-0.25-0.23-0.56-0.41-0.66c-0.57-0.3-1.17-0.51-1.82-0.78
+				c0.32-2.05,0.63-4.07,0.95-6.09c1.14-7.21,2.27-14.42,3.45-21.63c0.09-0.54,0.38-1.08,0.69-1.5c0.39-0.53,0.88-0.3,1.06,0.4
+				c0.52,2.05,1.03,4.11,1.59,6.14c0.19,0.69,0.5,1.33,0.8,1.97c0.22,0.48,0.48,0.5,0.85,0.1c3.61-3.95,7.23-7.87,10.85-11.8
+				c0.13-0.14,0.25-0.32,0.4-0.44c1.98-1.57,2.55-3.93,2.35-7.34c-0.14-2.42,0.43-4.75,1.04-7.05
+				C351.47,209.35,351.45,209.18,351.45,208.97z M366.64,198.96c-0.06-0.05-0.12-0.1-0.18-0.15c-0.53,0.28-1.06,0.54-1.58,0.84
+				c-3.52,2.04-6.26,5.07-7.86,9.48c-0.16,0.43-0.19,0.93-0.29,1.48c0.2-0.05,0.25-0.05,0.29-0.08c0.19-0.14,0.38-0.29,0.56-0.44
+				c3.37-2.8,6.15-6.36,8.78-10.13C366.53,199.71,366.55,199.3,366.64,198.96z"/>
+			
+				<linearGradient id="SVGID_00000052819573255971274660000006754478074310558641_" gradientUnits="userSpaceOnUse" x1="334.9821" y1="139.4055" x2="334.9821" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000052819573255971274660000006754478074310558641_);" d="M340.21,199.73
+				c0.82-0.12,1.52-0.14,2.18,0.63c1.05,1.22,2.21,2.29,3.32,3.42c0.71,0.72,0.74,1.11,0.14,1.94c-2.31,3.17-4.63,6.34-6.95,9.51
+				c-3.62,4.96-7.25,9.92-10.87,14.88c-0.88,1.2-1.83,1.25-2.76,0.13c-0.52-0.63-1.06-1.24-1.58-1.86
+				c3.16-3.55,5.72-7.61,8.36-11.57c2.65-3.97,5.21-8.02,7.84-12.01c0.21-0.32,0.57-0.48,1-0.83
+				C340.68,202.72,340.45,201.25,340.21,199.73z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_00000104666638876684332600000004035634833883296189_" gradientUnits="userSpaceOnUse" x1="398.4344" y1="139.4055" x2="398.4344" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000104666638876684332600000004035634833883296189_);" d="M384.52,233.27
+				c-0.17-1.82-0.17-1.8,1.11-2.13c4.23-1.08,8.46-2.18,12.45-4.26c1.46-0.76,2.85-1.78,4.19-2.84c0.97-0.77,1.64-1.91,1.78-3.41
+				c0.02-0.24,0.19-0.48,0.33-0.68c1.94-2.67,2.64-5.87,2.67-9.34c0-0.32-0.22-0.69-0.4-0.97c-1.97-3.09-3.98-6.15-5.92-9.28
+				c-0.53-0.84-0.86-1.87-1.29-2.84c1.65-0.62,7.15,3.08,9.34,6.07c2.52,3.44,3.55,7.53,3.56,12.11c0.01,0.71,0.57,0.88,0.72,0
+				c0.14-1.39,0.89-2.26,1.81-2.94c1.72-1.27,3.63-1.9,5.56-2.48c0.13-0.04,0.31,0.01,0.44,0.08c0.9,0.54,1.79,1.09,2.83,1.73
+				c-0.41,0.73-0.76,1.44-1.19,2.07c-2.02,2.95-4.46,5.35-6.98,7.61c-3.76,3.36-7.61,6.57-11.39,9.89
+				c-0.52,0.46-1.02,1.06-1.35,1.73c-3.91,7.69-7.96,15.26-12.6,22.32c-1.41,2.14-2.93,4.18-4.4,6.26c-1.85,2.63-4.29,4.23-6.8,5.65
+				c-1.47,0.83-3.02,1.44-4.52,2.23c-0.65,0.34-0.96-0.15-1.19-0.62c-0.23-0.47-0.17-0.97,0.29-1.4c4.3-3.96,8.42-8.17,12.19-12.89
+				c3.5-4.39,6.71-9.07,8.89-14.64c0.71-1.8,1.22-3.73,1.75-5.63c0.35-1.24,0.2-1.31-0.75-1.83c-0.97-0.53-1.83-0.49-2.67,0.26
+				c-1.16,1.03-2.38,0.99-3.73,0.59c-1.02-0.31-2.11-0.48-3.17-0.43C385.57,233.31,384.6,233.81,384.52,233.27z"/>
+			
+				<linearGradient id="SVGID_00000006698553838715441150000006468526626636131720_" gradientUnits="userSpaceOnUse" x1="419.8334" y1="139.4055" x2="419.8334" y2="278.2872">
+				<stop  offset="0" style="stop-color:#DEA54E"/>
+				<stop  offset="0.1421" style="stop-color:#FCFADF"/>
+				<stop  offset="0.1594" style="stop-color:#FBF4CF"/>
+				<stop  offset="0.1982" style="stop-color:#F9E9B0"/>
+				<stop  offset="0.2409" style="stop-color:#F7E097"/>
+				<stop  offset="0.2882" style="stop-color:#F6DA83"/>
+				<stop  offset="0.3426" style="stop-color:#F5D575"/>
+				<stop  offset="0.4104" style="stop-color:#F4D26D"/>
+				<stop  offset="0.5334" style="stop-color:#F4D16B"/>
+				<stop  offset="0.8344" style="stop-color:#C26719"/>
+				<stop  offset="1" style="stop-color:#F4CD9C"/>
+			</linearGradient>
+			<path style="fill:url(#SVGID_00000006698553838715441150000006468526626636131720_);" d="M412.17,263.54
+				c0.24-0.55,0.37-1,0.59-1.35c1.6-2.44,3.24-4.85,4.83-7.3c0.86-1.33,0.97-2.83,0.48-4.4c-0.29-0.91-0.53-1.86-0.94-2.7
+				c-0.92-1.9-1.92-3.73-2.88-5.59c-0.09-0.18-0.19-0.35-0.4-0.74c0.53,0.11,0.92,0.14,1.28,0.28c3.34,1.23,6.05,3.69,8.37,6.77
+				c1.31,1.74,2.47,3.65,3.67,5.51c0.54,0.84,0.39,2.43-0.3,3.1c-0.59,0.57-1.21,1.16-1.9,1.51c-3.35,1.68-6.71,3.34-10.11,4.87
+				C414.14,263.81,413.24,263.54,412.17,263.54z"/>
+		</g>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000047035691048151441870000014968092272306573230_" gradientUnits="userSpaceOnUse" x1="545.4971" y1="329.9934" x2="419.568" y2="310.3531">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000047035691048151441870000014968092272306573230_);" d="M499.16,318.17l-35.81,4.77
+			c-47.75,3.13-37.25-4.22-83.57-23.6c1.65,0.6,3.3,1.17,4.96,1.69c0.02,0,0.02,0,0.03,0.02c1.48,0.46,22.88,4.9,32.26,4.87
+			l31.65-0.1c16.17-0.05,32.15,3.56,46.73,10.55L499.16,318.17z"/>
+		
+			<linearGradient id="SVGID_00000063609354156613872810000017220577945889751464_" gradientUnits="userSpaceOnUse" x1="353.0473" y1="318.1414" x2="401.3137" y2="298.116">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.7601" style="stop-color:#E62C2E"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000063609354156613872810000017220577945889751464_);" d="M463.35,322.93l-52.5,7.41
+			c-4.24,0.59-8.47,0.94-12.71,1.02c-48.63-3.91-38.06-44.87-62.99-56.35c6.05,2.34,11.89,5.5,17.33,9.47l1.17,0.86
+			c8.07,5.88,16.87,10.58,26.13,13.99C426.1,318.71,415.59,326.06,463.35,322.93z"/>
+		
+			<linearGradient id="SVGID_00000044859097233475420150000017294217224159958176_" gradientUnits="userSpaceOnUse" x1="343.198" y1="344.8954" x2="328.8208" y2="282.5085">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<path style="fill:url(#SVGID_00000044859097233475420150000017294217224159958176_);" d="M398.14,331.36
+			c-16.02,0.34-31.98-2.93-46.66-9.64c-2.85-1.31-5.76-2.4-8.72-3.31c-42.53-17.41-34.23-57.3-72.63-38.62
+			c11.57-6.59,24.54-9.92,37.56-9.92c9.29,0,18.59,1.69,27.42,5.13c0.02,0,0.03,0.02,0.05,0.02
+			C360.08,286.49,349.51,327.45,398.14,331.36z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_00000136394704996483294990000018380544818187287462_" gradientUnits="userSpaceOnUse" x1="340.717" y1="141.6266" x2="491.3503" y2="156.9726">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000136394704996483294990000018380544818187287462_);" points="418.96,169.82 388.86,158.99 
+			393.13,126.74 		"/>
+		
+			<linearGradient id="SVGID_00000056406797688230079960000009773664603587219640_" gradientUnits="userSpaceOnUse" x1="451.2126" y1="177.6628" x2="347.0212" y2="33.8948">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000056406797688230079960000009773664603587219640_);" points="425.11,112.42 409.85,137.06 
+			393.13,126.74 		"/>
+		
+			<linearGradient id="SVGID_00000007428621917166539450000015583986995171762837_" gradientUnits="userSpaceOnUse" x1="443.1714" y1="183.4904" x2="338.98" y2="39.7224">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000007428621917166539450000015583986995171762837_);" points="396.23,107.67 393.13,126.74 
+			377.09,80 		"/>
+		
+			<linearGradient id="SVGID_00000095330560046905565680000012653014443888594062_" gradientUnits="userSpaceOnUse" x1="432.4759" y1="201.5028" x2="349.4862" y2="106.3978">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000095330560046905565680000012653014443888594062_);" points="393.13,126.74 333.06,117.24 
+			366.09,109.03 		"/>
+		
+			<linearGradient id="SVGID_00000007418647100218523120000011985711963450850992_" gradientUnits="userSpaceOnUse" x1="405.4063" y1="87.2944" x2="357.3491" y2="166.0437">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000007418647100218523120000011985711963450850992_);" points="393.13,126.74 360.97,178.47 
+			360.34,141.81 		"/>
+		
+			<linearGradient id="SVGID_00000052086401443861530350000009892287849444241566_" gradientUnits="userSpaceOnUse" x1="415.0266" y1="281.0163" x2="372.0174" y2="82.9315">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000052086401443861530350000009892287849444241566_);" points="393.13,126.74 366.09,109.03 
+			377.09,80 		"/>
+		
+			<linearGradient id="SVGID_00000054237655125153033930000000885783561814504864_" gradientUnits="userSpaceOnUse" x1="419.8904" y1="200.3626" x2="315.699" y2="56.5946">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000054237655125153033930000000885783561814504864_);" points="393.13,126.74 360.34,141.81 
+			333.06,117.24 		"/>
+		
+			<linearGradient id="SVGID_00000049906736961950545670000002369480488441995690_" gradientUnits="userSpaceOnUse" x1="414.494" y1="204.2735" x2="310.3026" y2="60.5055">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000049906736961950545670000002369480488441995690_);" points="393.13,126.74 388.86,158.99 
+			360.97,178.47 		"/>
+		
+			<linearGradient id="SVGID_00000032621984761622746590000016794674069364360327_" gradientUnits="userSpaceOnUse" x1="286.2739" y1="148.2623" x2="435.6957" y2="105.4549">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000032621984761622746590000016794674069364360327_);" points="425.11,112.42 393.13,126.74 
+			396.23,107.67 		"/>
+		
+			<linearGradient id="SVGID_00000108311198905665412900000004465620395145953712_" gradientUnits="userSpaceOnUse" x1="489.9962" y1="255.3554" x2="367.3289" y2="89.9818">
+			<stop  offset="0" style="stop-color:#9A0000"/>
+			<stop  offset="0.4774" style="stop-color:#E50029"/>
+			<stop  offset="0.5423" style="stop-color:#E81B22"/>
+			<stop  offset="0.7009" style="stop-color:#ED5814"/>
+			<stop  offset="0.8356" style="stop-color:#F18509"/>
+			<stop  offset="0.9395" style="stop-color:#F4A102"/>
+			<stop  offset="1" style="stop-color:#F5AB00"/>
+		</linearGradient>
+		<polygon style="fill:url(#SVGID_00000108311198905665412900000004465620395145953712_);" points="418.96,169.82 393.13,126.74 
+			409.85,137.06 		"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000132778855163012709780000008730862617147263632_" gradientUnits="userSpaceOnUse" x1="359.893" y1="149.3366" x2="187.978" y2="282.8451">
+		<stop  offset="0" style="stop-color:#9A0000"/>
+		<stop  offset="0.4774" style="stop-color:#E50029"/>
+		<stop  offset="0.5423" style="stop-color:#E81B22"/>
+		<stop  offset="0.7009" style="stop-color:#ED5814"/>
+		<stop  offset="0.8356" style="stop-color:#F18509"/>
+		<stop  offset="0.9395" style="stop-color:#F4A102"/>
+		<stop  offset="1" style="stop-color:#F5AB00"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000132778855163012709780000008730862617147263632_);" d="M255.95,290.19
+		c0.99-0.92,1.96-1.79,3-2.64c-0.05,0.07-0.19,0.27-0.44,0.51c-0.41,0.51-1.16,1.36-2.18,2.42c-0.39,0.41-0.82,0.87-1.31,1.38
+		c-6.57,6.61-20.64,18.49-35.98,17.32l-0.24-0.02l-0.1-0.02c0,0-0.02,0-0.05,0c-0.07,0-0.24,0-0.46-0.02
+		c-3.34-0.15-22.1-2.3-23.77-30.46c0.46-10.59-0.62-39.6,36.32-83.25c32.04-37.86,68.28-60.56,99.08-75.7l25.59,23.87l1.07,35.79
+		c-55.44,12.28-124.59,33.92-135.28,92.85C216.48,298.24,242.58,302.62,255.95,290.19z"/>
+	
+		<linearGradient id="SVGID_00000124861145368272951150000002031596967736413349_" gradientUnits="userSpaceOnUse" x1="305.2405" y1="270.0725" x2="219.861" y2="336.3778">
+		<stop  offset="0" style="stop-color:#9A0000"/>
+		<stop  offset="0.7601" style="stop-color:#E62C2E"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000124861145368272951150000002031596967736413349_);" d="M342.77,318.4
+		c-6.71-2.04-13.64-3.05-20.55-3.05c-9.96,0-19.87,2.11-29.08,6.3c-2.74,1.24-5.43,2.67-8.02,4.26l-1.04,0.65l-7.75,4.8
+		c-26.73,16.57-58.06,6.2-72.81-16.31v-0.02c-0.51-0.75-0.99-1.53-1.45-2.33c-0.12-0.17-0.22-0.36-0.32-0.53
+		c-0.44-0.75-0.85-1.53-1.24-2.28c-4.85-9.4-6.54-20.21-6.08-31.23c1.67,28.16,20.43,30.31,23.77,30.46
+		c0.22,0.02,0.39,0.02,0.46,0.02c0.05,0.02,0.1,0.02,0.15,0.02l0.24,0.02c15.34,1.16,29.42-10.71,35.98-17.32
+		c0.48-0.51,0.92-0.97,1.31-1.38c1.02-1.07,1.77-1.91,2.18-2.42c0.24-0.24,0.39-0.44,0.44-0.51c0.02-0.02,0.02-0.02,0.02-0.02
+		c3.54-2.96,7.24-5.55,11.15-7.73C308.53,261.09,300.22,301,342.77,318.4z"/>
+</g>
+</svg>

utils/filter.js

@@ -128,24 +128,50 @@ Vue.filter('maskID', function(value) {
 
 // 判断如果是今天就返回今天,如果是明天就返回明天如果都不是就返回星期几
 Vue.filter('checkDate', function(date) {
-	 let today = new Date(); // 获取今天的日期
-	 date = new Date(date);
-	if (date.toDateString() === today.toDateString()) {
-	  return "今天";
-	} else if (date.getDate() === today.getDate() + 1) {
-	  return "明天";
+	let today = new Date(); // 获取今天的日期
+	date = new Date(date);
+	
+	if (date.getFullYear() === today.getFullYear() && 
+	   date.getMonth() === today.getMonth() && 
+	   date.getDate() === today.getDate()) {
+	 return "今天";
+	} else if (date.getFullYear() === today.getFullYear() && 
+	          date.getMonth() === today.getMonth() && 
+	          date.getDate() === today.getDate() + 1) {
+	 return "明天";
 	} else {
-	  let days = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
-	  // return days[date.getDay()];
-	  let diffDays = Math.floor((date.getTime() - today.getTime()) / (1000 * 3600 * 24));
-	  if (diffDays > 7) {
-		return date.toLocaleDateString();
-	  } else {
+	 let days = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+	 let diffDays = Math.floor((date.getTime() - today.getTime()) / (1000 * 3600 * 24));
+	 if (diffDays > 7) {
+		// return date.toLocaleDateString("zh-CN");
+		return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+	 } else {
 		return days[date.getDay()];
-	  }
+	 }
 	}
 });
 
+// 判断如果是今天就返回今天,如果是明天就返回明天如果都不是就返回星期几
+Vue.filter('checkWeekDate', function(date) {
+	let today = new Date(); // 获取今天的日期
+	date = new Date(date);
+	
+	if (date.getFullYear() === today.getFullYear() && 
+	   date.getMonth() === today.getMonth() && 
+	   date.getDate() === today.getDate()) {
+	 return "今天";
+	} else if (date.getFullYear() === today.getFullYear() && 
+	          date.getMonth() === today.getMonth() && 
+	          date.getDate() === today.getDate() + 1) {
+	 return "明天";
+	} else {
+	 let days = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+	 let diffDays = Math.floor((date.getTime() - today.getTime()) / (1000 * 3600 * 24));
+	 return days[date.getDay()];
+	}
+});
+
+