diff --git a/pages.json b/pages.json
index f763255..c1f1c30 100644
--- a/pages.json
+++ b/pages.json
@@ -807,6 +807,15 @@
                     }
                 }
             ]
+        },
+        {
+            "root": "pages/testPage",
+            "pages": [{
+                "path": "index",
+                "style": {
+                    "navigationBarTitleText": "测试页面"
+                }
+            }]
         }
     ],
     "globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2d9fc54..1a5170a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6208,6 +6208,7 @@ export default {
     },
     goToRobot() {
       this.$util.toNextRoute("navigateTo", `/pages/robot/index`);
+      // this.$util.toNextRoute("navigateTo", `/pages/testPage/index`);
     },
     handleShowTrafficDetail() {
       this.showMonthDetail = !this.showMonthDetail;
diff --git a/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index 2a15b14..5267b28 100644
--- a/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/pages/nationalPage/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -39,21 +39,22 @@ const fmoney = (s, n) => {
 	for (let i = 0; i < l.length; i++) {
 		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
 	}
-	if (n===0){
+	if (n === 0) {
 		return s
-	}else{
+	} else {
 		return fuhao + [...t].reverse().join("") + "." + r;
 	}
 }
 // 四舍五入不保留小数的 金额化数字方法
-const noDecimal = (s) =>{
+const noDecimal = (s) => {
 	let fuhao = ''; //如果数字小于零则值为-
 	if (s < 0) {
 		s = Math.abs(s);
 		fuhao = '-'
 	}
 	s = parseFloat((s + "").replace(/[^\d\.-]/g, "")) + ""
-	let  l = s.split(".")[0].split("").reverse(), r = s.split(".")[1];
+	let l = s.split(".")[0].split("").reverse(),
+		r = s.split(".")[1];
 	let t = ''
 	for (let i = 0; i < l.length; i++) {
 		t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
@@ -61,7 +62,7 @@ const noDecimal = (s) =>{
 	return fuhao + [...t].reverse().join("")
 }
 // 不四舍五入 保留两位小数的金额化方法
-const getMoney = (money)=>{
+const getMoney = (money) => {
 	if (!money || isNaN(money)) return "0.00";
 	let num = parseFloat(money + '') + '';
 	num = parseInt(money * 100 + '') / 100 + ''
@@ -85,7 +86,7 @@ const getMoney = (money)=>{
 	return num;
 }
 // 不四舍五入 不保留两位小数的金额化方法
-const getMoneyNoDecimal = (money)=>{
+const getMoneyNoDecimal = (money) => {
 	if (!money || isNaN(money)) return "0";
 	let num = parseFloat(money + '') + '';
 	num = parseInt(money * 100 + '') / 100 + ''
@@ -110,484 +111,519 @@ const getMoneyNoDecimal = (money)=>{
 }
 
 
-const handleRedText = (value)=>{
-	return <text>{{value}}</text>
+const handleRedText = (value) => {
+	return <text > {
+		{
+			value
+		}
+	} < /text>
 }
 
 //事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
-const formatDateTime = (timeStamp, returnType)=>{
-  var date = new Date();
-  date.setTime(timeStamp * 1000);
-  var y = date.getFullYear();
-  var m = date.getMonth() + 1;
-  m = m < 10 ? ('0' + m) : m;
-  var d = date.getDate();
-  d = d < 10 ? ('0' + d) : d;
-  var h = date.getHours();
-  h = h < 10 ? ('0' + h) : h;
-  var minute = date.getMinutes();
-  var second = date.getSeconds();
-  minute = minute < 10 ? ('0' + minute) : minute;
-  second = second < 10 ? ('0' + second) : second;
-  if(returnType == 'full'){return y + '-' + m + '-' + d + ' '+ h +':' + minute + ':' + second;}
-  if(returnType == 'y-m-d'){return y + '-' + m + '-' + d;}
-  if(returnType == 'h:m'){return  h +':' + minute;}
-  if(returnType == 'h:m:s'){return  h +':' + minute +':' + second;}
-  return [y, m, d, h, minute, second];
+const formatDateTime = (timeStamp, returnType) => {
+	var date = new Date();
+	date.setTime(timeStamp * 1000);
+	var y = date.getFullYear();
+	var m = date.getMonth() + 1;
+	m = m < 10 ? ('0' + m) : m;
+	var d = date.getDate();
+	d = d < 10 ? ('0' + d) : d;
+	var h = date.getHours();
+	h = h < 10 ? ('0' + h) : h;
+	var minute = date.getMinutes();
+	var second = date.getSeconds();
+	minute = minute < 10 ? ('0' + minute) : minute;
+	second = second < 10 ? ('0' + second) : second;
+	if (returnType == 'full') {
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	}
+	if (returnType == 'y-m-d') {
+		return y + '-' + m + '-' + d;
+	}
+	if (returnType == 'h:m') {
+		return h + ':' + minute;
+	}
+	if (returnType == 'h:m:s') {
+		return h + ':' + minute + ':' + second;
+	}
+	return [y, m, d, h, minute, second];
 }
 
 const cfu = {
-  //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
-	"type":["pie","ring","rose","word","funnel","map","arcbar","line","column","mount","bar","area","radar","gauge","candle","mix","tline","tarea","scatter","bubble","demotype"],
-	"range":["饼状图","圆环图","玫瑰图","词云图","漏斗图","地图","圆弧进度条","折线图","柱状图","山峰图","条状图","区域图","雷达图","仪表盘","K线图","混合图","时间轴折线","时间轴区域","散点图","气泡图","自定义类型"],
-  //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
-  //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
-	"categories":["line","column","mount","bar","area","radar","gauge","candle","mix","demotype"],
-  //instance为实例变量承载属性，不要删除
-  "instance":{},
-  //option为opts及eopts承载属性，不要删除
-  "option":{},
-  //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
-  "formatter":{
-    "yAxisDemo1":function(val, index, opts){return val+'元'},
-    "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
-    "xAxisDemo1":function(val, index, opts){return val+'年';},
-    "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},
-    "seriesDemo1":function(val, index, series, opts){return val+'元'},
-    "tooltipDemo1":function(item, category, index, opts){
-      if(index==0){
-      	return '随便用'+item.data+'年'
-      }else{
-      	return '其他我没改'+item.data+'天'
-      }
-    },
-    "pieDemo":function(val, index, series, opts){
-      if(index !== undefined){
-        return series[index].name+'：'+series[index].data+'元'
-      }
-    },
-	  "entryCarNumber2":function (item, category, index, opts){
-		  console.log('item',item)
-		  console.log('category',category)
-		  console.log('index',index)
-		  console.log('opts',opts)
+	//demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+	"type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "mount", "bar", "area", "radar", "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"],
+	"range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "山峰图", "条状图", "区域图", "雷达图", "仪表盘", "K线图", "混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"],
+	//增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+	//自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+	"categories": ["line", "column", "mount", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"],
+	//instance为实例变量承载属性，不要删除
+	"instance": {},
+	//option为opts及eopts承载属性，不要删除
+	"option": {},
+	//下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+	"formatter": {
+		"yAxisDemo1": function (val, index, opts) {
+			return val + '元'
+		},
+		"yAxisDemo2": function (val, index, opts) {
+			return val.toFixed(2)
+		},
+		"xAxisDemo1": function (val, index, opts) {
+			return val + '年';
+		},
+		"xAxisDemo2": function (val, index, opts) {
+			return formatDateTime(val, 'h:m')
+		},
+		"seriesDemo1": function (val, index, series, opts) {
+			return val + '元'
+		},
+		"tooltipDemo1": function (item, category, index, opts) {
+			if (index == 0) {
+				return '随便用' + item.data + '年'
+			} else {
+				return '其他我没改' + item.data + '天'
+			}
+		},
+		"pieDemo": function (val, index, series, opts) {
+			if (index !== undefined) {
+				return series[index].name + '：' + series[index].data + '元'
+			}
+		},
+		"entryCarNumber2": function (item, category, index, opts) {
+			console.log('item', item)
+			console.log('category', category)
+			console.log('index', index)
+			console.log('opts', opts)
 
-		  let type = opts.series[0].selectFestival
-		  console.log('type',type)
-		  if (type===0){
-			  // return item.name
-			  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-			  let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
-			  console.log('data',data)
-			  console.log('day',day)
+			let type = opts.series[0].selectFestival
+			console.log('type', type)
+			if (type === 0) {
+				// return item.name
+				let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+				let day = opts.series.filter(subItem => subItem.name === item.name)[0].howDayNumber
+				console.log('data', data)
+				console.log('day', day)
 
-			  if (item.name==='23年'){
-				  if (index<day){
-					  return item.name + "：" + getMoney(data / 10000,2) + '万元'
-				  }else{
-					  let indexList = "6,8,14,15,20,22,24,25,29,30"
-					  let dateList = opts.series.filter(subItem=> subItem.name === item.name)[0].tradDate
-					  let realDate
-					  if (index===6 ||index===8 ||index===14 ||index===15 ||index===20 ||index===22 ||index===24 ||index===25 ||index===29 ||index===30){
-						  realDate = dateList[index]
-					  }
-					  return item.name + "：" + getMoney(data / 10000,2) + '万元' + `，${realDate?realDate:''}`
-				  }
-			  }else{
-				  let indexList = "6,8,14,15,20,22,24,25,29,30"
-				  // let indexList = "8,9,15,16,21,23,25,26,30,31"
-				  let dateList = opts.series.filter(subItem=> subItem.name === item.name)[0].tradDate
-				  console.log('dateList',dateList)
-				  let realDate
-				  if (index===6 ||index===8 ||index===14 ||index===15 ||index===20 ||index===22 ||index===24 ||index===25 ||index===29 ||index===30){
-					  realDate = dateList[index]
-				  }
-				  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-				  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-				  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-				  if (index<day){
-					  return `${item.name}：${getMoney(data / 10000,2)}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}，${realDate?realDate:''}`
-				  }else{
-					  return ' '
-				  }
-			  }
-		  }else if(type===1){
-			  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-			  let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
-			  let festivalType = opts.series[0].selectFestival
-			  console.log('festivalType',festivalType)
-			  console.log('data',data)
-			  console.log('day',day)
-			  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-			  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-			  // 显示具体的日期
-			  let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
-			  // 显示具体的日期
-			  let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
+				if (item.name === '23年') {
+					if (index < day) {
+						return item.name + "：" + getMoney(data / 10000, 2) + '万元'
+					} else {
+						let indexList = "6,8,14,15,20,22,24,25,29,30"
+						let dateList = opts.series.filter(subItem => subItem.name === item.name)[0].tradDate
+						let realDate
+						if (index === 6 || index === 8 || index === 14 || index === 15 || index === 20 || index === 22 || index === 24 || index === 25 || index === 29 || index === 30) {
+							realDate = dateList[index]
+						}
+						return item.name + "：" + getMoney(data / 10000, 2) + '万元' + `，${realDate?realDate:''}`
+					}
+				} else {
+					let indexList = "6,8,14,15,20,22,24,25,29,30"
+					// let indexList = "8,9,15,16,21,23,25,26,30,31"
+					let dateList = opts.series.filter(subItem => subItem.name === item.name)[0].tradDate
+					console.log('dateList', dateList)
+					let realDate
+					if (index === 6 || index === 8 || index === 14 || index === 15 || index === 20 || index === 22 || index === 24 || index === 25 || index === 29 || index === 30) {
+						realDate = dateList[index]
+					}
+					let curData = opts.series.filter(subItem => subItem.name === '24年')[0].real[index]
+					let compareData = opts.series.filter(subItem => subItem.name === '23年')[0].real[index]
+					let add = Number(((curData / compareData) - 1) * 100).toFixed(2)
+					if (index < day) {
+						return `${item.name}：${getMoney(data / 10000,2)}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}，${realDate?realDate:''}`
+					} else {
+						return ' '
+					}
+				}
+			} else if (type === 1) {
+				let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+				let day = opts.series.filter(subItem => subItem.name === item.name)[0].howDayNumber
+				let festivalType = opts.series[0].selectFestival
+				console.log('festivalType', festivalType)
+				console.log('data', data)
+				console.log('day', day)
+				let curData = opts.series.filter(subItem => subItem.name === '24年')[0].real[index]
+				let compareData = opts.series.filter(subItem => subItem.name === '23年')[0].real[index]
+				// 显示具体的日期
+				let realDate = opts.series.filter(subItem => subItem.name === '23年')[0].realDateList[index]
+				// 显示具体的日期
+				let curDate = opts.series.filter(subItem => subItem.name === '24年')[0].realDateList[index]
 
-			  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-			  if (item.name==='24年'){
-				  if (data){
-					  return `${festivalType===2?curDate:item.name}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}`
-				  }else{
-					  return `${curDate}：`
-				  }
-			  }else{
-				  return `${festivalType===2?realDate:item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
-			  }
-		  } else if(type===2){
-			  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-			  let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
+				let add = Number(((curData / compareData) - 1) * 100).toFixed(2)
+				if (item.name === '24年') {
+					if (data) {
+						return `${festivalType===2?curDate:item.name}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':''}`
+					} else {
+						return `${curDate}：`
+					}
+				} else {
+					return `${festivalType===2?realDate:item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':''}`
+				}
+			} else if (type === 2) {
+				let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+				let day = opts.series.filter(subItem => subItem.name === item.name)[0].howDayNumber
 
-			  let festivalType = opts.series[0].selectFestival
-			  console.log('festivalType',festivalType)
-			  console.log('data',data)
-			  console.log('day',day)
-			  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-			  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-			  // 显示具体的日期
-			  let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
-			  // 显示具体的日期
-			  let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
+				let festivalType = opts.series[0].selectFestival
+				console.log('festivalType', festivalType)
+				console.log('data', data)
+				console.log('day', day)
+				let curData = opts.series.filter(subItem => subItem.name === '24年')[0].real[index]
+				let compareData = opts.series.filter(subItem => subItem.name === '23年')[0].real[index]
+				// 显示具体的日期
+				let realDate = opts.series.filter(subItem => subItem.name === '23年')[0].realDateList[index]
+				// 显示具体的日期
+				let curDate = opts.series.filter(subItem => subItem.name === '24年')[0].realDateList[index]
 
-			  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-			  if (item.name==='24年'){
-				  if (data){
-					  return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(劳动节)':''}`
-				  }else{
-					  return `${curDate}：`
-				  }
-			  }else{
-				  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(劳动节)':''}`
-			  }
-		  }else if(type===3){
-			  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-			  let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
+				let add = Number(((curData / compareData) - 1) * 100).toFixed(2)
+				if (item.name === '24年') {
+					if (data) {
+						return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(劳动节)':''}`
+					} else {
+						return `${curDate}：`
+					}
+				} else {
+					return `${realDate}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(劳动节)':''}`
+				}
+			} else if (type === 3) {
+				let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+				let day = opts.series.filter(subItem => subItem.name === item.name)[0].howDayNumber
 
-			  let festivalType = opts.series[0].selectFestival
-			  console.log('festivalType',festivalType)
-			  console.log('data',data)
-			  console.log('day',day)
-			  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-			  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-			  // 显示具体的日期
-			  let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
-			  // 显示具体的日期
-			  let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
+				let festivalType = opts.series[0].selectFestival
+				console.log('festivalType', festivalType)
+				console.log('data', data)
+				console.log('day', day)
+				let curData = opts.series.filter(subItem => subItem.name === '24年')[0].real[index]
+				let compareData = opts.series.filter(subItem => subItem.name === '23年')[0].real[index]
+				// 显示具体的日期
+				let realDate = opts.series.filter(subItem => subItem.name === '23年')[0].realDateList[index]
+				// 显示具体的日期
+				let curDate = opts.series.filter(subItem => subItem.name === '24年')[0].realDateList[index]
 
-			  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-			  if (item.name==='24年'){
-				  if (data){
-					  return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${index===3?'(端午节)':''}`
-				  }else{
-					  return `${curDate}：`
-				  }
-			  }else{
-				  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${index===1?'(端午节)':''}`
-			  }
-		  }else{
-			  let festivalType = opts.series[0].selectFestival
-			  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-			  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-			  // 显示具体的日期
-			  let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
-			  // 显示具体的日期
-			  let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
-			  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-			  console.log('curDate',curDate)
-			  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-			  if(item.name==='24年'){
-				  if(data){
-					  return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${
+				let add = Number(((curData / compareData) - 1) * 100).toFixed(2)
+				if (item.name === '24年') {
+					if (data) {
+						return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${index===3?'(端午节)':''}`
+					} else {
+						return `${curDate}：`
+					}
+				} else {
+					return `${realDate}：${data?getMoney(data / 10000,2):''}万元${index===1?'(端午节)':''}`
+				}
+			} else {
+				let festivalType = opts.series[0].selectFestival
+				let curData = opts.series.filter(subItem => subItem.name === '24年')[0].real[index]
+				let compareData = opts.series.filter(subItem => subItem.name === '23年')[0].real[index]
+				// 显示具体的日期
+				let realDate = opts.series.filter(subItem => subItem.name === '23年')[0].realDateList[index]
+				// 显示具体的日期
+				let curDate = opts.series.filter(subItem => subItem.name === '24年')[0].realDateList[index]
+				let add = Number(((curData / compareData) - 1) * 100).toFixed(2)
+				console.log('curDate', curDate)
+				let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+				if (item.name === '24年') {
+					if (data) {
+						return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${
 						  festivalType===1 && index===1?'(清明节)':
 							  festivalType===2 && index===2?'(劳动节)':
 								  festivalType===3 && index===3?'(端午节)':
 									  festivalType===5 && index===3?'(中秋节)':
 										  festivalType===6 && index===1?'(国庆节)':
 											  ''}`
-				  }else{
-					  return `${curDate}：`
-				  }
-			  }else{
-				  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${
+					} else {
+						return `${curDate}：`
+					}
+				} else {
+					return `${realDate}：${data?getMoney(data / 10000,2):''}万元${
 					  festivalType===1 && index===1?'(清明节)':
 						  festivalType===2 && index===3?'(劳动节)':
 							  festivalType===3 && index===1?'(端午节)':
 								  festivalType===5 && index===1?'(中秋节)':
 									  festivalType===6 && index===3?'(国庆节)':
 										  ''}`
-			  }
-		  }
+				}
+			}
 
-	  },
-	  "entryCarNumber":function (item, category, index, opts){
-		  console.log('item',item)
-		  console.log('category',category)
-		  console.log('index',index)
-		  console.log('opts',opts)
-		  // return item.name
-		  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-		  let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
+		},
+		"entryCarNumber": function (item, category, index, opts) {
+			console.log('item', item);
+			console.log('category', category);
+			console.log('index', index);
+			console.log('opts', opts);
+			// 从opts里面 拿到这一行的详细数据
+			let detail = opts.series.filter(subItem => subItem.name === item.name)[0]
+			let add = ''
+			if (detail.linearIndex > 0) {
+				// 上一年 
+				let lastYearObj = opts.series[detail.linearIndex - 1]
+				console.log('lastYearObj', lastYearObj);
+				// 当前年
+				let currentYearObj = opts.series[detail.linearIndex]
+				add = (((currentYearObj.real[index] - lastYearObj.real[index]) / lastYearObj.real[index]) * 100).toFixed(2) + '%'
+			}
 
-		  let festivalType = opts.series[0].selectFestival
-		  console.log('festivalType',festivalType)
-		  console.log('data',data)
-		  console.log('day',day)
-		  let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
-		  let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
-		  // 显示具体的日期
-		  let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
-		  // 显示具体的日期
-		  let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
+			return `${detail.realDateList[index]}： ${detail.data[index].toFixed(2)}万元${add?detail.data[index]>0?'，'+add:'':''}`
 
-		  let add = Number(((curData/compareData)-1)*100).toFixed(2)
-		  if(item.name==='24年'){
-			  if(data){
-				  return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${
-					  festivalType===1 && index===1?'(清明节)':
-						  festivalType===2 && index===2?'(劳动节)':
-						  festivalType===3 && index===3?'(端午节)':
-						  festivalType===5 && index===3?'(中秋节)':
-							  festivalType===6 && index===1?'(国庆节)':
-							  ''}`
-			  }else{
-				  return `${curDate}：`
-			  }
-		  }else{
-			  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${
-				  festivalType===1 && index===1?'(清明节)':
-					  festivalType===2 && index===3?'(劳动节)':
-						  festivalType===3 && index===1?'(端午节)':
-							  festivalType===5 && index===1?'(中秋节)':
-								  festivalType===6 && index===3?'(国庆节)':
-									  ''}`
-		  }
+			// return item.name
+			//   let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
+			//   let day = opts.series.filter(subItem=> subItem.name === item.name)[0].howDayNumber
+
+			//   let festivalType = opts.series[0].selectFestival
+			//   console.log('festivalType',festivalType)
+			//   console.log('data',data)
+			//   console.log('day',day)
+			//   let curData = opts.series.filter(subItem=> subItem.name === '24年')[0].real[index]
+			//   let compareData = opts.series.filter(subItem=> subItem.name === '23年')[0].real[index]
+			//   // 显示具体的日期
+			//   let realDate = opts.series.filter(subItem=> subItem.name === '23年')[0].realDateList[index]
+			//   // 显示具体的日期
+			//   let curDate = opts.series.filter(subItem=> subItem.name === '24年')[0].realDateList[index]
+
+			//   let add = Number(((curData/compareData)-1)*100).toFixed(2)
+			//   if(item.name==='24年'){
+			// 	  if(data){
+			// 		  return `${curDate}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${
+			// 			  festivalType===1 && index===1?'(清明节)':
+			// 				  festivalType===2 && index===2?'(劳动节)':
+			// 				  festivalType===3 && index===3?'(端午节)':
+			// 				  festivalType===5 && index===3?'(中秋节)':
+			// 					  festivalType===6 && index===1?'(国庆节)':
+			// 					  ''}`
+			// 	  }else{
+			// 		  return `${curDate}：`
+			// 	  }
+			//   }else{
+			// 	  return `${realDate}：${data?getMoney(data / 10000,2):''}万元${
+			// 		  festivalType===1 && index===1?'(清明节)':
+			// 			  festivalType===2 && index===3?'(劳动节)':
+			// 				  festivalType===3 && index===1?'(端午节)':
+			// 					  festivalType===5 && index===1?'(中秋节)':
+			// 						  festivalType===6 && index===3?'(国庆节)':
+			// 							  ''}`
+			//   }
 
 
-		  // if (item.name==='24年'){
+			// if (item.name==='24年'){
 			//   if (data){
 			// 	  return `${festivalType===2 || festivalType===3?curDate:item.name}：${data?getMoney(data / 10000,2):''}万元${add>0?'，+':add<0?'，':''}${add?add+'%':''}${festivalType===1 && index===1?'(清明节)':festivalType===3 && index===3?'(端午节)':''}`
 			//   }else{
 			// 	  return `${curDate}：`
 			//   }
-		  // }else{
+			// }else{
 			//   return `${festivalType===2 || festivalType===3?realDate:item.name}：${data?getMoney(data / 10000,2):''}万元${festivalType===1 && index===1?'(清明节)':festivalType===3 && index===1?'(端午节)':''}`
-		  // }
+			// }
 
-	  },
-	  entryCarNumberXFormat:function (value,index,opts){
-		return value
-	  },
-	  monthTotal:function (item, category, index, opts){
-		  let text = ''
-		  let type = item.name.slice(5,10)
-		  let time = opts.series[0].info[index].year
-		  if (type === '车流量'){
-			  if (`${time}年车流量` === item.name){
-				  let showTime = opts.series[0].info[index].year.toString().slice(2,5)
-				  text = `${showTime}年入区 ${opts.series[0].info[index].allCarCount?fmoney(opts.series[0].info[index].allCarCount):''} 辆`
-			  }else{
-				  let showTime = opts.series[1].info[index].year.toString().slice(2,5)
-				  text = `${showTime}年入区 ${opts.series[1].info[index].allCarCount?fmoney(opts.series[1].info[index].allCarCount):''} 辆`
-			  }
-			  return text
-		  }else{
-			  if (`${time}年交易额` === item.name){
-				  let showTime = opts.series[2].year.toString().slice(2,5)
-				  console.log('showTime',showTime)
-				  text = `${showTime}年金额 ${opts.series[2].info[index].money?fmoney(opts.series[2].info[index].money):''} 元, 单车消费 ${opts.series[0].info[index].allCarCount?((opts.series[0].info[index].money) / opts.series[0].info[index].allCarCount).toFixed(2):''} 元`
-			  }else{
-				  let showTime = opts.series[3].year.toString().slice(2,5)
-				  text = `${showTime}年金额 ${opts.series[3].info[index].money?fmoney(opts.series[3].info[index].money):''} 元, 单车消费 ${opts.series[1].info[index].allCarCount?((opts.series[1].info[index].money) / opts.series[1].info[index].allCarCount).toFixed(2):''} 元`
-			  }
-			  return text
-		  }
-	  },
-	  homePlace:function (item, category, index, opts){
-		  console.log('item',item)
-		  console.log('opts',opts)
-		  if (item.name.split(' ')[0] === '其他'){
-			  let str = ''
-			  opts.homeData.forEach(item=>{
-				  if (item.name.split(' ')[0]!=='其他'){
-					  if (str===''){
-						  str = item.name.split(' ')[0]
-					  }else{
-						  str+=`,${item.name.split(' ')[0]}`
-					  }
-				  }
-			  })
-		  }
-		  return item.name + ":" + item.data + '辆';
-	  },
-	  carTypeTime:function (item, category, index, opts){
-		  if (this.num===0){
-			  this.num++
-			  return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
-		  }else{
-			  this.num=0
-			  return '平均停留' + ":" + item.data + '分钟';
-		  }
-	  },
-	  timeAnalysis:function (item, category, index, opts){
-		  return item.name + ":" + item.data + '分钟'
-	  },
-	  businessType:function (item, category, index, opts){
-		  return item.name;
-	  },
-	  "moneyCompare":function (item, category, index, opts){
-		  const date = new Date()
-		  let m = date.getMonth()
-		  console.log('item',item)
-		  console.log('category',category)
-		  console.log('index',index)
-		  console.log('opts',opts)
-		  if (index >m){
-			  if (opts.otherType===0){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + item.data + '万元'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + item.data + '万元'
-				  }else {
-					  return item.name + "：" + item.data + '万元'
-				  }
-			  }else if(opts.otherType === 1){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + noDecimal(item.data) + '笔'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + noDecimal(item.data) + '笔'
-				  }else {
-					  return item.name + "：" +noDecimal(item.data) + '笔'
-				  }
-			  }else if(opts.otherType === 2){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + item.data + '元'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + item.data + '元'
-				  }else {
-					  return item.name + "：" + item.data + '元'
-				  }
-			  }
+		},
+		entryCarNumberXFormat: function (value, index, opts) {
+			return value
+		},
+		monthTotal: function (item, category, index, opts) {
+			let text = ''
+			let type = item.name.slice(5, 10)
+			let time = opts.series[0].info[index].year
+			if (type === '车流量') {
+				if (`${time}年车流量` === item.name) {
+					let showTime = opts.series[0].info[index].year.toString().slice(2, 5)
+					text = `${showTime}年入区 ${opts.series[0].info[index].allCarCount?fmoney(opts.series[0].info[index].allCarCount):''} 辆`
+				} else {
+					let showTime = opts.series[1].info[index].year.toString().slice(2, 5)
+					text = `${showTime}年入区 ${opts.series[1].info[index].allCarCount?fmoney(opts.series[1].info[index].allCarCount):''} 辆`
+				}
+				return text
+			} else {
+				if (`${time}年交易额` === item.name) {
+					let showTime = opts.series[2].year.toString().slice(2, 5)
+					console.log('showTime', showTime)
+					text = `${showTime}年金额 ${opts.series[2].info[index].money?fmoney(opts.series[2].info[index].money):''} 元, 单车消费 ${opts.series[0].info[index].allCarCount?((opts.series[0].info[index].money) / opts.series[0].info[index].allCarCount).toFixed(2):''} 元`
+				} else {
+					let showTime = opts.series[3].year.toString().slice(2, 5)
+					text = `${showTime}年金额 ${opts.series[3].info[index].money?fmoney(opts.series[3].info[index].money):''} 元, 单车消费 ${opts.series[1].info[index].allCarCount?((opts.series[1].info[index].money) / opts.series[1].info[index].allCarCount).toFixed(2):''} 元`
+				}
+				return text
+			}
+		},
+		homePlace: function (item, category, index, opts) {
+			console.log('item', item)
+			console.log('opts', opts)
+			if (item.name.split(' ')[0] === '其他') {
+				let str = ''
+				opts.homeData.forEach(item => {
+					if (item.name.split(' ')[0] !== '其他') {
+						if (str === '') {
+							str = item.name.split(' ')[0]
+						} else {
+							str += `,${item.name.split(' ')[0]}`
+						}
+					}
+				})
+			}
+			return item.name + ":" + item.data + '辆';
+		},
+		carTypeTime: function (item, category, index, opts) {
+			if (this.num === 0) {
+				this.num++
+				return '日均车辆' + ":" + opts.series[0].valueList[index] + '辆,占比' + item.data + '%';
+			} else {
+				this.num = 0
+				return '平均停留' + ":" + item.data + '分钟';
+			}
+		},
+		timeAnalysis: function (item, category, index, opts) {
+			return item.name + ":" + item.data + '分钟'
+		},
+		businessType: function (item, category, index, opts) {
+			return item.name;
+		},
+		"moneyCompare": function (item, category, index, opts) {
+			const date = new Date()
+			let m = date.getMonth()
+			console.log('item', item)
+			console.log('category', category)
+			console.log('index', index)
+			console.log('opts', opts)
+			if (index > m) {
+				if (opts.otherType === 0) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + item.data + '万元'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + item.data + '万元'
+					} else {
+						return item.name + "：" + item.data + '万元'
+					}
+				} else if (opts.otherType === 1) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + noDecimal(item.data) + '笔'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + noDecimal(item.data) + '笔'
+					} else {
+						return item.name + "：" + noDecimal(item.data) + '笔'
+					}
+				} else if (opts.otherType === 2) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + item.data + '元'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + item.data + '元'
+					} else {
+						return item.name + "：" + item.data + '元'
+					}
+				}
 
-		  }else{
-			  if (opts.otherType===0){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + item.data + '万元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + item.data + '万元，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
-				  }else {
-					  // 判断有节假日就显示括号 没有就不显示
-					  if (opts.series[2].holiday[index][1]){
-						  return item.name + "：" + item.data + '万元' + '(' +  opts.series[2].holiday[index][1] + ')'
-					  }else{
-						  return item.name + "：" + item.data + '万元'
-					  }
-				  }
-			  }else if (opts.otherType === 1){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + noDecimal(item.data) + '笔，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + noDecimal(item.data) + '笔，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
-				  }else {
-					  if (opts.series[2].holiday[index][1]){
-						  return item.name + "：" + noDecimal(item.data) + '笔' + '(' +  opts.series[2].holiday[index][1] + ')'
-					  }else{
-						  return item.name + "：" + noDecimal(item.data) + '笔'
-					  }
-				  }
-			  }else if(opts.otherType === 2){
-				  if (item.name === '工作日平均'){
-					  return item.name + "：" + item.data + '元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
-				  }else if(item.name === '周末平均'){
-					  return item.name + "：" + item.data + '元，' + '较工作日：'+ opts.series[1].qoqAdd[index] + '%'
-				  }else {
-					  if (opts.series[2].holiday[index][1]){
-						  return item.name + "：" + item.data + '元' + '(' +  opts.series[2].holiday[index][1] + ')'
-					  }else{
-						  return item.name + "：" + item.data + '元'
-					  }
-				  }
-			  }
-		  }
-	  },
-	  consumptionCompare:function (item, category, index, opts){
-		  if (item.name === '客单数'){
-			  return item.name + ':'+ item.data + '笔'
-		  }else{
-			  return item.name + ':'+ item.data + '辆,交易概率: ' + ((opts.series[0].data[index] / opts.series[1].data[index])*100).toFixed(2) + '%'
-		  }
-	  },
-	  consumptionCompareFormat:function (val){
-		  if (val==='0:00' || val==='4:00'|| val==='8:00'|| val==='12:00'|| val==='16:00'|| val==='20:00'|| val==='23:00'){
-			  if (val === '23:00'){
-				  return '24:00'
-			  }else{
-				  return  val
-			  }
-		  }else{
-			  return ''
-		  }
-	  },
-	  timePeriodAnalysisFormat:function (val){
-		  if (val===0 || val===4 || val===8 || val===12 || val===16 || val===20 || val===23){
-			  if (val===23){
-				  return '24:00'
-			  }else{
-				  return `${val}:00`
-			  }
-		  }else{
-			  return ''
-		  }
-	  },
-	  timePeriodAnalysis:function (item, category, index, opts){
-		  return item.name + ':'+ item.data + '%,' +'数量:' + opts.series[0].number[index] + '笔,金额:' +opts.series[0].money[index] +'元'
-	  },
-	  levelTop:function (item, category, index, opts){
-		  return item.name + ' '+ item.data + '%';
-	  },
-	  businessFormat:function (item, category, index, opts){
-		  return item.name+',' + opts.series[index].text
-	  },
-	  fillingDegree:function (item, category, index, opts){
-		  return item.name;
-	  },
-	  yearRevenue:function (item, category, index, opts){
-		  let data = opts.series.filter(subItem=> subItem.name === item.name)[0].real[index]
-		  console.log('data',data)
-		  if (data){
-			  return item.name + "：" +  getMoneyNoDecimal(data)+ '辆';
-		  }else{
-			  return item.name + "：" + 0 + '辆';
-		  }
-	  }
-  },
-  //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
-  "demotype":{
-    //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
-    "type": "line",
-    "color": color,
-    "padding": [15,10,0,15],
-    "xAxis": {
-      "disableGrid": true,
-    },
-    "yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-    },
-    "legend": {
-    },
-    "extra": {
-    	"line": {
-    		"type": "curve",
-    		"width": 2
-    	},
-    }
-  },
-  //下面是自定义配置，请添加项目所需的通用配置
-	"pie":{
+			} else {
+				if (opts.otherType === 0) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + item.data + '万元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + item.data + '万元，' + '较工作日：' + opts.series[1].qoqAdd[index] + '%'
+					} else {
+						// 判断有节假日就显示括号 没有就不显示
+						if (opts.series[2].holiday[index][1]) {
+							return item.name + "：" + item.data + '万元' + '(' + opts.series[2].holiday[index][1] + ')'
+						} else {
+							return item.name + "：" + item.data + '万元'
+						}
+					}
+				} else if (opts.otherType === 1) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + noDecimal(item.data) + '笔，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + noDecimal(item.data) + '笔，' + '较工作日：' + opts.series[1].qoqAdd[index] + '%'
+					} else {
+						if (opts.series[2].holiday[index][1]) {
+							return item.name + "：" + noDecimal(item.data) + '笔' + '(' + opts.series[2].holiday[index][1] + ')'
+						} else {
+							return item.name + "：" + noDecimal(item.data) + '笔'
+						}
+					}
+				} else if (opts.otherType === 2) {
+					if (item.name === '工作日平均') {
+						return item.name + "：" + item.data + '元，' + '较上月：' + opts.series[0].qoqAdd[index] + '%'
+					} else if (item.name === '周末平均') {
+						return item.name + "：" + item.data + '元，' + '较工作日：' + opts.series[1].qoqAdd[index] + '%'
+					} else {
+						if (opts.series[2].holiday[index][1]) {
+							return item.name + "：" + item.data + '元' + '(' + opts.series[2].holiday[index][1] + ')'
+						} else {
+							return item.name + "：" + item.data + '元'
+						}
+					}
+				}
+			}
+		},
+		consumptionCompare: function (item, category, index, opts) {
+			if (item.name === '客单数') {
+				return item.name + ':' + item.data + '笔'
+			} else {
+				return item.name + ':' + item.data + '辆,交易概率: ' + ((opts.series[0].data[index] / opts.series[1].data[index]) * 100).toFixed(2) + '%'
+			}
+		},
+		consumptionCompareFormat: function (val) {
+			if (val === '0:00' || val === '4:00' || val === '8:00' || val === '12:00' || val === '16:00' || val === '20:00' || val === '23:00') {
+				if (val === '23:00') {
+					return '24:00'
+				} else {
+					return val
+				}
+			} else {
+				return ''
+			}
+		},
+		timePeriodAnalysisFormat: function (val) {
+			if (val === 0 || val === 4 || val === 8 || val === 12 || val === 16 || val === 20 || val === 23) {
+				if (val === 23) {
+					return '24:00'
+				} else {
+					return `${val}:00`
+				}
+			} else {
+				return ''
+			}
+		},
+		timePeriodAnalysis: function (item, category, index, opts) {
+			return item.name + ':' + item.data + '%,' + '数量:' + opts.series[0].number[index] + '笔,金额:' + opts.series[0].money[index] + '元'
+		},
+		levelTop: function (item, category, index, opts) {
+			return item.name + ' ' + item.data + '%';
+		},
+		businessFormat: function (item, category, index, opts) {
+			return item.name + ',' + opts.series[index].text
+		},
+		fillingDegree: function (item, category, index, opts) {
+			return item.name;
+		},
+		yearRevenue: function (item, category, index, opts) {
+			let data = opts.series.filter(subItem => subItem.name === item.name)[0].real[index]
+			console.log('data', data)
+			if (data) {
+				return item.name + "：" + getMoneyNoDecimal(data) + '辆';
+			} else {
+				return item.name + "：" + 0 + '辆';
+			}
+		}
+	},
+	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+	"demotype": {
+		//我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+		"type": "line",
+		"color": color,
+		"padding": [15, 10, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+		},
+		"legend": {},
+		"extra": {
+			"line": {
+				"type": "curve",
+				"width": 2
+			},
+		}
+	},
+	//下面是自定义配置，请添加项目所需的通用配置
+	"pie": {
 		"type": "pie",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [5, 5, 5, 5],
 		"extra": {
 			"pie": {
 				"activeOpacity": 0.5,
@@ -600,16 +636,16 @@ const cfu = {
 			},
 		}
 	},
-	"ring":{
+	"ring": {
 		"type": "ring",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [5, 5, 5, 5],
 		"rotate": false,
 		"dataLabel": true,
 		"legend": {
 			"show": true,
 			"position": "right",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"title": {
 			"name": "收益率",
@@ -623,7 +659,7 @@ const cfu = {
 		},
 		"extra": {
 			"ring": {
-				"ringWidth":30,
+				"ringWidth": 30,
 				"activeOpacity": 0.5,
 				"activeRadius": 10,
 				"offsetAngle": 0,
@@ -634,14 +670,14 @@ const cfu = {
 			},
 		},
 	},
-	"rose":{
+	"rose": {
 		"type": "rose",
-    "color": color,
-		"padding": [5,5,5,5],
+		"color": color,
+		"padding": [5, 5, 5, 5],
 		"legend": {
 			"show": true,
 			"position": "left",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"extra": {
 			"rose": {
@@ -657,9 +693,9 @@ const cfu = {
 			},
 		}
 	},
-	"word":{
+	"word": {
 		"type": "word",
-    "color": color,
+		"color": color,
 		"extra": {
 			"word": {
 				"type": "normal",
@@ -667,10 +703,10 @@ const cfu = {
 			}
 		}
 	},
-	"funnel":{
+	"funnel": {
 		"type": "funnel",
-    "color": color,
-		"padding": [15,15,0,15],
+		"color": color,
+		"padding": [15, 15, 0, 15],
 		"extra": {
 			"funnel": {
 				"activeOpacity": 0.3,
@@ -683,11 +719,11 @@ const cfu = {
 			},
 		}
 	},
-	"map":{
+	"map": {
 		"type": "map",
-    "color": color,
-		"padding": [0,0,0,0],
-    "dataLabel": true,
+		"color": color,
+		"padding": [0, 0, 0, 0],
+		"dataLabel": true,
 		"extra": {
 			"map": {
 				"border": true,
@@ -700,9 +736,9 @@ const cfu = {
 			},
 		}
 	},
-	"arcbar":{
+	"arcbar": {
 		"type": "arcbar",
-    "color": color,
+		"color": color,
 		"title": {
 			"name": "百分比",
 			"fontSize": 25,
@@ -724,98 +760,92 @@ const cfu = {
 			}
 		}
 	},
-	"line":{
+	"line": {
 		"type": "line",
-    "color": color,
-		"padding": [15,10,0,15],
+		"color": color,
+		"padding": [15, 10, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-		},
-		"legend": {
+			"gridType": "dash",
+			"dashLength": 2,
 		},
+		"legend": {},
 		"extra": {
 			"line": {
 				"type": "straight",
 				"width": 2,
-        "activeType": "hollow"
+				"activeType": "hollow"
 			},
 		}
 	},
-  "tline":{
-  	"type": "line",
-    "color": color,
-  	"padding": [15,10,0,15],
-  	"xAxis": {
-      "disableGrid": false,
-      "boundaryGap":"justify",
-  	},
-  	"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-      "data":[
-        {
-          "min":0,
-          "max":80
-        }
-      ]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"line": {
-  			"type": "curve",
-  			"width": 2,
-        "activeType": "hollow"
-  		},
-  	}
-  },
-  "tarea":{
-  	"type": "area",
-    "color": color,
-  	"padding": [15,10,0,15],
-  	"xAxis": {
-      "disableGrid": true,
-      "boundaryGap":"justify",
-  	},
-  	"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
-      "data":[
-        {
-          "min":0,
-          "max":80
-        }
-      ]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"area": {
-  			"type": "curve",
-  			"opacity": 0.2,
-  			"addLine": true,
-  			"width": 2,
-  			"gradient": true,
-        "activeType": "hollow"
-  		},
-  	}
-  },
-	"column":{
-		"type": "column",
-    "color": color,
-		"padding": [15,15,0,5],
+	"tline": {
+		"type": "line",
+		"color": color,
+		"padding": [15, 10, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": false,
+			"boundaryGap": "justify",
 		},
 		"yAxis": {
-      "data":[{"min":0}]
+			"gridType": "dash",
+			"dashLength": 2,
+			"data": [{
+				"min": 0,
+				"max": 80
+			}]
 		},
-		"legend": {
+		"legend": {},
+		"extra": {
+			"line": {
+				"type": "curve",
+				"width": 2,
+				"activeType": "hollow"
+			},
+		}
+	},
+	"tarea": {
+		"type": "area",
+		"color": color,
+		"padding": [15, 10, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+			"boundaryGap": "justify",
 		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+			"data": [{
+				"min": 0,
+				"max": 80
+			}]
+		},
+		"legend": {},
+		"extra": {
+			"area": {
+				"type": "curve",
+				"opacity": 0.2,
+				"addLine": true,
+				"width": 2,
+				"gradient": true,
+				"activeType": "hollow"
+			},
+		}
+	},
+	"column": {
+		"type": "column",
+		"color": color,
+		"padding": [15, 15, 0, 5],
+		"xAxis": {
+			"disableGrid": true,
+		},
+		"yAxis": {
+			"data": [{
+				"min": 0
+			}]
+		},
+		"legend": {},
 		"extra": {
 			"column": {
 				"type": "group",
@@ -825,63 +855,61 @@ const cfu = {
 			},
 		}
 	},
-  "mount":{
-  	"type": "mount",
-    "color": color,
-  	"padding": [15,15,0,5],
-  	"xAxis": {
-      "disableGrid": true,
-  	},
-  	"yAxis": {
-      "data":[{"min":0}]
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"mount": {
-  			"type": "mount",
-  			"widthRatio": 1.5,
-  		},
-  	}
-  },
-  "bar":{
-  	"type": "bar",
-    "color": color,
-  	"padding": [15,30,0,5],
-  	"xAxis": {
-      "boundaryGap":"justify",
-      "disableGrid":false,
-      "min":0,
-      "axisLine":false
-  	},
-  	"yAxis": {
-  	},
-  	"legend": {
-  	},
-  	"extra": {
-  		"bar": {
-  			"type": "group",
-  			"width": 30,
-  			"meterBorde": 1,
-  			"meterFillColor": "#FFFFFF",
-  			"activeBgColor": "#000000",
-  			"activeBgOpacity": 0.08
-  		},
-  	}
-  },
-	"area":{
-		"type": "area",
+	"mount": {
+		"type": "mount",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 5],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
-      "gridType": "dash",
-      "dashLength": 2,
+			"data": [{
+				"min": 0
+			}]
 		},
-		"legend": {
+		"legend": {},
+		"extra": {
+			"mount": {
+				"type": "mount",
+				"widthRatio": 1.5,
+			},
+		}
+	},
+	"bar": {
+		"type": "bar",
+		"color": color,
+		"padding": [15, 30, 0, 5],
+		"xAxis": {
+			"boundaryGap": "justify",
+			"disableGrid": false,
+			"min": 0,
+			"axisLine": false
 		},
+		"yAxis": {},
+		"legend": {},
+		"extra": {
+			"bar": {
+				"type": "group",
+				"width": 30,
+				"meterBorde": 1,
+				"meterFillColor": "#FFFFFF",
+				"activeBgColor": "#000000",
+				"activeBgOpacity": 0.08
+			},
+		}
+	},
+	"area": {
+		"type": "area",
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"xAxis": {
+			"disableGrid": true,
+		},
+		"yAxis": {
+			"gridType": "dash",
+			"dashLength": 2,
+		},
+		"legend": {},
 		"extra": {
 			"area": {
 				"type": "straight",
@@ -889,19 +917,19 @@ const cfu = {
 				"addLine": true,
 				"width": 2,
 				"gradient": false,
-        "activeType": "hollow"
+				"activeType": "hollow"
 			},
 		}
 	},
-	"radar":{
+	"radar": {
 		"type": "radar",
 		"color": color,
-		"padding": [5,5,5,5],
-    "dataLabel": false,
+		"padding": [5, 5, 5, 5],
+		"dataLabel": false,
 		"legend": {
 			"show": true,
 			"position": "right",
-      "lineHeight": 25,
+			"lineHeight": 25,
 		},
 		"extra": {
 			"radar": {
@@ -914,7 +942,7 @@ const cfu = {
 			},
 		}
 	},
-	"gauge":{
+	"gauge": {
 		"type": "gauge",
 		"color": color,
 		"title": {
@@ -954,10 +982,10 @@ const cfu = {
 			}
 		}
 	},
-	"candle":{
+	"candle": {
 		"type": "candle",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 15],
 		"enableScroll": true,
 		"enableMarkLine": true,
 		"dataLabel": false,
@@ -973,10 +1001,8 @@ const cfu = {
 			"scrollColor": "#A6A6A6",
 			"scrollBackgroundColor": "#EFEBEF"
 		},
-		"yAxis": {
-		},
-		"legend": {
-		},
+		"yAxis": {},
+		"legend": {},
 		"extra": {
 			"candle": {
 				"color": {
@@ -987,16 +1013,15 @@ const cfu = {
 				},
 				"average": {
 					"show": true,
-					"name": ["MA5","MA10","MA30"],
-					"day": [5,10,20],
-					"color": ["#1890ff","#2fc25b","#facc14"]
+					"name": ["MA5", "MA10", "MA30"],
+					"day": [5, 10, 20],
+					"color": ["#1890ff", "#2fc25b", "#facc14"]
 				}
 			},
 			"markLine": {
 				"type": "dash",
 				"dashLength": 5,
-				"data": [
-					{
+				"data": [{
 						"value": 2150,
 						"lineColor": "#f04864",
 						"showLabel": true
@@ -1010,12 +1035,12 @@ const cfu = {
 			}
 		}
 	},
-	"mix":{
+	"mix": {
 		"type": "mix",
 		"color": color,
-		"padding": [15,15,0,15],
+		"padding": [15, 15, 0, 15],
 		"xAxis": {
-      "disableGrid": true,
+			"disableGrid": true,
 		},
 		"yAxis": {
 			"disabled": false,
@@ -1028,8 +1053,7 @@ const cfu = {
 			"showTitle": true,
 			"data": []
 		},
-		"legend": {
-		},
+		"legend": {},
 		"extra": {
 			"mix": {
 				"column": {
@@ -1038,58 +1062,55 @@ const cfu = {
 			},
 		}
 	},
-	"scatter":{
+	"scatter": {
 		"type": "scatter",
-		"color":color,
-		"padding":[15,15,0,15],
-    "dataLabel":false,
-    "xAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "splitNumber":5,
-      "boundaryGap":"justify",
-      "min":0
-    },
-    "yAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-    },
-    "legend": {
-    },
-    "extra": {
-    	"scatter": {
-    	},
-    }
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"dataLabel": false,
+		"xAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"splitNumber": 5,
+			"boundaryGap": "justify",
+			"min": 0
+		},
+		"yAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+		},
+		"legend": {},
+		"extra": {
+			"scatter": {},
+		}
 	},
-	"bubble":{
+	"bubble": {
 		"type": "bubble",
-		"color":color,
-		"padding":[15,15,0,15],
-    "xAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "splitNumber":5,
-      "boundaryGap":"justify",
-      "min":0,
-      "max":250
-    },
-    "yAxis": {
-      "disableGrid": false,
-      "gridType":"dash",
-      "data":[{
-        "min":0,
-        "max":150
-      }]
-    },
-    "legend": {
-    },
-    "extra": {
-    	"bubble": {
-        "border":2,
-        "opacity": 0.5,
-    	},
-    }
+		"color": color,
+		"padding": [15, 15, 0, 15],
+		"xAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"splitNumber": 5,
+			"boundaryGap": "justify",
+			"min": 0,
+			"max": 250
+		},
+		"yAxis": {
+			"disableGrid": false,
+			"gridType": "dash",
+			"data": [{
+				"min": 0,
+				"max": 150
+			}]
+		},
+		"legend": {},
+		"extra": {
+			"bubble": {
+				"border": 2,
+				"opacity": 0.5,
+			},
+		}
 	}
 }
 
-export default cfu;
+export default cfu;
\ No newline at end of file
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index 7a813ef..522ac80 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -1,291 +1,755 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top springTop':
-    selectFestival===1?'top qmTop':
-    selectFestival===2?'top labourTop':
-    selectFestival===3?'top dragonBoatTop':
-    selectFestival===4?'top summerHolidayTop':
-    selectFestival===5?'top midAutumnTop':
-    selectFestival===6?'top nationalDayTop':
-    ''">
-      <div :class="selectFestival===0?'header headerSpring':
-      selectFestival===1?'header headerQm':
-      selectFestival===2?'header headerLabour':
-      selectFestival===3?'header headerDragonBoat':
-      selectFestival===4?'header summerHolidayBoat':
-      selectFestival===5?'header midAutumnBoat':
-      selectFestival===6?'header nationalDayBoat':
-      '' " :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
-        <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
+    <div
+      :class="
+        selectFestival === 1 || selectFestival === 2
+          ? 'top springTop'
+          : selectFestival === 3
+          ? 'top qmTop'
+          : selectFestival === 4
+          ? 'top labourTop'
+          : selectFestival === 5
+          ? 'top dragonBoatTop'
+          : selectFestival === 6
+          ? 'top summerHolidayTop'
+          : selectFestival === 7
+          ? 'top midAutumnTop'
+          : selectFestival === 8
+          ? 'top nationalDayTop'
+          : ''
+      "
+    >
+      <div
+        :class="
+          selectFestival === 1 || selectFestival === 2
+            ? 'header headerSpring'
+            : selectFestival === 3
+            ? 'header headerQm'
+            : selectFestival === 4
+            ? 'header headerLabour'
+            : selectFestival === 5
+            ? 'header headerDragonBoat'
+            : selectFestival === 6
+            ? 'header summerHolidayBoat'
+            : selectFestival === 7
+            ? 'header midAutumnBoat'
+            : selectFestival === 8
+            ? 'header nationalDayBoat'
+            : ''
+        "
+        :style="{ height: menu.height + menu.top + 'px', top: 0 + 'px' }"
+      >
+        <image
+          :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }"
+          class="backArrow"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"
+          @click="handleBack"
+        />
       </div>
     </div>
 
     <div class="contentPage">
       <div class="revenueDetail">
-        <div :class="selectFestival===0?'revenueDetailTitleBox springTitleBox':
-        selectFestival===1?'revenueDetailTitleBox qmTitleBox':
-        selectFestival===2?'revenueDetailTitleBox labourTitleBox':
-        selectFestival===3?'revenueDetailTitleBox dragonBoatTitleBox':
-        selectFestival===4?'revenueDetailTitleBox summerHolidayTitleBox':
-        selectFestival===5?'revenueDetailTitleBox midAutumnTitleBox':
-        selectFestival===6?'revenueDetailTitleBox nationalDayTitleBox':
-        ''">
+        <div
+          :class="
+            selectFestival === 1 || selectFestival === 2
+              ? 'revenueDetailTitleBox springTitleBox'
+              : selectFestival === 3
+              ? 'revenueDetailTitleBox qmTitleBox'
+              : selectFestival === 4
+              ? 'revenueDetailTitleBox labourTitleBox'
+              : selectFestival === 5
+              ? 'revenueDetailTitleBox dragonBoatTitleBox'
+              : selectFestival === 6
+              ? 'revenueDetailTitleBox summerHolidayTitleBox'
+              : selectFestival === 7
+              ? 'revenueDetailTitleBox midAutumnTitleBox'
+              : selectFestival === 8
+              ? 'revenueDetailTitleBox nationalDayTitleBox'
+              : ''
+          "
+        >
           <div class="left">
-            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':
-            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':
-            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
-            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetail.png':
-            selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetail.png':
-            selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetail.png':
-            selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDetail.png':
-            ''"/>
+            <img
+              class="detailLogo"
+              :src="
+                selectFestival === 1 || selectFestival === 2
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png'
+                  : selectFestival === 3
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png'
+                  : selectFestival === 4
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png'
+                  : selectFestival === 5
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetail.png'
+                  : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetail.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetail.png'
+                  : selectFestival === 8
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDetail.png'
+                  : ''
+              "
+            />
             <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
-            <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>
+            <text class="modalUnit">{{ `/统计到${allDateDay || ""}` }}</text>
           </div>
           <div class="right">
             <div class="typeChangeBox">
-              <div :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">按天统计</div>
-              <div :class="pageType===2?'normal select':'normal'" @click="handleChangeType(2)">累计统计</div>
+              <div
+                :class="pageType === 1 ? 'normal select' : 'normal'"
+                @click="handleChangeType(1)"
+              >
+                按天统计
+              </div>
+              <div
+                :class="pageType === 2 ? 'normal select' : 'normal'"
+                @click="handleChangeType(2)"
+              >
+                累计统计
+              </div>
             </div>
           </div>
-
         </div>
         <div class="revenueContent">
-          <div class="navBigList" v-if="pageType===1">
-<!--            <div class="allBox">-->
-<!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
-<!--            </div>-->
-            <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':
-            selectFestival===1?'navList qmNav':
-            selectFestival===2?'navList labourNav':
-            selectFestival===3?'navList dragonBoatNav':
-            selectFestival===4?'navList summerHolidayNav':
-            selectFestival===5?'navList midAutumnNav':
-            selectFestival===6?'navList nationalDayNav':
-            ''" :scrollIntoView="currentScroll" :scroll-with-animation="true">
-              <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
+          <div class="navBigList" v-if="pageType === 1">
+            <!--            <div class="allBox">-->
+            <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
+            <!--            </div>-->
+            <scroll-view
+              scroll-x="true"
+              :class="
+                selectFestival === 1 || selectFestival === 2
+                  ? 'navList springNav'
+                  : selectFestival === 3
+                  ? 'navList qmNav'
+                  : selectFestival === 4
+                  ? 'navList labourNav'
+                  : selectFestival === 5
+                  ? 'navList dragonBoatNav'
+                  : selectFestival === 6
+                  ? 'navList summerHolidayNav'
+                  : selectFestival === 7
+                  ? 'navList midAutumnNav'
+                  : selectFestival === 8
+                  ? 'navList nationalDayNav'
+                  : ''
+              "
+              :scrollIntoView="currentScroll"
+              :scroll-with-animation="true"
+            >
+              <div
+                :class="
+                  currentScroll === 'item' + item.value
+                    ? 'scrollItem selectItem'
+                    : 'scrollItem'
+                "
+                v-for="(item, index) in scrollList"
+                :key="index"
+                :id="'item' + item.value"
+                @click="handleChangeTime(item.value)"
+              >
+                {{ item.label }}
+              </div>
             </scroll-view>
           </div>
           <!--            <span class="dateText">{{selectDateText || ''}}</span>-->
           <div class="modalBox">
             <div class="modalTitleBox">
-              <div class="modalTitleItem" :style="{width: 'calc(100% - 390rpx)',textAlign:'left'}">
-                <div class="modalIndex" :style="{background: selectFestival===0?'#DB6465':
-                selectFestival===1?'#3B9285':
-                selectFestival===2?'#D14702':
-                selectFestival===3?'#3E8958':
-                selectFestival===4?'#007797':
-                selectFestival===5?'#3E8958':
-                selectFestival===6?'#3E8958':
-                ''}"></div>
-                <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
-                <text class="modalUnit">{{type===3?'/万辆':'/万元'}}</text>
+              <div
+                class="modalTitleItem"
+                :style="{ width: 'calc(100% - 390rpx)', textAlign: 'left' }"
+              >
+                <div
+                  class="modalIndex"
+                  :style="{
+                    background:
+                      selectFestival === 1 || selectFestival === 2
+                        ? '#DB6465'
+                        : selectFestival === 3
+                        ? '#3B9285'
+                        : selectFestival === 4
+                        ? '#D14702'
+                        : selectFestival === 5
+                        ? '#3E8958'
+                        : selectFestival === 6
+                        ? '#007797'
+                        : selectFestival === 7
+                        ? '#3E8958'
+                        : selectFestival === 8
+                        ? '#3E8958'
+                        : '',
+                  }"
+                ></div>
+                <text class="modalText">{{
+                  type === 1
+                    ? "对客销售"
+                    : type === 2
+                    ? "营业收入"
+                    : type === 3
+                    ? "入区车流"
+                    : ""
+                }}</text>
+                <text class="modalUnit">{{
+                  type === 3 ? "/万辆" : "/万元"
+                }}</text>
               </div>
             </div>
 
             <view class="sortBox">
               <view class="sortItem" @click="handleChangeSortName(1)">
-                <text class="sortText">{{ `24年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>
+                <text class="sortText">{{
+                  `24年${
+                    type === 1
+                      ? "销售"
+                      : type === 2
+                      ? "营收"
+                      : type === 3
+                      ? "车流"
+                      : ""
+                  }`
+                }}</text>
                 <view class="sortIconBox">
-                  <image class="upIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-                  <image class="bottomIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image
+                    class="upIcon"
+                    :style="{
+                      transform:
+                        sortName === 1
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : ``,
+                    }"
+                    :src="
+                      sortType === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                        : sortName === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
+                  <image
+                    class="bottomIcon"
+                    :style="{
+                      transform:
+                        sortName === 1
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : 'rotate(-180deg)',
+                    }"
+                    :src="
+                      sortType === 1 && sortName === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
                 </view>
               </view>
 
               <view class="sortItem" @click="handleChangeSortName(2)">
-                <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>
+                <text class="sortText">{{
+                  `23年${
+                    type === 1
+                      ? "销售"
+                      : type === 2
+                      ? "营收"
+                      : type === 3
+                      ? "车流"
+                      : ""
+                  }`
+                }}</text>
                 <view class="sortIconBox">
-                  <image class="upIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-                  <image class="bottomIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image
+                    class="upIcon"
+                    :style="{
+                      transform:
+                        sortName === 2
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : ``,
+                    }"
+                    :src="
+                      sortType === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                        : sortName === 2
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
+                  <image
+                    class="bottomIcon"
+                    :style="{
+                      transform:
+                        sortName === 2
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : 'rotate(-180deg)',
+                    }"
+                    :src="
+                      sortType === 1 && sortName === 2
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
                 </view>
               </view>
 
               <view class="sortItem" @click="handleChangeSortName(3)">
-                <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增长` }}</text>
+                <text class="sortText">{{
+                  `${
+                    type === 1
+                      ? "销售"
+                      : type === 2
+                      ? "营收"
+                      : type === 3
+                      ? "车流"
+                      : ""
+                  }增长`
+                }}</text>
                 <view class="sortIconBox">
-                  <image class="upIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-                  <image class="bottomIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image
+                    class="upIcon"
+                    :style="{
+                      transform:
+                        sortName === 3
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : ``,
+                    }"
+                    :src="
+                      sortType === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                        : sortName === 3
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
+                  <image
+                    class="bottomIcon"
+                    :style="{
+                      transform:
+                        sortName === 3
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : 'rotate(-180deg)',
+                    }"
+                    :src="
+                      sortType === 1 && sortName === 3
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
                 </view>
               </view>
 
               <view class="sortItem" @click="handleChangeSortName(4)">
-                <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增幅` }}</text>
+                <text class="sortText">{{
+                  `${
+                    type === 1
+                      ? "销售"
+                      : type === 2
+                      ? "营收"
+                      : type === 3
+                      ? "车流"
+                      : ""
+                  }增幅`
+                }}</text>
                 <view class="sortIconBox">
-                  <image class="upIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-                  <image class="bottomIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+                  <image
+                    class="upIcon"
+                    :style="{
+                      transform:
+                        sortName === 4
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : ``,
+                    }"
+                    :src="
+                      sortType === 1
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                        : sortName === 4
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
+                  <image
+                    class="bottomIcon"
+                    :style="{
+                      transform:
+                        sortName === 4
+                          ? sortType === 1
+                            ? ``
+                            : `rotate(180deg)`
+                          : 'rotate(-180deg)',
+                    }"
+                    :src="
+                      sortType === 1 && sortName === 4
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                        : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    "
+                  />
                 </view>
               </view>
             </view>
 
-
             <div class="modalDetail">
-<!--              <div class="modalDetailTitle">-->
-<!--                <div class="titleItem"  :style="{width: 'calc(100% - 440rpx)',textAlign:'left'}">服务区</div>-->
-<!--                <div class="titleItem"  style="width: 110rpx">2024年</div>-->
-<!--                <div class="titleItem"  style="width: 110rpx">2023年</div>-->
-<!--                <div class="titleItem"  style="width: 110rpx">增长</div>-->
-<!--                <div class="titleItem"  style="width: 110rpx">增幅</div>-->
-<!--              </div>-->
-              <scroll-view :scroll-y="true"  class="typeFirst" >
-                <div class="listItem" v-for="(item,index) in dataList" :key="index">
-                  <div class="itemLeft" >
-                    <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"/>
+              <!--              <div class="modalDetailTitle">-->
+              <!--                <div class="titleItem"  :style="{width: 'calc(100% - 440rpx)',textAlign:'left'}">服务区</div>-->
+              <!--                <div class="titleItem"  style="width: 110rpx">2024年</div>-->
+              <!--                <div class="titleItem"  style="width: 110rpx">2023年</div>-->
+              <!--                <div class="titleItem"  style="width: 110rpx">增长</div>-->
+              <!--                <div class="titleItem"  style="width: 110rpx">增幅</div>-->
+              <!--              </div>-->
+              <scroll-view :scroll-y="true" class="typeFirst">
+                <div
+                  class="listItem"
+                  v-for="(item, index) in dataList"
+                  :key="index"
+                >
+                  <div class="itemLeft">
+                    <image
+                      class="bg"
+                      src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"
+                    />
                     <view class="nameBox">
-                      <text class="serviceName">{{item.ServerpartName ? item.ServerpartName.split('服务区')[0]:''}}</text>
+                      <text class="serviceName">{{
+                        item.ServerpartName
+                          ? item.ServerpartName.split("服务区")[0]
+                          : ""
+                      }}</text>
                       <text class="serviceLabel">服务区</text>
                     </view>
                   </div>
                   <div class="contentRight">
                     <div class="rightTop">
                       <view class="rightTopLeft">
-                        <view class="indexBox" :style="{backgroundImage:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'})`}">{{index+1}}</view>
+                        <view
+                          class="indexBox"
+                          :style="{
+                            backgroundImage: `url(${
+                              index === 0
+                                ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg'
+                                : index === 1
+                                ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg'
+                                : index === 2
+                                ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg'
+                                : 'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'
+                            })`,
+                          }"
+                          >{{ index + 1 }}</view
+                        >
                       </view>
                       <view class="rightTopRight">
                         <text class="entryRateLabel">增幅</text>
                         <div class="entryRateValue">
-                          <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
-                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?item.AccountINC.increaseRate>0?'+':'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}
-                    </span>
-                          <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
-                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :
-                              type===2?item.AccountINC.increaseRate?item.AccountINC.increaseRate:'-' :
-                                  type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%
-                    </span>
+                          <span
+                            :style="{
+                              color:
+                                type === 1
+                                  ? item.RevenueINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : type === 2
+                                  ? item.AccountINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : type === 3
+                                  ? item.BayonetINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : '-',
+                            }"
+                          >
+                            {{
+                              type === 1
+                                ? item.RevenueINC.increaseRate > 0
+                                  ? "+"
+                                  : ""
+                                : type === 2
+                                ? item.AccountINC.increaseRate > 0
+                                  ? "+"
+                                  : ""
+                                : type === 3
+                                ? item.BayonetINC.increaseRate > 0
+                                  ? "+"
+                                  : ""
+                                : "-"
+                            }}
+                          </span>
+                          <span
+                            :style="{
+                              color:
+                                type === 1
+                                  ? item.RevenueINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : type === 2
+                                  ? item.AccountINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : type === 3
+                                  ? item.BayonetINC.increaseRate > 0
+                                    ? '#E83944'
+                                    : '#0E9976'
+                                  : '-',
+                            }"
+                          >
+                            {{
+                              type === 1
+                                ? item.RevenueINC.increaseRate
+                                  ? item.RevenueINC.increaseRate
+                                  : "-"
+                                : type === 2
+                                ? item.AccountINC.increaseRate
+                                  ? item.AccountINC.increaseRate
+                                  : "-"
+                                : type === 3
+                                ? item.BayonetINC.increaseRate
+                                  ? item.BayonetINC.increaseRate
+                                  : "-"
+                                : "-"
+                            }}%
+                          </span>
                         </div>
                       </view>
                     </div>
                     <div class="rightBottom">
                       <view class="rightBottomItem">
-                        <text class="itemLabel">{{curYear}}</text>
+                        <text class="itemLabel">{{ curYear }}</text>
                         <text class="itemValue">
-                          {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':
-                            type===2?item.AccountINC.curYearData?$util.getMoney(item.AccountINC.curYearData / 10000):'0.00':
-                                type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}
+                          {{
+                            type === 1
+                              ? item.RevenueINC.curYearData
+                                ? $util.getMoney(
+                                    item.RevenueINC.curYearData / 10000
+                                  )
+                                : "0.00"
+                              : type === 2
+                              ? item.AccountINC.curYearData
+                                ? $util.getMoney(
+                                    item.AccountINC.curYearData / 10000
+                                  )
+                                : "0.00"
+                              : type === 3
+                              ? item.BayonetINC.curYearData
+                                ? $util.getMoney(
+                                    item.BayonetINC.curYearData / 10000
+                                  )
+                                : "0.00"
+                              : "-"
+                          }}
                         </text>
                       </view>
                       <view class="rightBottomItem">
                         <text class="itemLabel">{{ compareYear }}</text>
                         <text class="itemValue">
-                          {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':
-                            type===2?item.AccountINC.lYearData?$util.getMoney(item.AccountINC.lYearData / 10000):'0.00':
-                                type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}
+                          {{
+                            type === 1
+                              ? item.RevenueINC.lYearData
+                                ? $util.getMoney(
+                                    item.RevenueINC.lYearData / 10000
+                                  )
+                                : "0.00"
+                              : type === 2
+                              ? item.AccountINC.lYearData
+                                ? $util.getMoney(
+                                    item.AccountINC.lYearData / 10000
+                                  )
+                                : "0.00"
+                              : type === 3
+                              ? item.BayonetINC.lYearData
+                                ? $util.getMoney(
+                                    item.BayonetINC.lYearData / 10000
+                                  )
+                                : "0.00"
+                              : "-"
+                          }}
                         </text>
                       </view>
                       <view class="rightBottomItem">
                         <text class="itemLabel">增长</text>
                         <text class="itemValue">
-                          {{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':
-                            type===2?item.AccountINC.increaseData?$util.getMoney(item.AccountINC.increaseData / 10000):'0.00':
-                                type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}
+                          {{
+                            type === 1
+                              ? item.RevenueINC.increaseData
+                                ? $util.getMoney(
+                                    item.RevenueINC.increaseData / 10000
+                                  )
+                                : "0.00"
+                              : type === 2
+                              ? item.AccountINC.increaseData
+                                ? $util.getMoney(
+                                    item.AccountINC.increaseData / 10000
+                                  )
+                                : "0.00"
+                              : type === 3
+                              ? item.BayonetINC.increaseData
+                                ? $util.getMoney(
+                                    item.BayonetINC.increaseData / 10000
+                                  )
+                                : "0.00"
+                              : "-"
+                          }}
                         </text>
                       </view>
                     </div>
 
-                    <div class="otherCarBox" v-if="type!==3">
+                    <div class="otherCarBox" v-if="type !== 3">
                       <div class="left">
                         <span class="carLabel">车流增幅</span>
-                        <span :style="{color: item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'#E83944':item.BayonetINC.increaseRate<0?'#0E9976':''}">
-                      {{item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'+':''}}
-                    </span>
-                        <span :style="{color: item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'#E83944':item.BayonetINC.increaseRate<0?'#0E9976':''}">
-                      {{item.BayonetINC.increaseRate?item.BayonetINC.increaseRate>1000?'-':item.BayonetINC.increaseRate:'-'}}%
-                    </span>
+                        <span
+                          :style="{
+                            color:
+                              item.BayonetINC.increaseRate > 1000
+                                ? ''
+                                : item.BayonetINC.increaseRate > 0
+                                ? '#E83944'
+                                : item.BayonetINC.increaseRate < 0
+                                ? '#0E9976'
+                                : '',
+                          }"
+                        >
+                          {{
+                            item.BayonetINC.increaseRate > 1000
+                              ? ""
+                              : item.BayonetINC.increaseRate > 0
+                              ? "+"
+                              : ""
+                          }}
+                        </span>
+                        <span
+                          :style="{
+                            color:
+                              item.BayonetINC.increaseRate > 1000
+                                ? ''
+                                : item.BayonetINC.increaseRate > 0
+                                ? '#E83944'
+                                : item.BayonetINC.increaseRate < 0
+                                ? '#0E9976'
+                                : '',
+                          }"
+                        >
+                          {{
+                            item.BayonetINC.increaseRate
+                              ? item.BayonetINC.increaseRate > 1000
+                                ? "-"
+                                : item.BayonetINC.increaseRate
+                              : "-"
+                          }}%
+                        </span>
                       </div>
-                      <div class="MoreBox" @click="handleGoServerPartDetail(item)">
-                        <img class="goMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+                      <div
+                        class="MoreBox"
+                        @click="handleGoServerPartDetail(item)"
+                      >
+                        <img
+                          class="goMoreIcon"
+                          src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"
+                        />
                       </div>
                     </div>
                   </div>
                 </div>
-<!--                <div class="row" v-for="(item,index) in dataList" :key="index">-->
-<!--                  <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">{{item.ServerpartName.split('服务区')[0]}}</div>-->
-<!--                  <div class="compareItem" style="width: 110rpx">-->
-<!--                    {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':-->
-<!--                      type===2?'':-->
-<!--                      type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}-->
-<!--                  </div>-->
-<!--                  <div class="compareItem" style="width: 110rpx">-->
-<!--                    {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':-->
-<!--                      type===2?'':-->
-<!--                      type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}-->
-<!--                  </div>-->
-<!--                  <div class="compareItem" style="width: 110rpx">-->
-<!--                    <span>{{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':-->
-<!--                        type===2?'':-->
-<!--                        type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}</span>-->
-<!--                  </div>-->
-<!--                  <div class="addItem" style="width: 110rpx">-->
-<!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
-<!--                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}-->
-<!--                    </span>-->
-<!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
-<!--                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :-->
-<!--                        type===2?'':-->
-<!--                        type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%-->
-<!--                    </span>-->
-<!--                  </div>-->
-<!--                </div>-->
+                <!--                <div class="row" v-for="(item,index) in dataList" :key="index">-->
+                <!--                  <div class="valueItem bigFather" :style="{width: 'calc(100% - 430rpx)',textAlign:'left'}">{{item.ServerpartName.split('服务区')[0]}}</div>-->
+                <!--                  <div class="compareItem" style="width: 110rpx">-->
+                <!--                    {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':-->
+                <!--                      type===2?'':-->
+                <!--                      type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}-->
+                <!--                  </div>-->
+                <!--                  <div class="compareItem" style="width: 110rpx">-->
+                <!--                    {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':-->
+                <!--                      type===2?'':-->
+                <!--                      type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}-->
+                <!--                  </div>-->
+                <!--                  <div class="compareItem" style="width: 110rpx">-->
+                <!--                    <span>{{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':-->
+                <!--                        type===2?'':-->
+                <!--                        type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}</span>-->
+                <!--                  </div>-->
+                <!--                  <div class="addItem" style="width: 110rpx">-->
+                <!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
+                <!--                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}-->
+                <!--                    </span>-->
+                <!--                    <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?'': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">-->
+                <!--                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :-->
+                <!--                        type===2?'':-->
+                <!--                        type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%-->
+                <!--                    </span>-->
+                <!--                  </div>-->
+                <!--                </div>-->
               </scroll-view>
-
             </div>
           </div>
-
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-import request from '@/util/index.js'
+import request from "@/util/index.js";
 import moment from "moment";
 export default {
   name: "rankPage",
-  data(){
+  data() {
     return {
-      scrollList:[],
-      selectDateText:'',
-      currentScroll:'',
-      lastDay:'',
-      allDateDay:'',
-      dataList:[],
+      scrollList: [],
+      selectDateText: "",
+      currentScroll: "",
+      lastDay: "",
+      allDateDay: "",
+      dataList: [],
       type: 0,
-      useInfo:{},
-      curYear:'',
-      compareYear:'',
-      ServerpartIds:'',
-      sortType: 1,// 正序降序 0正序  1降序
-      sortName: 3,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
-      statusBarHeight:0,
-      menu:'',
-      pageType:1,// 选择的类型
-      serverPartList:[],// 服务区列表
-      selectFestival:0,// 选择的节日
-    }
+      useInfo: {},
+      curYear: "",
+      compareYear: "",
+      ServerpartIds: "",
+      sortType: 1, // 正序降序 0正序  1降序
+      sortName: 3, // 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
+      statusBarHeight: 0,
+      menu: "",
+      pageType: 1, // 选择的类型
+      serverPartList: [], // 服务区列表
+      selectFestival: 0, // 选择的节日
+    };
   },
-  onLoad(query){
-    console.log('query',query)
+  onLoad(query) {
+    console.log("query", query);
     //  获取手机参数对页面进行适配
-    let systemInfo = uni.getSystemInfoSync()
-    this.statusBarHeight = Number(systemInfo.statusBarHeight)
-    this.menu = uni.getMenuButtonBoundingClientRect()
+    let systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = Number(systemInfo.statusBarHeight);
+    this.menu = uni.getMenuButtonBoundingClientRect();
 
-    if (query.type){
-      this.type = Number(query.type)
+    if (query.type) {
+      this.type = Number(query.type);
     }
-    this.lastDay = uni.getStorageSync('lastDay')
+    if (query.festivalType) {
+      this.selectFestival = Number(query.festivalType);
+    }
+    if (query.time) {
+      this.currentScroll = "item" + query.time;
+    }
+    return;
+
+    this.lastDay = uni.getStorageSync("lastDay");
     // this.lastDay = '2024-04-03'
 
-    if (query.festivalType){
-      this.selectFestival = Number(query.festivalType)
+    if (query.festivalType) {
+      this.selectFestival = Number(query.festivalType);
     }
-    if (this.selectFestival===0){
-      if (query.time){
-        this.currentScroll = 'item'+ query.time
-      }else{
-        this.currentScroll = 'item'+ '2024-03-05'
+    if (this.selectFestival === 0) {
+      if (query.time) {
+        this.currentScroll = "item" + query.time;
+      } else {
+        this.currentScroll = "item" + "2024-03-05";
       }
-    }else{
-      this.currentScroll = 'item'+ this.lastDay
+    } else {
+      this.currentScroll = "item" + this.lastDay;
     }
     // else if (this.selectFestival===1){
     //   this.currentScroll = 'item'+ this.lastDay
@@ -295,107 +759,129 @@ export default {
     //   this.currentScroll = 'item'+ this.lastDay
     // }
 
-
-    this.ServerpartIds = query.ServerpartIds
+    this.ServerpartIds = query.ServerpartIds;
 
     // 获取用户信息
-    let userInfo = uni.getStorageSync('vuex')
-    userInfo = JSON.parse(userInfo)
-    this.useInfo = JSON.parse(JSON.stringify(userInfo))
+    let userInfo = uni.getStorageSync("vuex");
+    userInfo = JSON.parse(userInfo);
+    this.useInfo = JSON.parse(JSON.stringify(userInfo));
     // 拿到是春运开始的第几天
-    let dayNumber = 0
-    const lastDate = new Date(this.lastDay)
-    let y = lastDate.getFullYear()
-    this.curYear = y
-    this.compareYear = y - 1
-    let lastMonth =  lastDate.getMonth() + 1
-    let lastDays = lastDate.getDate()
-    this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日`
+    let dayNumber = 0;
+    const lastDate = new Date(this.lastDay);
+    let y = lastDate.getFullYear();
+    this.curYear = y;
+    this.compareYear = y - 1;
+    let lastMonth = lastDate.getMonth() + 1;
+    let lastDays = lastDate.getDate();
+    this.allDateDay = `${lastMonth < 10 ? "0" + lastMonth : lastMonth}月${
+      lastDays < 10 ? "0" + lastDays : lastDays
+    }日`;
     // 24年春运开始时间为 1.26
     // if (lastMonth === 1){
     //   dayNumber = lastDays - 26 + 1
     // }else{
     //   dayNumber = 6 + lastDays
     // }
-    if (this.selectFestival===0){
-      dayNumber = moment().diff("2024-01-26", "days")
-      this.howDayNumber = dayNumber<=40?dayNumber:40
-    }else if(this.selectFestival===1){
-      dayNumber = moment().diff("2024-04-03", "days")
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-04-07'
-        this.allDateDay = '2024-04-07'
+    if (this.selectFestival === 0) {
+      dayNumber = moment().diff("2024-01-26", "days");
+      this.howDayNumber = dayNumber <= 40 ? dayNumber : 40;
+    } else if (this.selectFestival === 1) {
+      dayNumber = moment().diff("2024-04-03", "days");
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-04-07";
+        this.allDateDay = "2024-04-07";
       }
-    }else if(this.selectFestival===2){
-      dayNumber = moment().diff("2024-04-30", "days")
-      if (dayNumber<=7){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 7
-        this.currentScroll = 'item'+ '2024-05-06'
-        this.lastDay = '2024-05-06'
-        this.allDateDay = '2024-05-06'
+    } else if (this.selectFestival === 2) {
+      dayNumber = moment().diff("2024-04-30", "days");
+      if (dayNumber <= 7) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 7;
+        this.currentScroll = "item" + "2024-05-06";
+        this.lastDay = "2024-05-06";
+        this.allDateDay = "2024-05-06";
       }
-    }else if(this.selectFestival===3){
-      dayNumber = moment().diff("2024-06-07", "days")
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-06-11'
-        this.allDateDay = '2024-06-11'
+    } else if (this.selectFestival === 3) {
+      dayNumber = moment().diff("2024-06-07", "days");
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-06-11";
+        this.allDateDay = "2024-06-11";
       }
-    }else if (this.selectFestival===4){
-      dayNumber = moment().diff("2024-07-01", "days")// 暑期
-      if (dayNumber<=62){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 62
-        this.currentScroll = 'item'+ '2024-08-31'
-        this.lastDay = '2024-08-31'
-        this.allDateDay = '2024-09-01'
+    } else if (this.selectFestival === 4) {
+      dayNumber = moment().diff("2024-07-01", "days"); // 暑期
+      if (dayNumber <= 62) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 62;
+        this.currentScroll = "item" + "2024-08-31";
+        this.lastDay = "2024-08-31";
+        this.allDateDay = "2024-09-01";
       }
-    }else if (this.selectFestival===5){
-      dayNumber = moment().diff("2024-09-14", "days")// 中秋
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-09-18'
-        this.lastDay = '2024-09-18'
-        this.allDateDay = '2024-09-18'
+    } else if (this.selectFestival === 5) {
+      dayNumber = moment().diff("2024-09-14", "days"); // 中秋
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-09-18";
+        this.lastDay = "2024-09-18";
+        this.allDateDay = "2024-09-18";
       }
-    }else if (this.selectFestival===6){
-      dayNumber = moment().diff("2024-09-30", "days")// 国庆
-      if (dayNumber<=9){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 9
-        this.currentScroll = 'item'+ '2024-10-08'
-        this.lastDay = '2024-10-08'
-        this.allDateDay = '2024-10-08'
+    } else if (this.selectFestival === 6) {
+      dayNumber = moment().diff("2024-09-30", "days"); // 国庆
+      if (dayNumber <= 9) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 9;
+        this.currentScroll = "item" + "2024-10-08";
+        this.lastDay = "2024-10-08";
+        this.allDateDay = "2024-10-08";
       }
     }
 
-    let dateList = []
-    for (let i = 1;i<=this.howDayNumber;i++){
-      if (this.selectFestival===0){
-        dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
-      }else if(this.selectFestival===1){
-        dateList.push({label:`第${i}天`,value:moment("2024-04-02").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===2){
-        dateList.push({label:`第${i}天`,value:moment("2024-04-29").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===3){
-        dateList.push({label:`第${i}天`,value:moment("2024-06-06").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===4){
-        dateList.push({label:`第${i}天`,value:moment("2024-06-30").add(i, 'days').format("YYYY-MM-DD")})// 端午
-      }else if (this.selectFestival===5){
-        dateList.push({label:`第${i}天`,value:moment("2024-09-13").add(i, 'days').format("YYYY-MM-DD")})// 中秋
-      }else if (this.selectFestival===6){
-        dateList.push({label:`第${i}天`,value:moment("2024-09-29").add(i, 'days').format("YYYY-MM-DD")})// 国庆
+    let dateList = [];
+    for (let i = 1; i <= this.howDayNumber; i++) {
+      if (this.selectFestival === 0) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-01-25").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 1) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-04-02").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 2) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-04-29").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 3) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-06-06").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 4) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-06-30").add(i, "days").format("YYYY-MM-DD"),
+        }); // 端午
+      } else if (this.selectFestival === 5) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-09-13").add(i, "days").format("YYYY-MM-DD"),
+        }); // 中秋
+      } else if (this.selectFestival === 6) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-09-29").add(i, "days").format("YYYY-MM-DD"),
+        }); // 国庆
       }
       // if (i<7){
       //   dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
@@ -403,201 +889,273 @@ export default {
       //   dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
       // }
     }
-    if(dateList && dateList.length>0){
-      this.scrollList = dateList
-      this.selectDateText = dateList[this.howDayNumber-1].value
+    if (dateList && dateList.length > 0) {
+      this.scrollList = dateList;
+      this.selectDateText = dateList[this.howDayNumber - 1].value;
     }
-    this.handleGetData()
+    this.handleGetData();
   },
-  methods:{
+  methods: {
     // 点击了累计还是选择了日期
-    handleChangeTime(date){
-      if (date==='all'){
-        this.currentScroll = 'all'
-        const time = new Date(this.lastDay)
-        let m = time.getMonth()+1
-        let d = time.getDate()
-        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
-      }else{
-        this.currentScroll = 'item'+ date
-        const time = new Date(date)
-        let m = time.getMonth()+1
-        let d = time.getDate()
-        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
+    handleChangeTime(date) {
+      if (date === "all") {
+        this.currentScroll = "all";
+        const time = new Date(this.lastDay);
+        let m = time.getMonth() + 1;
+        let d = time.getDate();
+        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
+      } else {
+        this.currentScroll = "item" + date;
+        const time = new Date(date);
+        let m = time.getMonth() + 1;
+        let d = time.getDate();
+        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
       }
 
-      this.handleGetData(date)
-
+      this.handleGetData(date);
     },
     // 获取排名信息
-    async handleGetData(date){
+    async handleGetData(date) {
       uni.showLoading({
-        title: '正在加载...'
-      })
-      let time = date?
-          date==='all'?this.lastDay:
-              this.currentScroll.split('item')[1]:
-          this.currentScroll.split('item')[1]
+        title: "正在加载...",
+      });
+      let time = date
+        ? date === "all"
+          ? this.lastDay
+          : this.currentScroll.split("item")[1]
+        : this.currentScroll.split("item")[1];
       const req = {
-        calcType:this.pageType,
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+        calcType: this.pageType,
+        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
         curYear: this.curYear,
         compareYear: this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:this.selectFestival===4?6:this.selectFestival===5?7:this.selectFestival===6?8:'',
-        StatisticsDate:time,
-        businessRegion:1,
-        SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
-      }
+        HolidayType:
+          this.selectFestival === 0
+            ? 2
+            : this.selectFestival === 1
+            ? 3
+            : this.selectFestival === 2
+            ? 4
+            : this.selectFestival === 3
+            ? 5
+            : this.selectFestival === 4
+            ? 6
+            : this.selectFestival === 5
+            ? 7
+            : this.selectFestival === 6
+            ? 8
+            : "",
+        StatisticsDate: time,
+        businessRegion: 1,
+        SortStr: `${
+          this.type === 1
+            ? "revenue"
+            : this.type === 2
+            ? "account"
+            : this.type === 3
+            ? "bayonet"
+            : ""
+        } ${this.sortType === 0 ? "asc" : "desc"}`,
+      };
       // this.dataList
-      const data = await request.$webGet('CommercialApi/Revenue/GetServerpartINCAnalysis',req)
-      console.log('data',data)
-      if (data.Result_Data){
-        this.dataList = this.handleGetSort(data.Result_Data.List)
-        let list = []
-        if (data.Result_Data.List && data.Result_Data.List.length>0){
-          data.Result_Data.List.forEach(item=>{
-            list.push({name:item.ServerpartName,value:item.ServerpartId})
-          })
+      const data = await request.$webGet(
+        "CommercialApi/Revenue/GetServerpartINCAnalysis",
+        req
+      );
+      console.log("data", data);
+      if (data.Result_Data) {
+        this.dataList = this.handleGetSort(data.Result_Data.List);
+        let list = [];
+        if (data.Result_Data.List && data.Result_Data.List.length > 0) {
+          data.Result_Data.List.forEach((item) => {
+            list.push({ name: item.ServerpartName, value: item.ServerpartId });
+          });
         }
-        this.serverPartList = list
+        this.serverPartList = list;
       }
-      uni.hideLoading()
+      uni.hideLoading();
     },
     // 修改排序字段
-    handleChangeSortName(value){
+    handleChangeSortName(value) {
       uni.showLoading({
-        title: '正在加载...'
-      })
-      if (value===this.sortName){
-        if (this.sortType===1){
-          this.sortType=0
-        }else{
-          this.sortType=1
+        title: "正在加载...",
+      });
+      if (value === this.sortName) {
+        if (this.sortType === 1) {
+          this.sortType = 0;
+        } else {
+          this.sortType = 1;
         }
-      }else{
-        this.sortName = value
-        this.sortType=1
+      } else {
+        this.sortName = value;
+        this.sortType = 1;
       }
-      let list = this.handleGetSort(this.dataList)
-      this.dataList = list
-      console.log('this.dataList',this.dataList)
-      this.$forceUpdate()
-      uni.hideLoading()
+      let list = this.handleGetSort(this.dataList);
+      this.dataList = list;
+      console.log("this.dataList", this.dataList);
+      this.$forceUpdate();
+      uni.hideLoading();
     },
     // 切换模块
-    handleChangeType(value){
-      this.pageType = value
-      if (value===2){
-        this.handleGetData('all')
-      }else{
-        this.handleGetData()
+    handleChangeType(value) {
+      this.pageType = value;
+      if (value === 2) {
+        this.handleGetData("all");
+      } else {
+        this.handleGetData();
       }
     },
-    handleBack(){
+    handleBack() {
       uni.navigateBack({
-        delta: 1
+        delta: 1,
       });
     },
     // 排序方法
-    handleGetSort(list){
+    handleGetSort(list) {
       var len = list.length;
 
       for (var i = 0; i < len - 1; i++) {
         for (var j = 0; j < len - 1 - i; j++) {
           // 判断按照那个排序
-          if (this.type===1){
+          if (this.type === 1) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年营收
-              if (this.sortName===1){
-                if (list[j].RevenueINC.curYearData > list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].RevenueINC.curYearData >
+                  list[j + 1].RevenueINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].RevenueINC.lYearData > list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].RevenueINC.lYearData >
+                  list[j + 1].RevenueINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].RevenueINC.increaseData > list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].RevenueINC.increaseData >
+                  list[j + 1].RevenueINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].RevenueINC.increaseRate  > list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].RevenueINC.increaseRate >
+                  list[j + 1].RevenueINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
-            }
-            else{
+            } else {
               // 降序
               // 24年营收
-              if (this.sortName===1){
-                if (list[j].RevenueINC.curYearData < list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].RevenueINC.curYearData <
+                  list[j + 1].RevenueINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].RevenueINC.lYearData < list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].RevenueINC.lYearData <
+                  list[j + 1].RevenueINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].RevenueINC.increaseData < list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].RevenueINC.increaseData <
+                  list[j + 1].RevenueINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].RevenueINC.increaseRate  < list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].RevenueINC.increaseRate <
+                  list[j + 1].RevenueINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
             }
-          }
-          else if(this.type===2){
+          } else if (this.type === 2) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年营收
-              if (this.sortName===1){
-                if (list[j].AccountINC.curYearData > list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].AccountINC.curYearData >
+                  list[j + 1].AccountINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].AccountINC.lYearData  > list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].AccountINC.lYearData >
+                  list[j + 1].AccountINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].AccountINC.increaseData  > list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].AccountINC.increaseData >
+                  list[j + 1].AccountINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].AccountINC.increaseRate   > list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].AccountINC.increaseRate >
+                  list[j + 1].AccountINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
@@ -605,96 +1163,143 @@ export default {
               }
             }
             // 降序
-            else{
+            else {
               // 24年营收
-              if (this.sortName===1){
-                if (list[j].AccountINC.curYearData < list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].AccountINC.curYearData <
+                  list[j + 1].AccountINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].AccountINC.lYearData  < list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].AccountINC.lYearData <
+                  list[j + 1].AccountINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].AccountINC.increaseData  < list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].AccountINC.increaseData <
+                  list[j + 1].AccountINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].AccountINC.increaseRate   < list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].AccountINC.increaseRate <
+                  list[j + 1].AccountINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
             }
-          }
-          else if(this.type===3){
+          } else if (this.type === 3) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年车流
-              if (this.sortName===1){
-                if (list[j].BayonetINC.curYearData > list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].BayonetINC.curYearData >
+                  list[j + 1].BayonetINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].BayonetINC.lYearData  > list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].BayonetINC.lYearData >
+                  list[j + 1].BayonetINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].BayonetINC.increaseData   > list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].BayonetINC.increaseData >
+                  list[j + 1].BayonetINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].BayonetINC.increaseRate > list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].BayonetINC.increaseRate >
+                  list[j + 1].BayonetINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
-            }else{
+            } else {
               // 降序
               // 24年车流
-              if (this.sortName===1){
-                if (list[j].BayonetINC.curYearData < list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].BayonetINC.curYearData <
+                  list[j + 1].BayonetINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].BayonetINC.lYearData  < list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].BayonetINC.lYearData <
+                  list[j + 1].BayonetINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].BayonetINC.increaseData  < list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].BayonetINC.increaseData <
+                  list[j + 1].BayonetINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].BayonetINC.increaseRate < list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].BayonetINC.increaseRate <
+                  list[j + 1].BayonetINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
@@ -707,47 +1312,56 @@ export default {
       return list;
     },
     // 跳转去看服务区排名
-    handleGoServerPartDetail(obj){
+    handleGoServerPartDetail(obj) {
       let springObj = {
         SERVERPART_NAME: obj.ServerpartName,
         SPREGIONTYPE_NAME: obj.SPRegionTypeName,
         SPRegionType_ID: obj.SPRegionTypeId,
         Serverpart_ID: obj.ServerpartId,
-      }
-      uni.setStorageSync('springService',springObj) //当前选中服务区信息
-      this.$util.toNextRoute('navigateTo', `/pages/nationalPage/merchantRevenue?ServerpartId=${obj.ServerpartId}&type=${this.type}&serverPartList=${JSON.stringify(this.serverPartList)}&currentScroll=${this.currentScroll}&festivalType=${this.selectFestival}`)
-    }
-  }
-}
+      };
+      uni.setStorageSync("springService", springObj); //当前选中服务区信息
+      this.$util.toNextRoute(
+        "navigateTo",
+        `/pages/nationalPage/merchantRevenue?ServerpartId=${
+          obj.ServerpartId
+        }&type=${this.type}&serverPartList=${JSON.stringify(
+          this.serverPartList
+        )}&currentScroll=${this.currentScroll}&festivalType=${
+          this.selectFestival
+        }`
+      );
+    },
+  },
+};
 </script>
 
 
 <style scoped lang="scss">
-.main{
+.main {
   width: 100%;
   background: #fff;
-  .springTop{
+  .springTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
   }
-  .qmTop{
+  .qmTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
   }
-  .labourTop{
+  .labourTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
   }
-  .dragonBoatTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
+  .dragonBoatTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
   }
-  .summerHolidayTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
+  .summerHolidayTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
   }
-  .midAutumnTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
+  .midAutumnTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
   }
-  .nationalDayTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
+  .nationalDayTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
   }
-  .top{
+  .top {
     width: 100%;
     height: 324rpx;
     //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
@@ -755,28 +1369,28 @@ export default {
     background-repeat: no-repeat;
     background-position: 0 0;
     background-size: 100% 100%;
-    .headerSpring{
+    .headerSpring {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
     }
-    .headerQm{
+    .headerQm {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
     }
-    .headerLabour{
+    .headerLabour {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
     }
-    .headerDragonBoat{
+    .headerDragonBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
     }
-    .summerHolidayBoat{
+    .summerHolidayBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
     }
-    .midAutumnBoat{
-      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
+    .midAutumnBoat {
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
     }
-    .nationalDayBoat{
-      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
+    .nationalDayBoat {
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
     }
-    .header{
+    .header {
       position: fixed;
       width: 100%;
       padding: 0 16px;
@@ -789,7 +1403,7 @@ export default {
       display: flex;
       align-items: center;
       z-index: 2;
-      .backArrow{
+      .backArrow {
         width: 24px;
         height: 24px;
         margin-right: 16px;
@@ -797,41 +1411,68 @@ export default {
       }
     }
   }
-  .contentPage{
+  .contentPage {
     width: 100%;
     box-sizing: border-box;
     transform: translateY(-120rpx);
-    .revenueDetail{
+    .revenueDetail {
       width: 100%;
       background: #fff;
       border-radius: 16rpx;
       box-sizing: border-box;
       padding: 2rpx;
       margin-top: 24rpx;
-      .springTitleBox{
-        background: linear-gradient(360deg, rgba(255,200,198,0) 0%, #FFC8C6 100%);
+      .springTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(255, 200, 198, 0) 0%,
+          #ffc8c6 100%
+        );
       }
-      .qmTitleBox{
-        background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
+      .qmTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(204, 231, 224, 0) 0%,
+          #cce7e0 100%
+        );
       }
-      .labourTitleBox{
-        background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+      .labourTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(255, 236, 208, 0) 0%,
+          #ffecd0 100%
+        );
       }
-      .dragonBoatTitleBox{
-        background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%);
+      .dragonBoatTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(225, 241, 237, 0) 0%,
+          #e1f1ed 100%
+        );
       }
-      .summerHolidayTitleBox{
-        background:  linear-gradient( 360deg, rgba(214,238,243,0) 0%, #D1E9EE 100%);
+      .summerHolidayTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(214, 238, 243, 0) 0%,
+          #d1e9ee 100%
+        );
       }
-      .midAutumnTitleBox{
-        background: linear-gradient( 360deg, rgba(255,215,180,0) 0%, #FFF3E9 100%);
+      .midAutumnTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(255, 215, 180, 0) 0%,
+          #fff3e9 100%
+        );
       }
-      .nationalDayTitleBox{
-        background: linear-gradient( 360deg, rgba(255,218,210,0) 0%, #FFF2F0 100%);
+      .nationalDayTitleBox {
+        background: linear-gradient(
+          360deg,
+          rgba(255, 218, 210, 0) 0%,
+          #fff2f0 100%
+        );
       }
 
-
-      .revenueDetailTitleBox{
+      .revenueDetailTitleBox {
         width: 100%;
         height: 90rpx;
         //background: linear-gradient(360deg, rgba(255,200,198,0) 0%, #FFC8C6 100%);
@@ -843,98 +1484,97 @@ export default {
         display: flex;
         align-items: center;
         justify-content: space-between;
-        .left{
-          .detailLogo{
+        .left {
+          .detailLogo {
             width: 178rpx;
             height: 32rpx;
           }
-          .modalUnit{
+          .modalUnit {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #9A9A9A;
+            color: #9a9a9a;
             line-height: 36rpx;
             position: absolute;
             left: 220rpx;
             top: 30rpx;
           }
         }
-        .right{
-          .typeChangeBox{
+        .right {
+          .typeChangeBox {
             display: flex;
             align-items: center;
-            background: #FFFFFF;
+            background: #ffffff;
             border-radius: 6rpx;
             box-sizing: border-box;
             padding: 4rpx;
-            .normal{
+            .normal {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
-              color: #786B6C;
+              color: #786b6c;
               line-height: 36rpx;
               padding: 6rpx 16rpx;
             }
-            .select{
+            .select {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               color: #160002;
               line-height: 36rpx;
-              background: #F5EFEF;
+              background: #f5efef;
               border-radius: 6rpx;
             }
           }
         }
       }
-      .revenueContent{
+      .revenueContent {
         width: 100%;
         box-sizing: border-box;
         padding: 0 32rpx 24rpx;
-        .navBigList{
+        .navBigList {
           width: 100%;
           height: 40rpx;
           display: flex;
           align-items: center;
           margin-top: 32rpx;
-          .allBox{
+          .allBox {
             width: 70rpx;
             height: 100%;
-            .scrollItem{
+            .scrollItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
-              color: #A69E9F;
+              color: #a69e9f;
               line-height: 40rpx;
             }
-            .selectItem{
+            .selectItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 600;
-              color: #ED3E48;
+              color: #ed3e48;
               line-height: 40rpx;
             }
-
           }
 
-          .navList{
+          .navList {
             width: 100%;
             height: 40rpx;
             display: flex;
             align-items: center;
             white-space: nowrap;
             padding-bottom: 24rpx;
-            border-bottom: 1px solid #F5F4F4;
-            .scrollItem{
+            border-bottom: 1px solid #f5f4f4;
+            .scrollItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
-              color: #A69E9F;
+              color: #a69e9f;
               line-height: 40rpx;
               margin-right: 32rpx;
               display: inline-block;
             }
-            .selectItem{
+            .selectItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 600;
@@ -943,54 +1583,54 @@ export default {
               line-height: 40rpx;
             }
           }
-          .springNav{
+          .springNav {
             .selectItem {
-              color: #ED3E48!important;
+              color: #ed3e48 !important;
             }
           }
-          .qmNav{
+          .qmNav {
             .selectItem {
-              color: #226C61!important;
+              color: #226c61 !important;
             }
           }
-          .labourNav{
+          .labourNav {
             .selectItem {
-              color: #D14702!important;
+              color: #d14702 !important;
             }
           }
-          .dragonBoatNav{
+          .dragonBoatNav {
             .selectItem {
-              color: #3E8958!important;
+              color: #3e8958 !important;
             }
           }
-          .summerHolidayNav{
+          .summerHolidayNav {
             .selectItem {
-              color: #007797!important;
+              color: #007797 !important;
             }
           }
-          .midAutumnNav{
-            .selectItem{
-              color: #DA5015;
+          .midAutumnNav {
+            .selectItem {
+              color: #da5015;
             }
           }
-          .nationalDayNav{
-            .selectItem{
-              color: #D52020;
+          .nationalDayNav {
+            .selectItem {
+              color: #d52020;
             }
           }
         }
-        .dateText{
+        .dateText {
           font-size: 24rpx;
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
-          color: #A69E9F;
+          color: #a69e9f;
           margin: 16rpx 0;
           display: inline-block;
         }
 
-        .modalBox{
+        .modalBox {
           margin-top: 40rpx;
-          .modalTitleBox{
+          .modalTitleBox {
             width: 100%;
             box-sizing: border-box;
             padding: 0 24rpx;
@@ -998,17 +1638,17 @@ export default {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            .modalTitleItem{
+            .modalTitleItem {
               display: flex;
               align-items: center;
-              .modalIndex{
+              .modalIndex {
                 width: 12rpx;
                 height: 12rpx;
-                background: #DB6465;
+                background: #db6465;
                 border-radius: 50%;
                 margin-right: 12rpx;
               }
-              .modalText{
+              .modalText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 600;
@@ -1016,60 +1656,60 @@ export default {
                 line-height: 40rpx;
                 margin-right: 4rpx;
               }
-              .modalUnit{
+              .modalUnit {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
-                color: #9A9A9A;
+                color: #9a9a9a;
                 line-height: 36rpx;
               }
             }
-            .moreBox{
+            .moreBox {
               display: flex;
               align-items: center;
-              .moreText{
+              .moreText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
-                color: #9A9A9A;
+                color: #9a9a9a;
                 line-height: 36rpx;
               }
-              .moreIcon{
+              .moreIcon {
                 width: 24rpx;
                 height: 36rpx;
                 margin-left: 4rpx;
               }
             }
-            .modalTitleItem1{
+            .modalTitleItem1 {
               font-size: 24rpx;
               text-align: center;
             }
           }
-          .sortBox{
+          .sortBox {
             display: flex;
             align-items: center;
             justify-content: space-between;
             margin-bottom: 16rpx;
-            .sortItem{
+            .sortItem {
               display: flex;
               align-items: center;
-              .sortText{
+              .sortText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
-                color: #9A9A9A;
+                color: #9a9a9a;
                 line-height: 36rpx;
               }
-              .sortIconBox{
+              .sortIconBox {
                 display: flex;
                 flex-direction: column;
                 margin-left: 16rpx;
-                .upIcon{
+                .upIcon {
                   width: 16rpx;
                   height: 12rpx;
                   margin-bottom: 4rpx;
                 }
-                .bottomIcon{
+                .bottomIcon {
                   width: 16rpx;
                   height: 12rpx;
                 }
@@ -1077,30 +1717,30 @@ export default {
             }
           }
 
-          .modalDetail{
+          .modalDetail {
             width: 100%;
             box-sizing: border-box;
-            .modalDetailTitle{
+            .modalDetailTitle {
               display: flex;
               align-items: center;
               padding: 8rpx 0;
-              .titleItem{
+              .titleItem {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
-                color: #9A9A9A;
+                color: #9a9a9a;
                 line-height: 32rpx;
                 text-align: center;
               }
             }
-            .typeFirst{
+            .typeFirst {
               height: calc(100vh - 300px);
-              .row{
+              .row {
                 margin-top: 32rpx;
                 display: flex;
                 align-items: center;
                 margin-top: 32rpx;
-                .valueItem{
+                .valueItem {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
@@ -1109,78 +1749,78 @@ export default {
                   text-align: center;
                   text-indent: 8rpx;
                 }
-                .bigFather{
+                .bigFather {
                   position: relative;
                   font-weight: 600;
                 }
-                .bigFather:before{
+                .bigFather:before {
                   position: absolute;
                   top: 50%;
                   left: -8rpx;
                   transform: translateY(-50%);
-                  content:'';
+                  content: "";
                   display: inline-block;
                   width: 8rpx;
                   height: 8rpx;
                   border-radius: 50%;
-                  background: #DB6465;
+                  background: #db6465;
                 }
-                .father{
+                .father {
                   position: relative;
                   font-weight: 600;
                 }
-                .father:before{
+                .father:before {
                   position: absolute;
                   top: 50%;
                   left: -8rpx;
                   transform: translateY(-50%);
-                  content:'';
+                  content: "";
                   display: inline-block;
                   width: 8rpx;
                   height: 8rpx;
                   border-radius: 50%;
-                  background: #3188FF;
+                  background: #3188ff;
                 }
 
-                .son{
+                .son {
                   position: relative;
                 }
-                .son:before{
+                .son:before {
                   position: absolute;
                   top: 50%;
                   left: -8rpx;
                   transform: translateY(-50%);
-                  content:'';
+                  content: "";
                   display: inline-block;
                   width: 8rpx;
                   height: 8rpx;
                   border-radius: 50%;
                   background: orangered;
                 }
-                .compareItem{
+                .compareItem {
                   font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
                   color: #160002;
                   line-height: 40rpx;
                   text-align: center;
                 }
-                .addItem{
+                .addItem {
                   font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
-                  color: #E83944;
+                  color: #e83944;
                   line-height: 40rpx;
                   text-align: center;
                 }
               }
-              .listItem{
-                width:100%;
+              .listItem {
+                width: 100%;
                 padding: 24rpx;
                 box-sizing: border-box;
                 border-radius: 16rpx;
-                background: #F7F7F7;
+                background: #f7f7f7;
                 margin-bottom: 24rpx;
                 display: flex;
-                .itemLeft{
+                .itemLeft {
                   width: 160rpx;
                   height: 160rpx;
                   border-radius: 16rpx;
@@ -1188,78 +1828,80 @@ export default {
                   position: relative;
                   background-repeat: no-repeat;
                   background-size: cover;
-                  .bg{
+                  .bg {
                     position: absolute;
                     width: 160rpx;
                     height: 160rpx;
-                    top: 0;left: 0;
+                    top: 0;
+                    left: 0;
                     z-index: 1;
                   }
-                  .statueBox{
+                  .statueBox {
                     position: absolute;
                     z-index: 2;
-                    top: 0;right: 0;
+                    top: 0;
+                    right: 0;
                     width: 76rpx;
                     height: 32rpx;
                     font-size: 20rpx;
                     font-family: PingFangSC, PingFang SC;
                     font-weight: 400;
-                    color: #FFFFFF;
+                    color: #ffffff;
                     line-height: 28rpx;
                     background-repeat: no-repeat;
                     background-size: 100% 100%;
                     text-align: center;
                   }
-                  .nameBox{
+                  .nameBox {
                     position: absolute;
                     z-index: 2;
                     top: 32rpx;
                     left: 20rpx;
                     display: flex;
                     flex-direction: column;
-                    .serviceName{
+                    .serviceName {
                       font-size: 30rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 500;
-                      color: #7F020B;
+                      color: #7f020b;
                       line-height: 30rpx;
                       margin-bottom: 6rpx;
                     }
-                    .serviceLabel{
+                    .serviceLabel {
                       font-size: 20rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 500;
-                      color: #7F020B;
+                      color: #7f020b;
                       line-height: 20rpx;
                     }
                   }
                 }
-                .contentRight{
+                .contentRight {
                   width: calc(100% - 176rpx);
                   margin-left: 16rpx;
                   display: flex;
                   flex-direction: column;
                   justify-content: space-between;
-                  .rightTop{
+                  .rightTop {
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
-                    .rightTopLeft{
+                    .rightTopLeft {
                       display: flex;
                       align-items: center;
-                      .indexBox{
+                      .indexBox {
                         width: 36rpx;
                         height: 32rpx;
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
-                        color: #FEFFFF;
+                        color: #feffff;
                         line-height: 28rpx;
                         text-align: center;
                         background-repeat: no-repeat;
                         background-size: 100% 100%;
                       }
-                      .areaName{
+                      .areaName {
                         font-size: 28rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
@@ -1268,41 +1910,41 @@ export default {
                         margin-left: 8rpx;
                       }
                     }
-                    .rightTopRight{
+                    .rightTopRight {
                       display: flex;
                       align-items: center;
-                      .entryRateLabel{
+                      .entryRateLabel {
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
-                        color: #9A9A9A;
+                        color: #9a9a9a;
                         line-height: 32rpx;
                       }
-                      .entryRateValue{
+                      .entryRateValue {
                         font-size: 28rpx;
                         font-family: DINAlternate, DINAlternate;
                         font-weight: bold;
-                        color: #E83944;
+                        color: #e83944;
                         line-height: 32rpx;
                         margin-left: 4rpx;
                       }
                     }
                   }
-                  .rightBottom{
+                  .rightBottom {
                     display: flex;
                     justify-content: space-between;
-                    .rightBottomItem{
+                    .rightBottomItem {
                       display: flex;
                       flex-direction: column;
                       align-items: center;
-                      .itemLabel{
+                      .itemLabel {
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
-                        color: #9A9A9A;
+                        color: #9a9a9a;
                         line-height: 36rpx;
                       }
-                      .itemValue{
+                      .itemValue {
                         font-size: 28rpx;
                         font-family: DINAlternate, DINAlternate;
                         font-weight: bold;
@@ -1312,25 +1954,25 @@ export default {
                       }
                     }
                   }
-                  .otherCarBox{
+                  .otherCarBox {
                     width: 100%;
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
-                    .left{
+                    .left {
                       font-size: 24rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 400;
-                      color: #9A9A9A;
+                      color: #9a9a9a;
                       line-height: 36rpx;
                     }
-                    .MoreBox{
+                    .MoreBox {
                       width: 30%;
                       height: 32rpx;
                       display: flex;
                       align-items: center;
                       justify-content: flex-end;
-                      .goMoreIcon{
+                      .goMoreIcon {
                         width: 32rpx;
                         height: 32rpx;
                       }
@@ -1339,14 +1981,14 @@ export default {
                 }
               }
             }
-            .typeSecond{
-              .listValueBox{
+            .typeSecond {
+              .listValueBox {
                 width: 100%;
-                .row{
+                .row {
                   width: 100%;
                   display: flex;
                   margin-top: 32rpx;
-                  .rowItem{
+                  .rowItem {
                     text-align: center;
                     font-size: 24rpx;
                     font-family: DINAlternate, DINAlternate;
@@ -1359,7 +2001,6 @@ export default {
           }
         }
       }
-
     }
   }
 }
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 8fb2714..bab7bba 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -2,38 +2,38 @@
   <div class="main">
     <div
       :class="
-        selectFestival === 0
+        selectFestival === 1 || selectFestival === 2
           ? 'top topSpring'
-          : selectFestival === 1
-          ? 'top qmFestival'
-          : selectFestival === 2
-          ? 'top labourFestival'
           : selectFestival === 3
-          ? 'top dragonBoat'
+          ? 'top qmFestival'
           : selectFestival === 4
-          ? 'top summerHoliday'
+          ? 'top labourFestival'
           : selectFestival === 5
-          ? 'top midAutumn'
+          ? 'top dragonBoat'
           : selectFestival === 6
+          ? 'top summerHoliday'
+          : selectFestival === 7
+          ? 'top midAutumn'
+          : selectFestival === 8
           ? 'top nationalDay'
           : ''
       "
     >
       <div
         :class="
-          selectFestival === 0
+          selectFestival === 1 || selectFestival === 2
             ? 'header headerSpring'
-            : selectFestival === 1
-            ? 'header headerQm'
-            : selectFestival === 2
-            ? 'header headerLabour'
             : selectFestival === 3
-            ? 'header headerDragonBoat'
+            ? 'header headerQm'
             : selectFestival === 4
-            ? 'header headerSummerHoliday'
+            ? 'header headerLabour'
             : selectFestival === 5
-            ? 'header headerMidAutumn'
+            ? 'header headerDragonBoat'
             : selectFestival === 6
+            ? 'header headerSummerHoliday'
+            : selectFestival === 7
+            ? 'header headerMidAutumn'
+            : selectFestival === 8
             ? 'header headerNationalDay'
             : ''
         "
@@ -75,14 +75,17 @@
           :style="{ height: menu.height + 'px' }"
           @click="handleGoMap"
         >
-          <image class="searchIcon" src="/static/images/seach/searchIcon.svg" />
+          <image
+            class="searchIcon"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/searchIconService.svg"
+          />
           <text class="searchText">请输入想看的服务区</text>
         </view>
       </div>
       <picker
         class="pick"
         @change="handleChangeFestival($event)"
-        :value="selectFestival"
+        :value="currentIndex"
         :range="defaultFestivalList"
         range-key="label"
       >
@@ -93,27 +96,23 @@
           <image
             :style="{
               width:
-                selectFestival === 0
+                selectFestival === 1 || selectFestival===2
                   ? '260rpx'
-                  : selectFestival === 1
-                  ? '168rpx'
-                  : selectFestival === 2
-                  ? '168rpx'
                   : selectFestival === 3
                   ? '168rpx'
                   : selectFestival === 4
-                  ? '128rpx'
+                  ? '168rpx'
                   : selectFestival === 5
                   ? '168rpx'
                   : selectFestival === 6
+                  ? '128rpx'
+                  : selectFestival === 7
+                  ? '168rpx'
+                  : selectFestival === 8
                   ? '168rpx'
                   : '',
               height:
-                selectFestival === 0
-                  ? '68rpx'
-                  : selectFestival === 1
-                  ? '68rpx'
-                  : selectFestival === 2
+                selectFestival === 1 || selectFestival===2
                   ? '68rpx'
                   : selectFestival === 3
                   ? '68rpx'
@@ -123,23 +122,27 @@
                   ? '68rpx'
                   : selectFestival === 6
                   ? '68rpx'
+                  : selectFestival === 7
+                  ? '68rpx'
+                  : selectFestival === 8
+                  ? '68rpx'
                   : '',
             }"
             class="festivalImg"
             :src="
-              selectFestival === 0
+              selectFestival === 1 || selectFestival===2
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageTitle.png'
-                : selectFestival === 1
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmFestival.png'
-                : selectFestival === 2
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourIcon.png'
                 : selectFestival === 3
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatTitleIcon.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmFestival.png'
                 : selectFestival === 4
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayTitleIcon.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourIcon.png'
                 : selectFestival === 5
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnTitleIcon.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatTitleIcon.png'
                 : selectFestival === 6
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayTitleIcon.png'
+                : selectFestival === 7
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnTitleIcon.png'
+                : selectFestival === 8
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayTitleIcon.png'
                 : ''
             "
@@ -147,19 +150,19 @@
           <image
             class="changeIcon"
             :src="
-              selectFestival === 0
+              selectFestival === 1 || selectFestival===2
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changeFestivalSpring.png'
-                : selectFestival === 1
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changFestivalQm.png'
-                : selectFestival === 2
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRightArrow.png'
                 : selectFestival === 3
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRightArrow.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/changFestivalQm.png'
                 : selectFestival === 4
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRightArrow.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRightArrow.png'
                 : selectFestival === 5
-                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRightArrow.png'
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRightArrow.png'
                 : selectFestival === 6
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRightArrow.png'
+                : selectFestival === 7
+                ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRightArrow.png'
+                : selectFestival === 8
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRightArrow.png'
                 : ''
             "
@@ -174,19 +177,19 @@
           <!--  对客营收 -->
           <div
             :class="
-              selectFestival === 0
+              selectFestival === 1 || selectFestival===2
                 ? 'overAllDataTop springTop'
-                : selectFestival === 1
-                ? 'overAllDataTop qmTop'
-                : selectFestival === 2
-                ? 'overAllDataTop labourTop'
                 : selectFestival === 3
-                ? 'overAllDataTop dragonBoatTop'
+                ? 'overAllDataTop qmTop'
                 : selectFestival === 4
-                ? 'overAllDataTop summerHolidayTop'
+                ? 'overAllDataTop labourTop'
                 : selectFestival === 5
-                ? 'overAllDataTop midAutumnTop'
+                ? 'overAllDataTop dragonBoatTop'
                 : selectFestival === 6
+                ? 'overAllDataTop summerHolidayTop'
+                : selectFestival === 7
+                ? 'overAllDataTop midAutumnTop'
+                : selectFestival === 8
                 ? 'overAllDataTop nationalDayTop'
                 : ''
             "
@@ -197,19 +200,19 @@
                 <img
                   class="titleImg"
                   :src="
-                    selectFestival === 0
+                    selectFestival === 1 || selectFestival===2
                       ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png'
-                      : selectFestival === 1
-                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png'
-                      : selectFestival === 2
-                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png'
                       : selectFestival === 3
-                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatAllData.png'
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png'
                       : selectFestival === 4
-                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayAllData.png'
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png'
                       : selectFestival === 5
-                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnAllData.png'
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatAllData.png'
                       : selectFestival === 6
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayAllData.png'
+                      : selectFestival === 7
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnAllData.png'
+                      : selectFestival === 8
                       ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayAllData.png'
                       : ''
                   "
@@ -322,19 +325,19 @@
             <div class="pkBox">
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'leftBox springLeftBox'
-                    : selectFestival === 1
-                    ? 'leftBox qmLeftBox'
-                    : selectFestival === 2
-                    ? 'leftBox labourLeftBox'
                     : selectFestival === 3
-                    ? 'leftBox dragonBoatLeftBox'
+                    ? 'leftBox qmLeftBox'
                     : selectFestival === 4
-                    ? 'leftBox summerHolidayLeftBox'
+                    ? 'leftBox labourLeftBox'
                     : selectFestival === 5
-                    ? 'leftBox midAutumnLeftBox'
+                    ? 'leftBox dragonBoatLeftBox'
                     : selectFestival === 6
+                    ? 'leftBox summerHolidayLeftBox'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnLeftBox'
+                    : selectFestival === 8
                     ? 'leftBox nationalDayLeftBox'
                     : ''
                 "
@@ -348,19 +351,19 @@
               </div>
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'rightBox springRightBox'
-                    : selectFestival === 1
-                    ? 'rightBox qmRightBox'
-                    : selectFestival === 2
-                    ? 'rightBox labourRightBox'
                     : selectFestival === 3
-                    ? 'rightBox dragonBoatRightBox'
-                    : selectFestival === 4
-                    ? 'rightBox summerHolidayRightBox'
+                    ? 'rightBox qmRightBox'
+                    : selectFestival ===4
+                    ? 'rightBox labourRightBox'
                     : selectFestival === 5
-                    ? 'rightBox midAutumnRightBox'
+                    ? 'rightBox dragonBoatRightBox'
                     : selectFestival === 6
+                    ? 'rightBox summerHolidayRightBox'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnRightBox'
+                    : selectFestival === 8
                     ? 'rightBox nationalDayRightBox'
                     : ''
                 "
@@ -375,19 +378,19 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png'
-                    : selectFestival === 1
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png'
-                    : selectFestival === 2
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png'
                     : selectFestival === 3
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS1st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png'
                     : selectFestival === 4
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS1st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png'
                     : selectFestival === 5
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS1st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS1st.png'
                     : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS1st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS1st.png'
+                    : selectFestival === 8
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS1st.png'
                     : ''
                 "
@@ -1122,19 +1125,19 @@
             <div class="pkBox">
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'leftBox revenueLeft'
-                    : selectFestival === 1
-                    ? 'leftBox qmRevenueLeft'
-                    : selectFestival === 2
-                    ? 'leftBox labourRevenueLeft'
                     : selectFestival === 3
-                    ? 'leftBox dragonBoatRevenueLeft'
+                    ? 'leftBox qmRevenueLeft'
                     : selectFestival === 4
-                    ? 'leftBox summerHolidayRevenueLeft'
+                    ? 'leftBox labourRevenueLeft'
                     : selectFestival === 5
-                    ? 'leftBox midAutumnRevenueLeft'
+                    ? 'leftBox dragonBoatRevenueLeft'
                     : selectFestival === 6
+                    ? 'leftBox summerHolidayRevenueLeft'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnRevenueLeft'
+                    : selectFestival ===8
                     ? 'leftBox nationalDayRevenueLeft'
                     : ''
                 "
@@ -1148,19 +1151,19 @@
               </div>
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'rightBox revenueRight'
-                    : selectFestival === 1
-                    ? 'rightBox qmRevenueRight'
-                    : selectFestival === 2
-                    ? 'rightBox labourRevenueRight'
                     : selectFestival === 3
-                    ? 'rightBox dragonBoatRevenueRight'
+                    ? 'rightBox qmRevenueRight'
                     : selectFestival === 4
-                    ? 'rightBox summerHolidayRevenueRight'
+                    ? 'rightBox labourRevenueRight'
                     : selectFestival === 5
-                    ? 'rightBox midAutumnRevenueRight'
+                    ? 'rightBox dragonBoatRevenueRight'
                     : selectFestival === 6
+                    ? 'rightBox summerHolidayRevenueRight'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnRevenueRight'
+                    : selectFestival === 8
                     ? 'rightBox nationalDayRevenueRight'
                     : ''
                 "
@@ -1175,19 +1178,19 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png'
-                    : selectFestival === 1
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png'
-                    : selectFestival === 2
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png'
                     : selectFestival === 3
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS2st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png'
                     : selectFestival === 4
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS2st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png'
                     : selectFestival === 5
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS2st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS2st.png'
                     : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS2st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS2st.png'
+                    : selectFestival === 8
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS2st.png'
                     : ''
                 "
@@ -1719,19 +1722,19 @@
             <div class="pkBox" style="margin-bottom: 20px">
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'leftBox carLeft'
-                    : selectFestival === 1
+                    : selectFestival ===3
                     ? 'leftBox qmCarLeft'
-                    : selectFestival === 2
-                    ? 'leftBox labourCarLeft'
-                    : selectFestival === 3
-                    ? 'leftBox dragonBoatCarLeft'
                     : selectFestival === 4
-                    ? 'leftBox summerHolidayCarLeft'
+                    ? 'leftBox labourCarLeft'
                     : selectFestival === 5
-                    ? 'leftBox midAutumnCarLeft'
+                    ? 'leftBox dragonBoatCarLeft'
                     : selectFestival === 6
+                    ? 'leftBox summerHolidayCarLeft'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnCarLeft'
+                    : selectFestival === 8
                     ? 'leftBox nationalDayCarLeft'
                     : ''
                 "
@@ -1745,19 +1748,19 @@
               </div>
               <div
                 :class="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'rightBox carRight'
-                    : selectFestival === 1
-                    ? 'rightBox qmCarRight'
-                    : selectFestival === 2
-                    ? 'rightBox labourCarRight'
                     : selectFestival === 3
-                    ? 'rightBox dragonBoatCarRight'
-                    : selectFestival === 4
-                    ? 'rightBox summerHolidayCarRight'
+                    ? 'rightBox qmCarRight'
+                    : selectFestival ===4
+                    ? 'rightBox labourCarRight'
                     : selectFestival === 5
-                    ? 'rightBox midAutumnCarRight'
+                    ? 'rightBox dragonBoatCarRight'
                     : selectFestival === 6
+                    ? 'rightBox summerHolidayCarRight'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnCarRight'
+                    : selectFestival === 8
                     ? 'rightBox nationalDayCarRight'
                     : ''
                 "
@@ -1772,19 +1775,19 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 0
+                  selectFestival === 1 || selectFestival===2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png'
-                    : selectFestival === 1
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png'
-                    : selectFestival === 2
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png'
                     : selectFestival === 3
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS3st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png'
                     : selectFestival === 4
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS3st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png'
                     : selectFestival === 5
-                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS3st.png'
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS3st.png'
                     : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS3st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS3st.png'
+                    : selectFestival === 8
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS3st.png'
                     : ''
                 "
@@ -1902,19 +1905,19 @@
         <div class="revenueDetail">
           <div
             :class="
-              selectFestival === 0
+              selectFestival === 1 || selectFestival===2
                 ? 'springTitleBox revenueDetailTitleBox'
-                : selectFestival === 1
-                ? 'qmTitleBox revenueDetailTitleBox'
-                : selectFestival === 2
-                ? 'labourTitleBox revenueDetailTitleBox'
                 : selectFestival === 3
-                ? 'dragonBoatTitleBox revenueDetailTitleBox'
+                ? 'qmTitleBox revenueDetailTitleBox'
                 : selectFestival === 4
-                ? 'summerHolidayTitleBox revenueDetailTitleBox'
+                ? 'labourTitleBox revenueDetailTitleBox'
                 : selectFestival === 5
-                ? 'midAutumnTitleBox revenueDetailTitleBox'
+                ? 'dragonBoatTitleBox revenueDetailTitleBox'
                 : selectFestival === 6
+                ? 'summerHolidayTitleBox revenueDetailTitleBox'
+                : selectFestival === 7
+                ? 'midAutumnTitleBox revenueDetailTitleBox'
+                : selectFestival === 8
                 ? 'nationalDayTitleBox revenueDetailTitleBox'
                 : ''
             "
@@ -1923,19 +1926,19 @@
             <img
               class="detailLogo"
               :src="
-                selectFestival === 0
+                selectFestival === 1 || selectFestival===2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png'
-                  : selectFestival === 1
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDaily.png'
-                  : selectFestival === 2
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDailyData.png'
                   : selectFestival === 3
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDailyData.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDaily.png'
                   : selectFestival === 4
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDailyData.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDailyData.png'
                   : selectFestival === 5
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDailyData.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDailyData.png'
                   : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDailyData.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDailyData.png'
+                  : selectFestival === 8
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDailyData.png'
                   : ''
               "
@@ -1943,19 +1946,19 @@
             <img
               class="detailIcon"
               :src="
-                selectFestival === 0
+                selectFestival === 1 || selectFestival===2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailIcon.png'
-                  : selectFestival === 1
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDetailIcon.png'
-                  : selectFestival === 2
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDetailIcon.png'
                   : selectFestival === 3
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetailIcon.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDetailIcon.png'
                   : selectFestival === 4
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetailIcon.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourDetailIcon.png'
                   : selectFestival === 5
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetailIcon.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetailIcon.png'
                   : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetailIcon.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetailIcon.png'
+                  : selectFestival === 8
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDetailIcon.png'
                   : ''
               "
@@ -1970,19 +1973,19 @@
               class="goTest"
               @click="handleGoTest"
               :src="
-                selectFestival === 0
+                selectFestival === 1 || selectFestival===2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelBtn.png'
-                  : selectFestival === 1
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPic.png'
-                  : selectFestival === 2
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourCarTraffic.png'
                   : selectFestival === 3
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatTraffic.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPic.png'
                   : selectFestival === 4
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayTraffic.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourCarTraffic.png'
                   : selectFestival === 5
-                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnTraffic.png'
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatTraffic.png'
                   : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayTraffic.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnTraffic.png'
+                  : selectFestival === 8
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayTraffic.png'
                   : ''
               "
@@ -1992,19 +1995,19 @@
             <scroll-view
               scroll-x="true"
               :class="
-                selectFestival === 0
+                selectFestival === 1 || selectFestival===2
                   ? 'navList springNav'
-                  : selectFestival === 1
-                  ? 'navList qmNav'
-                  : selectFestival === 2
-                  ? 'navList labourNav'
                   : selectFestival === 3
-                  ? 'navList dragonBoatNav'
+                  ? 'navList qmNav'
                   : selectFestival === 4
-                  ? 'navList summerHolidayNav'
+                  ? 'navList labourNav'
                   : selectFestival === 5
-                  ? 'navList midAutumnNav'
+                  ? 'navList dragonBoatNav'
                   : selectFestival === 6
+                  ? 'navList summerHolidayNav'
+                  : selectFestival === 7
+                  ? 'navList midAutumnNav'
+                  : selectFestival === 8
                   ? 'navList nationalDayNav'
                   : ''
               "
@@ -2036,19 +2039,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
+                          ? '#3B9285'
+                          : selectFestival ===4
+                          ? '#D14702'
+                          : selectFestival ===5
                           ? '#3E8958'
-                          : selectFestival === 4
-                          ? '#007797'
-                          : selectFestival === 5
-                          ? '#DA5015'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2061,19 +2064,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
                           ? '#226C61'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#226C61'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2083,19 +2086,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
-                        : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
+                        : selectFestival ===5
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -2111,19 +2114,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#D14702'
+                          ? '#3B9285'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#D14702'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2136,19 +2139,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#D14702'
+                          ? '#226C61'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#D14702'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2158,19 +2161,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
-                        : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
+                        : selectFestival ===4
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -2690,19 +2693,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#3E8958'
+                          ? '#3B9285'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#3E8958'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2715,19 +2718,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                       selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
                           ? '#226C61'
-                          : selectFestival === 4
-                          ? '#007797'
+                          : selectFestival ===4
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#226C61'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2737,19 +2740,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -2775,19 +2778,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#D14702'
+                          ? '#3B9285'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#D14702'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2800,19 +2803,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#D14702'
+                          ? '#226C61'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#D14702'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -2822,19 +2825,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -3356,19 +3359,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#3E8958'
+                          ? '#3B9285'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#3E8958'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -3381,19 +3384,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#3E8958'
+                          ? '#226C61'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#3E8958'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -3403,19 +3406,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
+                        : selectFestival ===3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
-                        : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -3441,19 +3444,19 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#DB6465'
-                          : selectFestival === 1
-                          ? '#3B9285'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
-                          ? '#3E8958'
+                          ? '#3B9285'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
+                          ? '#3E8958'
+                          : selectFestival ===6
+                          ? '#007797'
+                          : selectFestival === 7
                           ? '#DA5015'
-                          : selectFestival === 6
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -3466,19 +3469,19 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 0
+                        selectFestival === 1 || selectFestival===2
                           ? '#ED3E48'
-                          : selectFestival === 1
-                          ? '#226C61'
-                          : selectFestival === 2
-                          ? '#D14702'
                           : selectFestival === 3
                           ? '#226C61'
                           : selectFestival === 4
-                          ? '#007797'
+                          ? '#D14702'
                           : selectFestival === 5
-                          ? '#DA5015'
+                          ? '#226C61'
                           : selectFestival === 6
+                          ? '#007797'
+                          : selectFestival === 7
+                          ? '#DA5015'
+                          : selectFestival === 8
                           ? '#D52020'
                           : '',
                     }"
@@ -3488,19 +3491,19 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 0
+                      selectFestival === 1 || selectFestival===2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival === 1
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival === 2
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 3
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
-                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
+                        : selectFestival === 7
+                        ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnRight.png'
+                        : selectFestival === 8
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRight.png'
                         : ''
                     "
@@ -3849,6 +3852,8 @@ export default {
           compareYear: 2024,
           startTime: "2024-12-31",
           endTime: "2025-01-02",
+          lastYearStart: "2023/12/31",
+          lastYearEnd: "2024/01/02",
         },
         {
           label: "25年春运",
@@ -3858,6 +3863,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-01-13",
           endTime: "2025-02-23",
+          lastYearStart: "2024/01/26",
+          lastYearEnd: "2024/03/05",
         },
         {
           label: "25年清明",
@@ -3867,6 +3874,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-04-03",
           endTime: "2025-04-07",
+          lastYearStart: "2024/04/03",
+          lastYearEnd: "2024/04/07",
         },
         {
           label: "25年劳动",
@@ -3876,6 +3885,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-04-30",
           endTime: "2025-05-06",
+          lastYearStart: "2024/04/30",
+          lastYearEnd: "2024/05/06",
         },
         {
           label: "25年端午",
@@ -3885,6 +3896,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-05-30",
           endTime: "2025-06-03",
+          lastYearStart: "2024/06/09",
+          lastYearEnd: "2024/06/11",
         },
         {
           label: "25年暑运",
@@ -3894,6 +3907,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-06-30",
           endTime: "2025-09-01",
+          lastYearStart: "2024/06/30",
+          lastYearEnd: "2024/09/01",
         },
         // {
         //   label: "25年中秋",
@@ -3911,6 +3926,8 @@ export default {
           compareYear: 2024,
           startTime: "2025-09-30",
           endTime: "2025-10-09",
+          lastYearStart: "2024/09/30",
+          lastYearEnd: "2024/10/09",
         },
         {
           label: "24年元旦",
@@ -3920,6 +3937,8 @@ export default {
           compareYear: 2023,
           startTime: "2023-12-31",
           endTime: "2024-01-02",
+          lastYearStart: "2022/12/31",
+          lastYearEnd: "2022/01/02",
         },
         {
           label: "24年春运",
@@ -3929,6 +3948,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-01-26",
           endTime: "2024-03-05",
+          lastYearStart: "2023/01/06",
+          lastYearEnd: "2023/02/16",
         },
         {
           label: "24年清明",
@@ -3938,6 +3959,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-04-03",
           endTime: "2024-04-07",
+          lastYearStart: "2023/04/04",
+          lastYearEnd: "2023/04/06",
         },
         {
           label: "24年劳动",
@@ -3947,6 +3970,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-04-30",
           endTime: "2024-05-06",
+          lastYearStart: "2023/04/28",
+          lastYearEnd: "2023/05/04",
         },
         {
           label: "24年端午",
@@ -3956,6 +3981,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-06-07",
           endTime: "2024-06-11",
+          lastYearStart: "2023/06/21",
+          lastYearEnd: "2023/06/25",
         },
         {
           label: "24年暑运",
@@ -3965,6 +3992,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-06-30",
           endTime: "2024-09-01",
+          lastYearStart: "2023/06/30",
+          lastYearEnd: "2023/09/01",
         },
         {
           label: "24年中秋",
@@ -3974,6 +4003,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-09-14",
           endTime: "2024-09-18",
+          lastYearStart: "2023/09/28",
+          lastYearEnd: "2023/09/30",
         },
         {
           label: "24年国庆",
@@ -3983,6 +4014,8 @@ export default {
           compareYear: 2023,
           startTime: "2024-09-30",
           endTime: "2024-10-08",
+          lastYearStart: "2023/09/30",
+          lastYearEnd: "2023/10/08",
         },
       ],
       currentFestival: {}, // 当前节日的对象
@@ -4039,7 +4072,7 @@ export default {
       currentIndex = maxIndex;
       currentObj = maxObj;
     }
-    this.selectFestival = currentObj.type;
+    this.selectFestival = currentObj.HolidayType;
     this.currentFestival = currentObj;
     this.currentIndex = currentIndex;
     console.log("当前节日的索引", currentIndex);
@@ -4335,7 +4368,7 @@ export default {
       this.handleResest();
       console.log("e", e);
       let currentObj = this.defaultFestivalList[Number(e.detail.value)];
-      this.selectFestival = currentObj.type;
+      this.selectFestival = currentObj.HolidayType;
       this.currentFestival = currentObj;
       this.currentIndex = Number(e.detail.value);
       const currentDate = new Date(this.lastDay);
@@ -5432,14 +5465,15 @@ export default {
       let time = this.currentScroll.split("item")[1];
       this.$util.toNextRoute(
         "navigateTo",
-        `/pages/nationalPage/rankPage?type=${type}&time=${time}&festivalType=${this.selectFestival}`
+        `/pages/nationalPage/rankPage?type=${type}&time=${time}&festivalType=${this.currentFestival.HolidayType}`
       );
     },
     handleGoTest(type) {
       let obj = JSON.stringify(this.giveTrendObj);
+      let currentFestival = JSON.stringify(this.currentFestival);
       this.$util.toNextRoute(
         "navigateTo",
-        `/pages/nationalPage/testPage?detailObj=${obj}&festivalType=${this.selectFestival}`
+        `/pages/nationalPage/testPage?detailObj=${obj}&currentFestival=${currentFestival}&festivalType=${this.selectFestival}`
       );
     },
     // 获取最新的同步日期
diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue
index 1037030..b0d788f 100644
--- a/pages/nationalPage/testPage.vue
+++ b/pages/nationalPage/testPage.vue
@@ -1,558 +1,833 @@
 <template>
-  <div class="main" >
-    <div  class="img" :style="{left:allScreen?'100%':'0'}">
+  <div class="main">
+    <div class="img" :style="{ left: allScreen ? '100%' : '0' }">
       <div class="imgContent">
         <div class="imgTop">
-          <span class="unit">单位：万元<span style="color: red">(可左滑查看)</span></span>
+          <span class="unit"
+            >单位：万元<span style="color: red">(可左滑查看)</span></span
+          >
           <div class="searchAllScreen">
-            <img class="allScreenIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allScreenIcon.png"/>
+            <img
+              class="allScreenIcon"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allScreenIcon.png"
+            />
             <span class="text" @click="handleShowAllScreen">全屏</span>
           </div>
         </div>
         <qiunDataCharts
-            type="area"
-            :opts="opts"
-            :chartData="res"
-            :animation="false"
-            :canvas2d="true"
-            :inScrollView="true"
-            tooltipFormat="entryCarNumber"
-            :ontouch="true"
+          type="area"
+          :opts="opts"
+          :chartData="res"
+          :animation="false"
+          :canvas2d="true"
+          :inScrollView="true"
+          tooltipFormat="entryCarNumber"
+          :ontouch="true"
         />
       </div>
 
       <scroll-view scroll-y="true" class="scrollView">
-        <div class="noticeBox" v-if="selectFestival===0">
-          <div :class="selectFestival===0?'boxBg springBox':selectFestival===1?'boxBg qmBox':''"></div>
+        <div class="noticeBox" v-if="selectFestival === 2">
+          <div
+            :class="
+              selectFestival === 2
+                ? 'boxBg springBox'
+                : selectFestival === 3
+                ? 'boxBg qmBox'
+                : ''
+            "
+          ></div>
           <div class="contentBox">
-<!--            <img class="contentIcon" src=""/>-->
-            <img class="contentIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png':selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png':selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png':''"/>
-            <div class="contentText" v-if="selectFestival===0">
-              根据历史大数据显示：<br/>
-              <div style="text-indent: 2rem;font-size: 24rpx">
-                服务区会在春运前至农历小年夜前（<span class="red">农历二十二</span>）到底回程小高峰，然后流量逐步回落至春运最低点（<span class="red">除夕夜</span>），大年初二开始随着出行自驾游的高峰来临，流量逐步放大，会在初六达到整个春运最高峰，随后流量逐步回落至次低点（<span class="red">元宵节</span>），在正月十六出现一波返程小高峰后，流量逐步回复正常。
+            <!--            <img class="contentIcon" src=""/>-->
+            <img
+              class="contentIcon"
+              :src="
+                selectFestival === 2
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png'
+                  : selectFestival === 3
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png'
+                  : selectFestival === 4
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png'
+                  : ''
+              "
+            />
+            <div class="contentText" v-if="selectFestival === 1">
+              根据历史大数据显示：<br />
+              <div style="text-indent: 2rem; font-size: 24rpx">
+                服务区会在春运前至农历小年夜前（<span class="red"
+                  >农历二十二</span
+                >）到底回程小高峰，然后流量逐步回落至春运最低点（<span
+                  class="red"
+                  >除夕夜</span
+                >），大年初二开始随着出行自驾游的高峰来临，流量逐步放大，会在初六达到整个春运最高峰，随后流量逐步回落至次低点（<span
+                  class="red"
+                  >元宵节</span
+                >），在正月十六出现一波返程小高峰后，流量逐步回复正常。
               </div>
             </div>
           </div>
         </div>
-        <div class="noticeBox" style="height: 500rpx" v-if="selectFestival===2">
-          <div :class="selectFestival===0?'boxBg springBox':
-          selectFestival===1?'boxBg qmBox':
-          selectFestival===2?'boxBg labourBox':
-          selectFestival===3?'boxBg dragonBoatBox':
-          selectFestival===4?'boxBg summerHolidayBox':
-          selectFestival===5?'boxBg midAutumnBox':
-          selectFestival===6?'boxBg nationalDayBox':
-          ''"></div>
+        <div
+          class="noticeBox"
+          style="height: 500rpx"
+          v-if="selectFestival === 3"
+        >
+          <div
+            :class="
+              selectFestival === 1 || selectFestival === 2
+                ? 'boxBg springBox'
+                : selectFestival ===3
+                ? 'boxBg qmBox'
+                : selectFestival === 4
+                ? 'boxBg labourBox'
+                : selectFestival === 5
+                ? 'boxBg dragonBoatBox'
+                : selectFestival === 6
+                ? 'boxBg summerHolidayBox'
+                : selectFestival === 7
+                ? 'boxBg midAutumnBox'
+                : selectFestival === 8
+                ? 'boxBg nationalDayBox'
+                : ''
+            "
+          ></div>
           <div class="contentBox">
-            <img class="contentIcon" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png':
-            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png':
-            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png':
-            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatChart.png':
-            selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayChart.png':
-            selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnChart.png':
-            selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayChart.png':
-            ''"/>
-            <div class="contentText" >
-              根据历史大数据显示：<br/>
-              <div style="text-indent: 2rem;font-size: 24rpx">
-                2024年五一假期期间，预计安徽驿达服务区<span class="red">5月1日</span>（假期首日）10时-14时是<span class="red">出程入区高峰</span>时段，<span class="red">峰值</span>出现在11时-13时；
+            <img
+              class="contentIcon"
+              :src="
+                selectFestival === 1 || selectFestival === 2
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png'
+                  : selectFestival === 3
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png'
+                  : selectFestival ===4
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png'
+                  : selectFestival === 5
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatChart.png'
+                  : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayChart.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnChart.png'
+                  : selectFestival === 8
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayChart.png'
+                  : ''
+              "
+            />
+            <div class="contentText">
+              根据历史大数据显示：<br />
+              <div style="text-indent: 2rem; font-size: 24rpx">
+                2024年五一假期期间，预计安徽驿达服务区<span class="red"
+                  >5月1日</span
+                >（假期首日）10时-14时是<span class="red">出程入区高峰</span
+                >时段，<span class="red">峰值</span>出现在11时-13时；
               </div>
-              <div style="text-indent: 2rem;font-size: 24rpx;margin-top: 8px">
-                安徽驿达服务区返程入区高峰或将较为分散，预计<span class="red">5月4日</span>（假日第四天）15时-19时，<span class="red">5月5日</span>（假期末日）14时-20时为<span class="red">返程入区高峰</span>时段，预计<span class="red">入区峰值</span>出现在<span class="red">5月4日</span>（假日第四天）<span class="red">17时-19时</span>，<span class="red">5月5日</span>（假期末日）<span class="red">16时-18时</span>，5月6日恢复正常
+              <div style="text-indent: 2rem; font-size: 24rpx; margin-top: 8px">
+                安徽驿达服务区返程入区高峰或将较为分散，预计<span class="red"
+                  >5月4日</span
+                >（假日第四天）15时-19时，<span class="red">5月5日</span
+                >（假期末日）14时-20时为<span class="red">返程入区高峰</span
+                >时段，预计<span class="red">入区峰值</span>出现在<span
+                  class="red"
+                  >5月4日</span
+                >（假日第四天）<span class="red">17时-19时</span>，<span
+                  class="red"
+                  >5月5日</span
+                >（假期末日）<span class="red">16时-18时</span>，5月6日恢复正常
               </div>
             </div>
           </div>
         </div>
 
         <div class="allPkBox">
-          <div :class="selectFestival===0?'boxBg springBox':
-          selectFestival===1?'boxBg qmBox':
-          selectFestival===2?'boxBg labourBox':
-          selectFestival===3?'boxBg dragonBoatBox':
-          selectFestival===4?'boxBg summerHolidayBox':
-          selectFestival===5?'boxBg midAutumnBox':
-          selectFestival===6?'boxBg nationalDayBox':
-          ''"></div>
+          <div
+            :class="
+              selectFestival === 1 || selectFestival === 2
+                ? 'boxBg springBox'
+                : selectFestival === 3
+                ? 'boxBg qmBox'
+                : selectFestival === 4
+                ? 'boxBg labourBox'
+                : selectFestival === 5
+                ? 'boxBg dragonBoatBox'
+                : selectFestival === 6
+                ? 'boxBg summerHolidayBox'
+                : selectFestival === 7
+                ? 'boxBg midAutumnBox'
+                : selectFestival === 8
+                ? 'boxBg nationalDayBox'
+                : ''
+            "
+          ></div>
           <div class="pkContent">
             <div class="contentTop">
-<!--              <img class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png" />-->
-              <img class="titleImg" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png':
-              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png':
-              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png':
-              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatAllData.png':
-              selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayAllData.png':
-              selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnAllData.png':
-              selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayAllData.png':
-              ''" />
+              <!--              <img class="titleImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png" />-->
+              <img
+                class="titleImg"
+                :src="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png'
+                    : selectFestival ===3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png'
+                    : selectFestival === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png'
+                    : selectFestival === 5
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatAllData.png'
+                    : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayAllData.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnAllData.png'
+                    : selectFestival === 8
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayAllData.png'
+                    : ''
+                "
+              />
             </div>
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox springLeftBox':
-              selectFestival===1?'leftBox qmLeftBox':
-              selectFestival===2?'leftBox labourLeftBox':
-              selectFestival===3?'leftBox dragonBoatLeftBox':
-              selectFestival===4?'leftBox summerHolidayLeftBox':
-              selectFestival===5?'leftBox midAutumnLeftBox':
-              selectFestival===6?'leftBox nationalDayLeftBox':
-              ''">
-                <text class="value">{{giveTrendObj.curYearRevenue?$util.getMoney(giveTrendObj.curYearRevenue / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'leftBox springLeftBox'
+                    : selectFestival === 3
+                    ? 'leftBox qmLeftBox'
+                    : selectFestival === 4
+                    ? 'leftBox labourLeftBox'
+                    : selectFestival === 5
+                    ? 'leftBox dragonBoatLeftBox'
+                    : selectFestival === 6
+                    ? 'leftBox summerHolidayLeftBox'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnLeftBox'
+                    : selectFestival === 8
+                    ? 'leftBox nationalDayLeftBox'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.curYearRevenue
+                    ? $util.getMoney(giveTrendObj.curYearRevenue / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div :class="selectFestival===0?'rightBox springRightBox':
-              selectFestival===1?'rightBox qmRightBox':
-              selectFestival===2?'rightBox labourRightBox':
-              selectFestival===3?'rightBox dragonBoatRightBox':
-              selectFestival===4?'rightBox summerHolidayRightBox':
-              selectFestival===5?'rightBox midAutumnRightBox':
-              selectFestival===6?'rightBox nationalDayRightBox':
-              ''">
-                <text class="value">{{giveTrendObj.lYearRevenue?$util.getMoney(giveTrendObj.lYearRevenue / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'rightBox springRightBox'
+                    : selectFestival === 3
+                    ? 'rightBox qmRightBox'
+                    : selectFestival === 4
+                    ? 'rightBox labourRightBox'
+                    : selectFestival ===5
+                    ? 'rightBox dragonBoatRightBox'
+                    : selectFestival === 6
+                    ? 'rightBox summerHolidayRightBox'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnRightBox'
+                    : selectFestival === 8
+                    ? 'rightBox nationalDayRightBox'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.lYearRevenue
+                    ? $util.getMoney(giveTrendObj.lYearRevenue / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png':
-              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png':
-              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png':
-              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS1st.png':
-              selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS1st.png':
-              selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS1st.png':
-              selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS1st.png':
-              ''"/>
+              <img
+                class="pkLogo"
+                :src="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png'
+                    : selectFestival === 3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png'
+                    : selectFestival === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS1st.png'
+                    : selectFestival === 5
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS1st.png'
+                    : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS1st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS1st.png'
+                    : selectFestival === 8
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS1st.png'
+                    : ''
+                "
+              />
             </div>
             <div class="pkBox">
-              <div :class="selectFestival===0?'leftBox revenueLeft':
-              selectFestival===1?'leftBox qmRevenueLeft':
-              selectFestival===2?'leftBox labourRevenueLeft':
-              selectFestival===3?'leftBox dragonBoatRevenueLeft':
-              selectFestival===4?'leftBox summerHolidayRevenueLeft':
-              selectFestival===5?'leftBox midAutumnRevenueLeft':
-              selectFestival===6?'leftBox nationalDayRevenueLeft':
-              ''">
-                <text class="value">{{giveTrendObj.curYearAccount?$util.getMoney(giveTrendObj.curYearAccount / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'leftBox revenueLeft'
+                    : selectFestival === 3
+                    ? 'leftBox qmRevenueLeft'
+                    : selectFestival === 4
+                    ? 'leftBox labourRevenueLeft'
+                    : selectFestival === 5
+                    ? 'leftBox dragonBoatRevenueLeft'
+                    : selectFestival === 6
+                    ? 'leftBox summerHolidayRevenueLeft'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnRevenueLeft'
+                    : selectFestival === 8
+                    ? 'leftBox nationalDayRevenueLeft'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.curYearAccount
+                    ? $util.getMoney(giveTrendObj.curYearAccount / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2024年/万元</text>
               </div>
-              <div :class="selectFestival===0?'rightBox revenueRight':
-              selectFestival===1?'rightBox qmRevenueRight':
-              selectFestival===2?'rightBox labourRevenueRight':
-              selectFestival===3?'rightBox dragonBoatRevenueRight':
-              selectFestival===4?'rightBox summerHolidayRevenueRight':
-              selectFestival===5?'rightBox midAutumnRevenueRight':
-              selectFestival===6?'rightBox nationalDayRevenueRight':
-              ''">
-                <text class="value">{{giveTrendObj.lYearAccount?$util.getMoney(giveTrendObj.lYearAccount / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'rightBox revenueRight'
+                    : selectFestival === 3
+                    ? 'rightBox qmRevenueRight'
+                    : selectFestival === 4
+                    ? 'rightBox labourRevenueRight'
+                    : selectFestival === 5
+                    ? 'rightBox dragonBoatRevenueRight'
+                    : selectFestival === 6
+                    ? 'rightBox summerHolidayRevenueRight'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnRevenueRight'
+                    : selectFestival === 8
+                    ? 'rightBox nationalDayRevenueRight'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.lYearAccount
+                    ? $util.getMoney(giveTrendObj.lYearAccount / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2023年/万元</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png':
-              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png':
-              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png':
-              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS2st.png':
-              selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS2st.png':
-              selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS2st.png':
-              selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS2st.png':
-              ''"/>
+              <img
+                class="pkLogo"
+                :src="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png'
+                    : selectFestival === 3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png'
+                    : selectFestival === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS2st.png'
+                    : selectFestival === 5
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS2st.png'
+                    : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS2st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS2st.png'
+                    : selectFestival === 8
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS2st.png'
+                    : ''
+                "
+              />
             </div>
             <div class="pkBox" style="margin-bottom: 20px">
-              <div :class="selectFestival===0?'leftBox carLeft':
-              selectFestival===1?'leftBox qmCarLeft':
-              selectFestival===2?'leftBox labourCarLeft':
-              selectFestival===3?'leftBox dragonBoatCarLeft':
-              selectFestival===4?'leftBox summerHolidayCarLeft':
-              selectFestival===5?'leftBox midAutumnCarLeft':
-              selectFestival===6?'leftBox nationalDayCarLeft':
-              ''">
-                <text class="value">{{giveTrendObj.curYearBayonet?$util.getMoney(giveTrendObj.curYearBayonet / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'leftBox carLeft'
+                    : selectFestival === 3
+                    ? 'leftBox qmCarLeft'
+                    : selectFestival === 4
+                    ? 'leftBox labourCarLeft'
+                    : selectFestival === 5
+                    ? 'leftBox dragonBoatCarLeft'
+                    : selectFestival === 6
+                    ? 'leftBox summerHolidayCarLeft'
+                    : selectFestival === 7
+                    ? 'leftBox midAutumnCarLeft'
+                    : selectFestival === 8
+                    ? 'leftBox nationalDayCarLeft'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.curYearBayonet
+                    ? $util.getMoney(giveTrendObj.curYearBayonet / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2024年/万辆</text>
               </div>
-              <div :class="selectFestival===0?'rightBox carRight':
-              selectFestival===1?'rightBox qmCarRight':
-              selectFestival===2?'rightBox labourCarRight':
-              selectFestival===3?'rightBox dragonBoatCarRight':
-              selectFestival===4?'rightBox summerHolidayCarRight':
-              selectFestival===5?'rightBox midAutumnCarRight':
-              selectFestival===6?'rightBox nationalDayCarRight':
-              '' ">
-                <text class="value">{{giveTrendObj.lYearBayonet?$util.getMoney(giveTrendObj.lYearBayonet / 10000):'0.00'}}</text>
+              <div
+                :class="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'rightBox carRight'
+                    : selectFestival === 3
+                    ? 'rightBox qmCarRight'
+                    : selectFestival === 4
+                    ? 'rightBox labourCarRight'
+                    : selectFestival === 5
+                    ? 'rightBox dragonBoatCarRight'
+                    : selectFestival === 6
+                    ? 'rightBox summerHolidayCarRight'
+                    : selectFestival === 7
+                    ? 'rightBox midAutumnCarRight'
+                    : selectFestival === 8
+                    ? 'rightBox nationalDayCarRight'
+                    : ''
+                "
+              >
+                <text class="value">{{
+                  giveTrendObj.lYearBayonet
+                    ? $util.getMoney(giveTrendObj.lYearBayonet / 10000)
+                    : "0.00"
+                }}</text>
                 <text class="label">2023年/万辆</text>
               </div>
-              <img class="pkLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png':
-              selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png':
-              selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png':
-              selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS3st.png':
-              selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS3st.png':
-              selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS3st.png':
-              selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS3st.png':
-              ''"/>
+              <img
+                class="pkLogo"
+                :src="
+                  selectFestival === 1 || selectFestival === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png'
+                    : selectFestival === 3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png'
+                    : selectFestival === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourVS3st.png'
+                    : selectFestival === 5
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatVS3st.png'
+                    : selectFestival === 6
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayVS3st.png'
+                    : selectFestival === 7
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnVS3st.png'
+                    : selectFestival === 8
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayVS3st.png'
+                    : ''
+                "
+              />
             </div>
           </div>
         </div>
       </scroll-view>
-
-
-
     </div>
 
-    <div class="allScreen" :style="{left:allScreen?'0':'100%'}" >
+    <div class="allScreen" :style="{ left: allScreen ? '0' : '100%' }">
       <div class="bigBox">
         <div class="bigImg">
           <qiunDataCharts
-              type="area"
-              :opts="opts2"
-              :chartData="res2"
-              :animation="false"
-              :canvas2d="true"
-              :inScrollView="true"
-              tooltipFormat="entryCarNumber2"
-              :ontouch="true"
-              :reshow="allScreen"
+            type="area"
+            :opts="opts2"
+            :chartData="res2"
+            :animation="false"
+            :canvas2d="true"
+            :inScrollView="true"
+            tooltipFormat="entryCarNumber2"
+            :ontouch="true"
+            :reshow="allScreen"
           />
         </div>
         <div class="closeBox">
-          <img class="closeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/closeIcon.svg"  @click="handleShowAllScreen"/>
+          <img
+            class="closeIcon"
+            src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/closeIcon.svg"
+            @click="handleShowAllScreen"
+          />
         </div>
       </div>
     </div>
-
   </div>
 </template>
 <script>
 import qiunDataCharts from "./components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue";
-import request from '@/util/index.js'
+import request from "@/util/index.js";
 import moment from "moment";
 var uChartsInstance = {};
 export default {
-  components: {qiunDataCharts},
+  components: { qiunDataCharts },
   data() {
     return {
-      opts:{},
-      opts2:{},
-      res:{},
-      res2:{},
-      allScreen:false,
-      ScrollTop:0,
-      howDayNumber:0,
-      giveTrendObj:{},
+      opts: {},
+      opts2: {},
+      res: {},
+      res2: {},
+      allScreen: false,
+      ScrollTop: 0,
+      howDayNumber: 0,
+      giveTrendObj: {},
+      currentFestival: {},
       selectFestival: 0,
-    }
+      StatisticsDate: "", // 统计时间
+    };
   },
-  onLoad(query){
-    console.log('query',query)
-    if (query.detailObj){
-      this.giveTrendObj = JSON.parse(query.detailObj)
+  onLoad(query) {
+    console.log("query", query);
+    if (query.detailObj) {
+      this.giveTrendObj = JSON.parse(query.detailObj);
     }
-    if (query.festivalType){
-      this.selectFestival = Number(query.festivalType)
+    if (query.currentFestival) {
+      this.currentFestival = JSON.parse(query.currentFestival);
     }
+    if (query.festivalType) {
+      this.selectFestival = Number(query.festivalType);
+    }
+    console.log("this.currentFestival", this.currentFestival);
+    console.log("this.selectFestival", this.selectFestival);
 
-    this.lastDay = uni.getStorageSync('lastDay')
-    const lastDate = new Date(this.lastDay)
+    this.lastDay = uni.getStorageSync("lastDay");
+    const currentDate = new Date(this.lastDay);
+    let nowTime = currentDate.getTime(); // 当前的时间戳 来拿到现在的时间 是过了哪个节日 没到哪个节日
+    let dayList = [];
+    if (
+      new Date(this.currentFestival.startTime).getTime() < nowTime &&
+      new Date(this.currentFestival.endTime).getTime() > nowTime
+    ) {
+      let dayNumber = moment(this.lastDay).diff(
+        this.currentFestival.startTime,
+        "days"
+      );
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.currentFestival.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+      this.StatisticsDate = this.lastDay;
+    } else if (new Date(this.currentFestival.endTime).getTime() < nowTime) {
+      // 当前时间已经过了这个时间范围了
+      let dayNumber =
+        moment(this.currentFestival.endTime).diff(
+          this.currentFestival.startTime,
+          "days"
+        ) + 1;
+      console.log("dayNumber", dayNumber);
+      this.howDayNumber = dayNumber;
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.currentFestival.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+      this.StatisticsDate = this.currentFestival.endTime;
+    }
+    console.log("this.StatisticsDate", this.StatisticsDate);
+    this.handleGetData();
+
+    return;
+    this.lastDay = uni.getStorageSync("lastDay");
+    const lastDate = new Date(this.lastDay);
     // 拿到是春运开始的第几天
-    let dayNumber = 0
-    let lastMonth =  lastDate.getMonth() + 1
-    let lastDays = lastDate.getDate()
+    let dayNumber = 0;
+    let lastMonth = lastDate.getMonth() + 1;
+    let lastDays = lastDate.getDate();
     // 24年春运开始时间为 1.26
-    if (lastMonth === 1){
-      dayNumber = lastDays - 26 + 1
-    }else{
-      dayNumber = 6 + lastDays
+    if (lastMonth === 1) {
+      dayNumber = lastDays - 26 + 1;
+    } else {
+      dayNumber = 6 + lastDays;
     }
-    console.log('dayNumber',dayNumber)
-    this.ScrollTop = (dayNumber-3)*30
-    if (this.selectFestival===0){
-      this.howDayNumber = dayNumber
-    }else if (this.selectFestival===1){
-      this.howDayNumber = 5
-    }else if (this.selectFestival===2){
-      this.howDayNumber = 7
-    }else if (this.selectFestival===3){
-      this.howDayNumber = 5
-    }else if (this.selectFestival===4){
-      this.howDayNumber = 62
-    }else if (this.selectFestival===5){
-      this.howDayNumber = 5
-    }else if (this.selectFestival===6){
-      this.howDayNumber = 9
+    console.log("dayNumber", dayNumber);
+    this.ScrollTop = (dayNumber - 3) * 30;
+    if (this.selectFestival === 0) {
+      this.howDayNumber = dayNumber;
+    } else if (this.selectFestival === 1) {
+      this.howDayNumber = 5;
+    } else if (this.selectFestival === 2) {
+      this.howDayNumber = 7;
+    } else if (this.selectFestival === 3) {
+      this.howDayNumber = 5;
+    } else if (this.selectFestival === 4) {
+      this.howDayNumber = 62;
+    } else if (this.selectFestival === 5) {
+      this.howDayNumber = 5;
+    } else if (this.selectFestival === 6) {
+      this.howDayNumber = 9;
     }
-    this.handleGetData()
+    this.handleGetData();
   },
-  methods:{
-    async handleGetData(){
+  methods: {
+    async handleGetData() {
       uni.showLoading({
-        title: '正在加载...'
-      })
-      const req = {
-        pushProvinceCode:'340000',
-        StatisticsDate: this.lastDay,
-        holidayType: this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:this.selectFestival===4?6:this.selectFestival===5?7:this.selectFestival===6?8:'',
-        curYear:2024,
-        compareYear:2023,
-      }
-      const data = await request.$webGet('CommercialApi/Revenue/GetHolidayCompare',req)
-      console.log('data',data)
-      let dateList = []
-      let dateList2 = []
+        title: "正在加载...",
+      });
+      // 因为要根据选择的年份节日 来请求数据 判断显示两条 还是两条以上
+      // 根据选择的节日年份 减去 2023 年 看看有几年差 那就要请求几次
+      // 年份差
+      let yearNumber =
+        this.currentFestival.curYear === 2024
+          ? 1
+          : this.currentFestival.curYear - 2023;
 
-      // 去年的具体日期
-      let compareDateList = []
-      // 今年的具体日期
-      let curDateList = []
-      // 去年的最大值
-      let compareDateMax = 0
-
-      let dataObj = data.Result_Data
-      if (dataObj && dataObj.compareList && dataObj.compareList.length>0){
-        dataObj.compareList.forEach(item=>{
-          if(compareDateMax < Number(item.value)){
-            compareDateMax = Number(item.value)
-          }
-          const date = new Date(item.name)
-          let m = date.getMonth() + 1
-          let d = date.getDate()
-          let dateText = `${m}.${d}`
-          item.easyDate = dateText
-          compareDateList.push(moment(item.name).format('YYYY-MM-DD'))
-        })
-      }
-      if (dataObj && dataObj.curList && dataObj.curList.length>0){
-        dataObj.curList.forEach(item=>{
-          const date = new Date(item.name)
-          let m = date.getMonth() + 1
-          let d = date.getDate()
-          let dateText = `${m}.${d}`
-          item.easyDate = dateText
-          curDateList.push(moment(item.name).format('YYYY-MM-DD'))
-        })
-      }
-
-
-
-      if (this.selectFestival===0){
-        for(let i = 1;i<=40;i++){
-          if (i===7){
-            // dateList.push(`北小年`)
-            dateList.push(`大年廿二`)
-          }else if(i===9){
-            dateList.push(`南小年`)
-          }else if(i===15){
-            dateList.push(`大年三十`)
-          }else if(i===16){
-            dateList.push(`春节`)
-          }else if(i===21){
-            dateList.push(`初六`)
-          }else if(i===23){
-            dateList.push(`初八`)
-          }else if(i===25){
-            dateList.push(`初十`)
-          }else if(i===26){
-            dateList.push(`正月十一`)
-          }else if(i===30){
-            dateList.push(`正月十五`)
-          }else if(i===31){
-            dateList.push(`正月十六`)
-          }else{
-            dateList.push(`第${i}天`)
-          }
-        }
-        for(let i = 1;i<=40;i++){
-          dateList2.push(i)
-        }
-      }else if (this.selectFestival===1){
-        for(let i = 1;i<=5;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=5;i++){
-          dateList2.push(i)
-        }
-      }else if (this.selectFestival===2){
-        for(let i = 1;i<=7;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=7;i++){
-          dateList2.push(`第${i}天`)
-        }
-      }else if (this.selectFestival===3){
-        for(let i = 1;i<=5;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=5;i++){
-          dateList2.push(`第${i}天`)
-        }
-      }else if (this.selectFestival===4){
-        for(let i = 1;i<=62;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=62;i++){
-          dateList2.push(`第${i}天`)
-        }
-      }else if (this.selectFestival===5){
-        for(let i = 1;i<=5;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=5;i++){
-          dateList2.push(`第${i}天`)
-        }
-      }else if (this.selectFestival===6){
-        for(let i = 1;i<=9;i++){
-          dateList.push(`第${i}天`)
-        }
-        for(let i = 1;i<=9;i++){
-          dateList2.push(`第${i}天`)
+      let dateList = [];
+      let dayNumber =
+        moment(this.currentFestival.endTime).diff(
+          this.currentFestival.startTime,
+          "days"
+        ) + 1;
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dateList.push(`第${i + 1}天`);
         }
       }
-
-      let max = 0
-      let compareList = []
-      let realCompareList = []
-
-      let curListList = []
-      let realCurList = []
-
-      // 农历日期
-      let tradDateList = []
-
-      if (dataObj){
-        dateList.forEach((item,index)=>{
-          // let beforeValue = dataObj.compareList.filter(filter=> filter.easyDate === item)[0]
-          // beforeValue = beforeValue?beforeValue.value:null
-          let beforeValue
-          if (dataObj.compareList && dataObj.compareList.length>0 && dataObj.compareList[index]){
-            beforeValue = dataObj.compareList[index].value
-          }
-          if (beforeValue){
-            if (Number(beforeValue) / 10000 > max){
-              max = Number(beforeValue) / 10000
-            }
-            compareList.push(Number(beforeValue) / 10000)
-            realCompareList.push(Number(beforeValue))
-          }
-          else{
-            compareList.push(0)
-            realCompareList.push(0)
-          }
-
-          // let compareValue = dataObj.curList.filter(filter=> filter.easyDate === item)[0]
-          // compareValue = compareValue?compareValue.value:null
-          let compareValue
-          if (dataObj.curList && dataObj.curList.length>0 && dataObj.curList[index]){
-            compareValue = dataObj.curList[index].value
-          }
-          if (compareValue){
-            if (Number(compareValue) / 10000 > max){
-              max = Number(compareValue) / 10000
-            }
-            curListList.push(Number(compareValue) / 10000)
-            realCurList.push(Number(compareValue))
-          }else{
-            curListList.push(0)
-            realCurList.push(0)
-          }
-        })
-      }
-      max = this.getSplitNumber(max)
-
-      let list = ['大年十六','大年十七','大年十八','大年十九','大年二十','大年廿一','大年廿二','北小年','南小年','大年廿五','大年廿六','大年廿七',
-        '大年廿八','大年廿九','除夕','春节','正月初二','正月初三','正月初四','正月初五','正月初六','正月初七','正月初八','正月初九','正月初十','正月十一',
-        '正月十二','正月十三','正月十四','元宵','正月十六','正月十七','正月十八','正月十九','正月二十','正月廿一','正月廿二','正月廿三','正月廿四','正月廿五']
-
-
-
-      // compareDateList
-      // curDateList
-
-      let res = {
+      console.log("dateList", dateList);
+      // 正常模式下的图表数据
+      let normalData = {
         categories: dateList,
-        series:[
-          {
-            name:`24年`,
-            data:curListList,
-            real:realCurList,
-            tradDate:list,
-            howDayNumber:this.howDayNumber,
+        series: [],
+      };
+      // 全屏模式下的图表数据
+      let allScreenData = [];
+      for (let i = 0; i < yearNumber; i++) {
+        const req = {
+          pushProvinceCode: "340000",
+          StatisticsDate: this.StatisticsDate,
+          holidayType: this.currentFestival.HolidayType,
+          curYear: 2024 + i,
+          compareYear: 2023 + i,
+        };
+        console.log("req", req);
+        const data = await request.$webGet(
+          "CommercialApi/Revenue/GetHolidayCompare",
+          req
+        );
+        console.log("handleGetData", data);
+
+        // 去年的最大值
+        let compareDateMax = 0;
+        let dataObj = data.Result_Data;
+        // 去年的具体日期
+        let compareDateList = [];
+        // 除以一万的值
+        let compareList = [];
+        // 实际值 不除以一万
+        let realCompareList = [];
+
+        if (dataObj && dataObj.compareList && dataObj.compareList.length > 0) {
+          // 根据字段 拿到开始结束时间 月日  因为年份不好添加 所以只能用月日 来筛选开始结束时间
+          console.log("type", typeof dataObj.compareHoliday);
+          let startIndex = 0;
+          let endIndex = 0;
+          if (dataObj.compareHoliday.indexOf("-") === -1) {
+            let midIndex = 0;
+            let time = dataObj.compareHoliday.replace(".", "/");
+            dataObj.compareList.forEach((item, index) => {
+              let date = new Date(item.name);
+              let dateM = date.getMonth() + 1;
+              if (dateM < 10) {
+                dateM = "0" + dateM;
+              }
+              let dateD = date.getDate();
+              if (dateD < 10) {
+                dateD = "0" + dateD;
+              }
+              let monthDay = `${dateM}/${dateD}`;
+              if (monthDay === time) {
+                midIndex = index;
+              }
+            });
+            startIndex = midIndex - 1;
+            endIndex = midIndex + 1;
+          } else {
+            let [start, end] = dataObj.compareHoliday.split("-");
+            start = start.replace(".", "/");
+            end = end.replace(".", "/");
+            console.log("start", start);
+            console.log("end", end);
+            // 拿到开始结束时间的索引 因为年份不好添加 不好用开始结束时间去判断 所以直接用索引去取
+
+            dataObj.compareList.forEach((item, index) => {
+              let date = new Date(item.name);
+              let dateM = date.getMonth() + 1;
+              if (dateM < 10) {
+                dateM = "0" + dateM;
+              }
+              let dateD = date.getDate();
+              if (dateD < 10) {
+                dateD = "0" + dateD;
+              }
+              let monthDay = `${dateM}/${dateD}`;
+              if (monthDay === start) {
+                startIndex = index;
+              }
+              if (monthDay === end) {
+                endIndex = index;
+              }
+            });
+          }
+
+          // 截取出来的实际数据数组
+          let list = dataObj.compareList.slice(startIndex, endIndex + 1);
+          if (list && list.length > 0) {
+            list.forEach((item) => {
+              realCompareList.push(Number(item.value));
+              compareList.push(Number(item.value) / 10000);
+              const date = new Date(item.name);
+              let m = date.getMonth() + 1;
+              let d = date.getDate();
+              let dateText = `${m}.${d}`;
+              item.easyDate = dateText;
+              compareDateList.push(moment(item.name).format("YYYY-MM-DD"));
+            });
+          }
+        }
+        // 今年的具体日期
+        let curDateList = [];
+        // 除以一万的值
+        let curListList = [];
+        // 实际值 不除以一万
+        let realCurList = [];
+        // 拿到开始结束时间的索引 因为年份不好添加 不好用开始结束时间去判断 所以直接用索引去取
+        let startIndex = 0;
+        let endIndex = 0;
+        if (dataObj && dataObj.curList && dataObj.curList.length > 0) {
+          if (dataObj.curHoliday.indexOf("-") === -1) {
+            let midIndex = 0;
+            let time = dataObj.curHoliday.replace(".", "/");
+            dataObj.curList.forEach((item, index) => {
+              let date = new Date(item.name);
+              let dateM = date.getMonth() + 1;
+              if (dateM < 10) {
+                dateM = "0" + dateM;
+              }
+              let dateD = date.getDate();
+              if (dateD < 10) {
+                dateD = "0" + dateD;
+              }
+              let monthDay = `${dateM}/${dateD}`;
+              if (monthDay === time) {
+                midIndex = index;
+              }
+            });
+            startIndex = midIndex - 1;
+            endIndex = midIndex + 1;
+          } else {
+            // 根据字段 拿到开始结束时间 月日  因为年份不好添加 所以只能用月日 来筛选开始结束时间
+            let [start, end] = dataObj.curHoliday.split("-");
+            start = start.replace(".", "/");
+            end = end.replace(".", "/");
+            console.log("start", start);
+            console.log("end", end);
+
+            dataObj.curList.forEach((item, index) => {
+              let date = new Date(item.name);
+              let dateM = date.getMonth() + 1;
+              if (dateM < 10) {
+                dateM = "0" + dateM;
+              }
+              let dateD = date.getDate();
+              if (dateD < 10) {
+                dateD = "0" + dateD;
+              }
+              let monthDay = `${dateM}/${dateD}`;
+              if (monthDay === start) {
+                startIndex = index;
+              }
+              if (monthDay === end) {
+                endIndex = index;
+              }
+            });
+            // 截取出来的实际数据数组
+            let list = dataObj.curList.slice(startIndex, endIndex + 1);
+            if (list && list.length > 0) {
+              list.forEach((item) => {
+                realCurList.push(Number(item.value));
+                curListList.push(Number(item.value) / 10000);
+                const date = new Date(item.name);
+                let m = date.getMonth() + 1;
+                let d = date.getDate();
+                let dateText = `${m}.${d}`;
+                item.easyDate = dateText;
+                curDateList.push(moment(item.name).format("YYYY-MM-DD"));
+              });
+            }
+
+            console.log("startIndex", startIndex);
+            console.log("endIndex", endIndex);
+            console.log("list", list);
+          }
+        }
+        console.log("compareDateMax", compareDateMax);
+        console.log("compareDateList", compareDateList);
+        console.log("curDateList", curDateList);
+
+        if (i === 0) {
+          normalData.series.push({
+            name: 2023 + i,
+            data: compareList,
+            real: realCompareList,
+            tradDate: list, // 如果是春节模式 要显示农历日期
+            howDayNumber: this.howDayNumber,
             selectFestival: this.selectFestival,
-            // realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
-            realDateList: curDateList
-          },
-          {
-            name:`23年`,
-            data:compareList,
-            real:realCompareList,
-            tradDate:list,
-            howDayNumber:this.howDayNumber,
+            realDateList: compareDateList,
+          });
+          normalData.series.push({
+            name: 2024 + i,
+            data: curListList,
+            real: realCurList,
+            tradDate: list, // 如果是春节模式 要显示农历日期
+            howDayNumber: this.howDayNumber,
             selectFestival: this.selectFestival,
-            // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节
-            // realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25']
-            realDateList: compareDateList
-          },
-        ],
-        max:Number(max.toFixed(2)),
-        selectFestival:this.selectFestival
+            realDateList: curDateList,
+          });
+        } else if (i > 0) {
+          normalData.series.push({
+            name: 2024 + i,
+            data: curListList,
+            real: realCurList,
+            tradDate: list, // 如果是春节模式 要显示农历日期
+            howDayNumber: this.howDayNumber,
+            selectFestival: this.selectFestival,
+            realDateList: curDateList,
+          });
+        }
       }
-      let res2 = {
-        categories: dateList2,
-        series:[
-          {
-            name:`24年`,
-            data:curListList,
-            real:realCurList,
-            tradDate:list,
-            howDayNumber:this.howDayNumber,
-            selectFestival: this.selectFestival,
-            // realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']//劳动节
-            // realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
-            realDateList: curDateList
-          },
-          {
-            name:`23年`,
-            data:compareList,
-            real:realCompareList,
-            tradDate:list,
-            howDayNumber:this.howDayNumber,
-            selectFestival: this.selectFestival,
-            // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节
-            // realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25']
-            realDateList: compareDateList
-          },
-        ],
-        max:Number(max.toFixed(2)),
-      }
-      console.log('res',res)
-      console.log('res2',res2)
-      console.log('compareDateMax',this.getSplitNumber( compareDateMax / 10000))
-      this.res = res
-      this.res2 = res2
+
+      this.res = normalData;
       this.opts = {
-        categories: res.categories,
-        series: res.series,
+        categories: normalData.categories,
+        series: normalData.series,
         animation: false,
         rotate: false,
         rotateLock: false,
         enableScroll: true,
         background: "#FFFFFF",
-        color: ["#1E80FF", "#00B6FF","#ACB9CD"],
+        color: ["#1E80FF", "#00B6FF", "#ACB9CD"],
         padding: [15, 15, 5, 5],
         dataLabel: false,
         legend: {
           show: true,
           position: "bottom",
           lineHeight: 25,
-          float: 'center'
-
+          float: "center",
         },
         xAxis: {
           disableGrid: true,
           itemCount: 6,
-          scrollAlign: 'left',
+          scrollAlign: "left",
           // fontColor:'red',
           // format:"entryCarNumberXFormat"
         },
         yAxis: {
           gridType: "dash",
           dashLength: 2,
-          splitNumber:6,
+          splitNumber: 6,
           data: [
             {
               min: 0,
-              max: this.selectFestival===0?3000:this.selectFestival===4?900:1500
-            }
-          ]
+              max:
+                this.selectFestival === 0
+                  ? 3000
+                  : this.selectFestival === 4
+                  ? 900
+                  : 1500,
+            },
+          ],
         },
         extra: {
           area: {
@@ -561,15 +836,386 @@ export default {
             addLine: true,
             width: 2,
             gradient: true,
-            activeType: "hollow"
+            activeType: "hollow",
+          },
+        },
+      };
+      this.opts2 = {
+        categories: normalData.categories,
+        series: normalData.series,
+        animation: false,
+        rotate: true,
+        rotateLock: false,
+        enableScroll: true,
+        background: "#FFFFFF",
+        color: ["#1E80FF", "#00B6FF", "#ACB9CD"],
+        padding: [15, 15, 5, 5],
+        dataLabel: false,
+        legend: {
+          show: true,
+          position: "bottom",
+          lineHeight: 25,
+          float: "center",
+        },
+        xAxis: {
+          disableGrid: true,
+          itemCount: 15,
+        },
+        yAxis: {
+          gridType: "dash",
+          dashLength: 2,
+          splitNumber: 5,
+          data: [
+            {
+              min: 0,
+              max: 2000,
+            },
+          ],
+        },
+        extra: {
+          area: {
+            type: "curve",
+            opacity: 0.2,
+            addLine: true,
+            width: 2,
+            gradient: true,
+            activeType: "hollow",
+          },
+        },
+      };
+      uni.hideLoading();
+      return;
+      // let dateList = [];
+      // let dateList2 = [];
+
+      // 去年的具体日期
+      let compareDateList = [];
+      // 今年的具体日期
+      let curDateList = [];
+      // 去年的最大值
+      let compareDateMax = 0;
+
+      let dataObj = data.Result_Data;
+      if (dataObj && dataObj.compareList && dataObj.compareList.length > 0) {
+        dataObj.compareList.forEach((item) => {
+          if (compareDateMax < Number(item.value)) {
+            compareDateMax = Number(item.value);
           }
+          const date = new Date(item.name);
+          let m = date.getMonth() + 1;
+          let d = date.getDate();
+          let dateText = `${m}.${d}`;
+          item.easyDate = dateText;
+          compareDateList.push(moment(item.name).format("YYYY-MM-DD"));
+        });
+      }
+      if (dataObj && dataObj.curList && dataObj.curList.length > 0) {
+        dataObj.curList.forEach((item) => {
+          const date = new Date(item.name);
+          let m = date.getMonth() + 1;
+          let d = date.getDate();
+          let dateText = `${m}.${d}`;
+          item.easyDate = dateText;
+          curDateList.push(moment(item.name).format("YYYY-MM-DD"));
+        });
+      }
+
+      if (this.selectFestival === 0) {
+        for (let i = 1; i <= 40; i++) {
+          if (i === 7) {
+            // dateList.push(`北小年`)
+            dateList.push(`大年廿二`);
+          } else if (i === 9) {
+            dateList.push(`南小年`);
+          } else if (i === 15) {
+            dateList.push(`大年三十`);
+          } else if (i === 16) {
+            dateList.push(`春节`);
+          } else if (i === 21) {
+            dateList.push(`初六`);
+          } else if (i === 23) {
+            dateList.push(`初八`);
+          } else if (i === 25) {
+            dateList.push(`初十`);
+          } else if (i === 26) {
+            dateList.push(`正月十一`);
+          } else if (i === 30) {
+            dateList.push(`正月十五`);
+          } else if (i === 31) {
+            dateList.push(`正月十六`);
+          } else {
+            dateList.push(`第${i}天`);
+          }
+        }
+        for (let i = 1; i <= 40; i++) {
+          dateList2.push(i);
+        }
+      } else if (this.selectFestival === 1) {
+        for (let i = 1; i <= 5; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 5; i++) {
+          dateList2.push(i);
+        }
+      } else if (this.selectFestival === 2) {
+        for (let i = 1; i <= 7; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 7; i++) {
+          dateList2.push(`第${i}天`);
+        }
+      } else if (this.selectFestival === 3) {
+        for (let i = 1; i <= 5; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 5; i++) {
+          dateList2.push(`第${i}天`);
+        }
+      } else if (this.selectFestival === 4) {
+        for (let i = 1; i <= 62; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 62; i++) {
+          dateList2.push(`第${i}天`);
+        }
+      } else if (this.selectFestival === 5) {
+        for (let i = 1; i <= 5; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 5; i++) {
+          dateList2.push(`第${i}天`);
+        }
+      } else if (this.selectFestival === 6) {
+        for (let i = 1; i <= 9; i++) {
+          dateList.push(`第${i}天`);
+        }
+        for (let i = 1; i <= 9; i++) {
+          dateList2.push(`第${i}天`);
         }
       }
 
+      let max = 0;
+      let compareList = [];
+      let realCompareList = [];
 
-      let phoneInfo = uni.getStorageSync('phoneInfo')
-      console.log('phoneInfo',phoneInfo)
-      let _this = this
+      let curListList = [];
+      let realCurList = [];
+
+      // 农历日期
+      let tradDateList = [];
+
+      if (dataObj) {
+        dateList.forEach((item, index) => {
+          // let beforeValue = dataObj.compareList.filter(filter=> filter.easyDate === item)[0]
+          // beforeValue = beforeValue?beforeValue.value:null
+          let beforeValue;
+          if (
+            dataObj.compareList &&
+            dataObj.compareList.length > 0 &&
+            dataObj.compareList[index]
+          ) {
+            beforeValue = dataObj.compareList[index].value;
+          }
+          if (beforeValue) {
+            if (Number(beforeValue) / 10000 > max) {
+              max = Number(beforeValue) / 10000;
+            }
+            compareList.push(Number(beforeValue) / 10000);
+            realCompareList.push(Number(beforeValue));
+          } else {
+            compareList.push(0);
+            realCompareList.push(0);
+          }
+
+          // let compareValue = dataObj.curList.filter(filter=> filter.easyDate === item)[0]
+          // compareValue = compareValue?compareValue.value:null
+          let compareValue;
+          if (
+            dataObj.curList &&
+            dataObj.curList.length > 0 &&
+            dataObj.curList[index]
+          ) {
+            compareValue = dataObj.curList[index].value;
+          }
+          if (compareValue) {
+            if (Number(compareValue) / 10000 > max) {
+              max = Number(compareValue) / 10000;
+            }
+            curListList.push(Number(compareValue) / 10000);
+            realCurList.push(Number(compareValue));
+          } else {
+            curListList.push(0);
+            realCurList.push(0);
+          }
+        });
+      }
+      max = this.getSplitNumber(max);
+
+      let list = [
+        "大年十六",
+        "大年十七",
+        "大年十八",
+        "大年十九",
+        "大年二十",
+        "大年廿一",
+        "大年廿二",
+        "北小年",
+        "南小年",
+        "大年廿五",
+        "大年廿六",
+        "大年廿七",
+        "大年廿八",
+        "大年廿九",
+        "除夕",
+        "春节",
+        "正月初二",
+        "正月初三",
+        "正月初四",
+        "正月初五",
+        "正月初六",
+        "正月初七",
+        "正月初八",
+        "正月初九",
+        "正月初十",
+        "正月十一",
+        "正月十二",
+        "正月十三",
+        "正月十四",
+        "元宵",
+        "正月十六",
+        "正月十七",
+        "正月十八",
+        "正月十九",
+        "正月二十",
+        "正月廿一",
+        "正月廿二",
+        "正月廿三",
+        "正月廿四",
+        "正月廿五",
+      ];
+
+      // compareDateList
+      // curDateList
+
+      let res = {
+        categories: dateList,
+        series: [
+          {
+            name: `24年`,
+            data: curListList,
+            real: realCurList,
+            tradDate: list,
+            howDayNumber: this.howDayNumber,
+            selectFestival: this.selectFestival,
+            // realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
+            realDateList: curDateList,
+          },
+          {
+            name: `23年`,
+            data: compareList,
+            real: realCompareList,
+            tradDate: list,
+            howDayNumber: this.howDayNumber,
+            selectFestival: this.selectFestival,
+            // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节
+            // realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25']
+            realDateList: compareDateList,
+          },
+        ],
+        max: Number(max.toFixed(2)),
+        selectFestival: this.selectFestival,
+      };
+      let res2 = {
+        categories: dateList2,
+        series: [
+          {
+            name: `24年`,
+            data: curListList,
+            real: realCurList,
+            tradDate: list,
+            howDayNumber: this.howDayNumber,
+            selectFestival: this.selectFestival,
+            // realDateList: ['2024-04-30','2024-05-01','2024-05-02','2024-05-03','2024-05-04','2024-05-05','2024-05-06']//劳动节
+            // realDateList: ['2024-06-07','2024-06-08','2024-06-09','2024-06-10','2024-06-11']
+            realDateList: curDateList,
+          },
+          {
+            name: `23年`,
+            data: compareList,
+            real: realCompareList,
+            tradDate: list,
+            howDayNumber: this.howDayNumber,
+            selectFestival: this.selectFestival,
+            // realDateList: ['2023-04-28','2023-04-29','2023-04-30','2023-05-01','2023-05-02','2023-05-03','2023-05-04']//劳动节
+            // realDateList: ['2023-06-21','2023-06-22','2023-06-23','2023-06-24','2023-06-25']
+            realDateList: compareDateList,
+          },
+        ],
+        max: Number(max.toFixed(2)),
+      };
+      console.log("res", res);
+      console.log("res2", res2);
+      console.log(
+        "compareDateMax",
+        this.getSplitNumber(compareDateMax / 10000)
+      );
+      this.res = res;
+      this.res2 = res2;
+      this.opts = {
+        categories: res.categories,
+        series: res.series,
+        animation: false,
+        rotate: false,
+        rotateLock: false,
+        enableScroll: true,
+        background: "#FFFFFF",
+        color: ["#1E80FF", "#00B6FF", "#ACB9CD"],
+        padding: [15, 15, 5, 5],
+        dataLabel: false,
+        legend: {
+          show: true,
+          position: "bottom",
+          lineHeight: 25,
+          float: "center",
+        },
+        xAxis: {
+          disableGrid: true,
+          itemCount: 6,
+          scrollAlign: "left",
+          // fontColor:'red',
+          // format:"entryCarNumberXFormat"
+        },
+        yAxis: {
+          gridType: "dash",
+          dashLength: 2,
+          splitNumber: 6,
+          data: [
+            {
+              min: 0,
+              max:
+                this.selectFestival === 0
+                  ? 3000
+                  : this.selectFestival === 4
+                  ? 900
+                  : 1500,
+            },
+          ],
+        },
+        extra: {
+          area: {
+            type: "curve",
+            opacity: 0.2,
+            addLine: true,
+            width: 2,
+            gradient: true,
+            activeType: "hollow",
+          },
+        },
+      };
+
+      let phoneInfo = uni.getStorageSync("phoneInfo");
+      console.log("phoneInfo", phoneInfo);
+      let _this = this;
       this.opts2 = {
         // width:phoneInfo.screenHeight+'px',
         // height:(2*phoneInfo.screenWidth)+'px',
@@ -580,31 +1226,30 @@ export default {
         rotateLock: false,
         enableScroll: true,
         background: "#FFFFFF",
-        color: ["#1E80FF", "#00B6FF","#ACB9CD"],
+        color: ["#1E80FF", "#00B6FF", "#ACB9CD"],
         padding: [15, 15, 5, 5],
         dataLabel: false,
         legend: {
           show: true,
           position: "bottom",
           lineHeight: 25,
-          float: 'center'
-
+          float: "center",
         },
         xAxis: {
           disableGrid: true,
-          itemCount: 15
+          itemCount: 15,
         },
         yAxis: {
           gridType: "dash",
           dashLength: 2,
-          splitNumber:5,
+          splitNumber: 5,
           data: [
             {
               min: 0,
               // max:_this.selectFestival===2?2000:3000
-              max: 2000
-            }
-          ]
+              max: 2000,
+            },
+          ],
         },
         extra: {
           area: {
@@ -613,93 +1258,132 @@ export default {
             addLine: true,
             width: 2,
             gradient: true,
-            activeType: "hollow"
-          }
-        }
-      }
-      uni.hideLoading()
+            activeType: "hollow",
+          },
+        },
+      };
+      uni.hideLoading();
     },
-    handleShowAllScreen(){
-      this.allScreen = !this.allScreen
+    handleShowAllScreen() {
+      this.allScreen = !this.allScreen;
     },
-    getSplitNumber(value){
-      if (value === 0 || value<5){
-        let num = Math.ceil(Number(value))
-        return num
-      }else{
-        let sum = Number(value) + Number(value) *0.2
-        return  Number((Math.ceil(sum / 1000)).toFixed(0)) * 1000
+    getSplitNumber(value) {
+      if (value === 0 || value < 5) {
+        let num = Math.ceil(Number(value));
+        return num;
+      } else {
+        let sum = Number(value) + Number(value) * 0.2;
+        return Number(Math.ceil(sum / 1000).toFixed(0)) * 1000;
       }
     },
     // 写死赋值农历日期
-    handleGetTraditionalDate(){
-      let list = ['大年十六','大年十七','大年十八','大年十九','大年二十','大年廿十一','大年廿十二','大年廿十三','大年廿十四','大年廿十五','大年廿十六','大年廿十七',
-        '大年廿十八','大年廿十九','除夕','春节','正月初二','正月初三','正月初四','正月初五','正月初六','正月初七','正月初八','正月初九','正月初十','正月十一',
-        '正月十二','正月十三','正月十四','元宵','正月十六','正月十七','正月十八','正月十九','正月二十','正月廿十一','正月廿十二','正月廿十三','正月廿十四','正月廿十五']
-    }
-  }
-}
+    handleGetTraditionalDate() {
+      let list = [
+        "大年十六",
+        "大年十七",
+        "大年十八",
+        "大年十九",
+        "大年二十",
+        "大年廿十一",
+        "大年廿十二",
+        "大年廿十三",
+        "大年廿十四",
+        "大年廿十五",
+        "大年廿十六",
+        "大年廿十七",
+        "大年廿十八",
+        "大年廿十九",
+        "除夕",
+        "春节",
+        "正月初二",
+        "正月初三",
+        "正月初四",
+        "正月初五",
+        "正月初六",
+        "正月初七",
+        "正月初八",
+        "正月初九",
+        "正月初十",
+        "正月十一",
+        "正月十二",
+        "正月十三",
+        "正月十四",
+        "元宵",
+        "正月十六",
+        "正月十七",
+        "正月十八",
+        "正月十九",
+        "正月二十",
+        "正月廿十一",
+        "正月廿十二",
+        "正月廿十三",
+        "正月廿十四",
+        "正月廿十五",
+      ];
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-.main{
+.main {
   width: 100%;
   height: 100vh;
-  background: #F3F4F9;
+  background: #f3f4f9;
   box-sizing: border-box;
-  .img{
+  .img {
     width: 100%;
     height: calc(100vh - 64rpx);
     position: fixed;
     box-sizing: border-box;
     padding: 0 32rpx;
     top: 32rpx;
-    .imgContent{
+    .imgContent {
       width: 100%;
       background: #fff;
       padding: 24rpx;
       border-radius: 16rpx;
       box-sizing: border-box;
-      .imgTop{
+      .imgTop {
         width: 100%;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        .unit{
+        .unit {
           margin-left: 24rpx;
           font-size: 24rpx;
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
-          color: #A69E9F;
+          color: #a69e9f;
           line-height: 40rpx;
         }
-        .searchAllScreen{
+        .searchAllScreen {
           display: flex;
           align-items: center;
           justify-content: center;
           border-radius: 8rpx;
           padding: 8rpx 10rpx;
-          border: 2rpx solid #DFDFDF;
+          border: 2rpx solid #dfdfdf;
           background: #fff;
-          .allScreenIcon{
+          .allScreenIcon {
             width: 32rpx;
             height: 32rpx;
           }
-          .text{
+          .text {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #6B6C78;
+            color: #6b6c78;
             line-height: 36rpx;
           }
         }
       }
     }
 
-    .scrollView{
+    .scrollView {
       height: calc(100% - 312px);
       margin-top: 24rpx;
-      .noticeBox{
+      .noticeBox {
         width: 100%;
         height: 400rpx;
         background: #fff;
@@ -707,63 +1391,92 @@ export default {
         border-radius: 16rpx;
         padding: 4rpx;
         position: relative;
-        .springBox{
-          background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FFF1F1 100%);
+        .springBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 233, 229, 0) 0%,
+            #fff1f1 100%
+          );
         }
-        .qmBox{
-          background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
+        .qmBox {
+          background: linear-gradient(
+            360deg,
+            rgba(204, 231, 224, 0) 0%,
+            #cce7e0 100%
+          );
         }
-        .labourBox{
-          background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+        .labourBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 236, 208, 0) 0%,
+            #ffecd0 100%
+          );
         }
-        .dragonBoatBox{
-          background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%);
+        .dragonBoatBox {
+          background: linear-gradient(
+            360deg,
+            rgba(225, 241, 237, 0) 0%,
+            #e1f1ed 100%
+          );
         }
-        .summerHolidayBox{
-          background: linear-gradient( 360deg, rgba(214,238,243,0) 0%, #DCECEF 100%);
+        .summerHolidayBox {
+          background: linear-gradient(
+            360deg,
+            rgba(214, 238, 243, 0) 0%,
+            #dcecef 100%
+          );
         }
-        .midAutumnBox{
-          background: linear-gradient( 360deg, rgba(255,215,180,0) 0%, #FFF3E9 100%);
+        .midAutumnBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 215, 180, 0) 0%,
+            #fff3e9 100%
+          );
         }
-        .nationalDayBox{
-          background: linear-gradient( 360deg, rgba(255,218,210,0) 0%, #FFF2F0 100%);
+        .nationalDayBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 218, 210, 0) 0%,
+            #fff2f0 100%
+          );
         }
-        .boxBg{
+        .boxBg {
           z-index: 1;
           position: absolute;
-          top: 4rpx;left: 4rpx;
+          top: 4rpx;
+          left: 4rpx;
           width: calc(100% - 8rpx);
           height: 192rpx;
           //background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FFF1F1 100%);
           //background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
           border-radius: 16rpx;
         }
-        .contentBox{
+        .contentBox {
           position: absolute;
           z-index: 2;
           width: calc(100% - 8rpx);
           height: 100%;
           box-sizing: border-box;
           padding: 22rpx;
-          .contentIcon{
+          .contentIcon {
             width: 180rpx;
             height: 44rpx;
           }
-          .contentText{
+          .contentText {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             color: #160002;
             line-height: 40rpx;
             //margin-top: 16rpx;
-            .red{
+            .red {
               color: red;
               //color: #226C61;
             }
           }
         }
       }
-      .allPkBox{
+      .allPkBox {
         width: 100%;
         height: 625rpx;
         margin-top: 32rpx;
@@ -772,59 +1485,81 @@ export default {
         border-radius: 16rpx;
         padding: 4rpx;
         position: relative;
-        .springBox{
-          background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FFF1F1 100%);
+        .springBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 233, 229, 0) 0%,
+            #fff1f1 100%
+          );
         }
-        .qmBox{
-          background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
+        .qmBox {
+          background: linear-gradient(
+            360deg,
+            rgba(204, 231, 224, 0) 0%,
+            #cce7e0 100%
+          );
         }
-        .labourBox{
-           background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
-         }
-        .dragonBoatBox{
-          background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%);
+        .labourBox {
+          background: linear-gradient(
+            360deg,
+            rgba(255, 236, 208, 0) 0%,
+            #ffecd0 100%
+          );
         }
-        .summerHolidayBox{
-          background: linear-gradient( 360deg, rgba(214,238,243,0) 0%, #DCECEF 100%);
+        .dragonBoatBox {
+          background: linear-gradient(
+            360deg,
+            rgba(225, 241, 237, 0) 0%,
+            #e1f1ed 100%
+          );
         }
-        .boxBg{
+        .summerHolidayBox {
+          background: linear-gradient(
+            360deg,
+            rgba(214, 238, 243, 0) 0%,
+            #dcecef 100%
+          );
+        }
+        .boxBg {
           z-index: 1;
           position: absolute;
-          top: 4rpx;left: 4rpx;
+          top: 4rpx;
+          left: 4rpx;
           width: calc(100% - 8rpx);
           height: 192rpx;
           //background: linear-gradient(360deg, rgba(255,233,229,0) 0%, #FFF1F1 100%);
           //background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
           border-radius: 16rpx;
         }
-        .pkContent{
+        .pkContent {
           width: 100%;
           box-sizing: border-box;
           position: absolute;
           z-index: 2;
           padding: 22rpx;
-          .contentTop{
+          .contentTop {
             width: 100%;
-            .titleImg{
+            .titleImg {
               width: 144rpx;
               height: 74rpx;
             }
           }
-          .pkBox{
+          .pkBox {
             width: 100%;
             height: 140rpx;
             position: relative;
             box-sizing: border-box;
             margin-bottom: 32rpx;
-            .pkLogo{
+            .pkLogo {
               position: absolute;
               top: 50%;
               left: 50%;
-              transform: translate(-50%,-50%);
+              transform: translate(-50%, -50%);
               width: 88rpx;
               height: 88rpx;
             }
-            .leftBox,.rightBox{
+            .leftBox,
+            .rightBox {
               width: 50%;
               height: 100%;
               box-sizing: border-box;
@@ -834,322 +1569,323 @@ export default {
               position: absolute;
             }
 
-            .leftBox{
-              left: 0;top: 0;
+            .leftBox {
+              left: 0;
+              top: 0;
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png");
               background-repeat: no-repeat;
               background-size: 100% 100%;
-              .value{
+              .value {
                 font-size: 44rpx;
                 //font-family: DINAlternate, DINAlternate;
-                color: #FFFFFF;
+                color: #ffffff;
                 font-weight: bold;
                 line-height: 52rpx;
               }
-              .label{
+              .label {
                 font-size: 28rpx;
                 font-family: PingFangSC, PingFang SC;
-                color: #FFFFFF;
+                color: #ffffff;
                 font-weight: 400;
                 line-height: 40rpx;
               }
             }
-            .springLeftBox{
+            .springLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/leftRed.png");
             }
-            .qmLeftBox{
+            .qmLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg1st.png");
             }
-            .labourLeftBox{
+            .labourLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo1.png");
             }
-            .dragonBoatLeftBox{
+            .dragonBoatLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo1.png");
             }
-            .summerHolidayLeftBox{
+            .summerHolidayLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo1.png");
             }
-            .midAutumnLeftBox{
+            .midAutumnLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo1.png");
             }
-            .nationalDayLeftBox{
+            .nationalDayLeftBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo1.png");
             }
-            .rightBox{
-              right: 0;top: 0;
+            .rightBox {
+              right: 0;
+              top: 0;
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png");
               background-repeat: no-repeat;
               background-size: 100% 100%;
               align-items: flex-end;
-              .value{
+              .value {
                 font-size: 44rpx;
                 //font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
-                color: #FF5A3C;
+                color: #ff5a3c;
                 line-height: 52rpx;
               }
-              .label{
+              .label {
                 font-size: 28rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
-                color: #FF5A3C;
+                color: #ff5a3c;
                 line-height: 40rpx;
               }
             }
-            .springRightBox{
+            .springRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rightPink.png");
             }
-            .qmRightBox{
+            .qmRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg2st.png");
-              .value{
-                color: #2D7E72!important;
+              .value {
+                color: #2d7e72 !important;
               }
-              .label{
-                color: #2D7E72!important;
+              .label {
+                color: #2d7e72 !important;
               }
             }
-            .labourRightBox{
+            .labourRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo2.png");
-              .value{
-                color: #E17900!important;
+              .value {
+                color: #e17900 !important;
               }
-              .label{
-                color: #E17900!important;
+              .label {
+                color: #e17900 !important;
               }
             }
-            .dragonBoatRightBox{
+            .dragonBoatRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo2.png");
-              .value{
-                color: #2F7F4B!important;
+              .value {
+                color: #2f7f4b !important;
               }
-              .label{
-                color: #2F7F4B!important;
+              .label {
+                color: #2f7f4b !important;
               }
             }
-            .summerHolidayRightBox{
+            .summerHolidayRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo2.png");
-              .value{
-                color: #047795!important;
+              .value {
+                color: #047795 !important;
               }
-              .label{
-                color: #047795!important;
+              .label {
+                color: #047795 !important;
               }
             }
-            .midAutumnRightBox{
+            .midAutumnRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo2.png");
-              .value{
-                color: #E54B00!important;
+              .value {
+                color: #e54b00 !important;
               }
-              .label{
-                color: #E54B00!important;
+              .label {
+                color: #e54b00 !important;
               }
             }
-            .nationalDayRightBox{
+            .nationalDayRightBox {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo2.png");
-              .value{
-                color: #DC3C25!important;
+              .value {
+                color: #dc3c25 !important;
               }
-              .label{
-                color: #DC3C25!important;
+              .label {
+                color: #dc3c25 !important;
               }
             }
-            .revenueLeft{
+            .revenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueLeft.png");
             }
-            .qmRevenueLeft{
+            .qmRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg3st.png");
             }
-            .labourRevenueLeft{
+            .labourRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo3.png");
             }
-            .dragonBoatRevenueLeft{
+            .dragonBoatRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo3.png");
             }
-            .summerHolidayRevenueLeft{
+            .summerHolidayRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo3.png");
             }
-            .midAutumnRevenueLeft{
+            .midAutumnRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo3.png");
             }
-            .nationalDayRevenueLeft{
+            .nationalDayRevenueLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo3.png");
             }
-            .revenueRight{
+            .revenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueRight.png");
-              .value{
-                color: #D48F00;
+              .value {
+                color: #d48f00;
               }
-              .label{
-                color: #D48F00;
+              .label {
+                color: #d48f00;
               }
             }
-            .qmRevenueRight{
+            .qmRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg4st.png");
-              .value{
-                color: #3873DD;
+              .value {
+                color: #3873dd;
               }
-              .label{
-                color: #3873DD;
+              .label {
+                color: #3873dd;
               }
             }
-            .labourRevenueRight{
+            .labourRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo4.png");
-              .value{
-                color: #F0490E;
+              .value {
+                color: #f0490e;
               }
-              .label{
-                color: #F0490E;
+              .label {
+                color: #f0490e;
               }
             }
-            .dragonBoatRevenueRight{
+            .dragonBoatRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo4.png");
-              .value{
-                color: #6F8A14;
+              .value {
+                color: #6f8a14;
               }
-              .label{
-                color: #6F8A14;
+              .label {
+                color: #6f8a14;
               }
             }
-            .summerHolidayRevenueRight{
+            .summerHolidayRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo4.png");
-              .value{
-                color: #2F7F4B;
+              .value {
+                color: #2f7f4b;
               }
-              .label{
-                color: #2F7F4B;
+              .label {
+                color: #2f7f4b;
               }
             }
-            .midAutumnRevenueRight{
+            .midAutumnRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo4.png");
-              .value{
-                color: #B77500;
+              .value {
+                color: #b77500;
               }
-              .label{
-                color: #B77500;
+              .label {
+                color: #b77500;
               }
             }
-            .nationalDayRevenueRight{
+            .nationalDayRevenueRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo4.png");
-              .value{
-                color: #E54B00;
+              .value {
+                color: #e54b00;
               }
-              .label{
-                color: #E54B00;
+              .label {
+                color: #e54b00;
               }
             }
-            .carLeft{
+            .carLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carLeft.png");
             }
-            .qmCarLeft{
+            .qmCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg5st.png");
             }
-            .labourCarLeft{
+            .labourCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo5.png");
             }
-            .dragonBoatCarLeft{
+            .dragonBoatCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo5.png");
             }
-            .summerHolidayCarLeft{
+            .summerHolidayCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo5.png");
             }
-            .midAutumnCarLeft{
+            .midAutumnCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo5.png");
             }
-            .nationalDayCarLeft{
+            .nationalDayCarLeft {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo5.png");
             }
-            .carRight{
+            .carRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carRight.png");
-              .value{
-                color: #3873DD;
+              .value {
+                color: #3873dd;
               }
-              .label{
-                color: #3873DD;
+              .label {
+                color: #3873dd;
               }
             }
-            .qmCarRight{
+            .qmCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBg6st.png");
-              .value{
-                color: #0793BB;
+              .value {
+                color: #0793bb;
               }
-              .label{
-                color: #0793BB;
+              .label {
+                color: #0793bb;
               }
             }
-            .labourCarRight{
+            .labourCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourNo6.png");
-              .value{
-                color: #A59301;
+              .value {
+                color: #a59301;
               }
-              .label{
-                color: #A59301;
+              .label {
+                color: #a59301;
               }
             }
-            .dragonBoatCarRight{
+            .dragonBoatCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatNo6.png");
-              .value{
+              .value {
                 color: #218794;
               }
-              .label{
+              .label {
                 color: #218794;
               }
             }
-            .summerHolidayCarRight{
+            .summerHolidayCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayNo6.png");
-              .value{
-                color: #6F8A14;
+              .value {
+                color: #6f8a14;
               }
-              .label{
-                color: #6F8A14;
+              .label {
+                color: #6f8a14;
               }
             }
-            .midAutumnCarRight{
+            .midAutumnCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnNo6.png");
-              .value{
-                color: #A08F00;
+              .value {
+                color: #a08f00;
               }
-              .label{
-                color: #A08F00;
+              .label {
+                color: #a08f00;
               }
             }
-            .nationalDayCarRight{
+            .nationalDayCarRight {
               background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayNo6.png");
-              .value{
-                color: #B77500;
+              .value {
+                color: #b77500;
               }
-              .label{
-                color: #B77500;
+              .label {
+                color: #b77500;
               }
             }
           }
         }
       }
     }
-
   }
-  .allScreen{
+  .allScreen {
     position: fixed;
     top: 0;
     width: 100vh;
     height: 100vh;
     background: black;
     //padding: 5vh 0;
-    .bigBox{
+    .bigBox {
       width: 100vw;
       height: 100vh;
       background: #fff;
-      .bigImg{
+      .bigImg {
         width: 100vw;
         height: calc(100vh - 50rpx);
         background: #fff;
       }
-      .closeBox{
+      .closeBox {
         width: 100vw;
         height: 50rpx;
         display: flex;
         align-items: center;
         justify-content: flex-end;
-        .closeIcon{
+        .closeIcon {
           width: 40rpx;
           height: 40rpx;
           margin-right: 10rpx;
@@ -1158,7 +1894,5 @@ export default {
       }
     }
   }
-
-
 }
 </style>
diff --git a/pages/testPage/index.vue b/pages/testPage/index.vue
new file mode 100644
index 0000000..4e839b8
--- /dev/null
+++ b/pages/testPage/index.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="main">
+    <template v-if="webViewSrc">
+      <web-view
+        id="myWebView"
+        ref="myWebView"
+        :src="webViewSrc"
+        @message="onMessage"
+      ></web-view>
+    </template>
+    <!-- @load="onMinLoad" -->
+
+    <!-- <span @click="handleGetPoint">获取位置信息</span> -->
+  </div>
+  <!-- src="https://saas.eshangtech.com/goaliPay/index.html" -->
+
+  <!-- src="https://ahyd.eshangtech.com/goaliPay/index.html" -->
+</template> 
+  
+<script>
+import { mapGetters } from "vuex";
+export default {
+  data() {
+    return {
+      message: "",
+      webViewSrc: ``,
+      nowObj: {},
+      loginType: "",
+    };
+  },
+  computed: {
+    ...mapGetters({
+      user: "user",
+    }),
+  },
+  async onLoad() {
+    this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+    return;
+
+    let type = uni.getStorageSync("loginType");
+    console.log("loginType", type);
+    this.loginType = type;
+    let obj = {
+      loginType: type,
+      phone: this.user.MEMBERSHIP_MOBILEPHONE,
+    };
+    this.nowObj = obj;
+    const jsonString = JSON.stringify(obj);
+    const encodedData = encodeURIComponent(jsonString);
+    console.log("encodedData", encodedData);
+    if (type === "min") {
+      // const code = await this.login();
+      // console.log("dasldhasodhbasoudh", code);
+      // const codeString = JSON.stringify(code);
+      // const encodedCode = encodeURIComponent(codeString);
+      // console.log("encodedCode", encodedCode);
+      this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+      // https://ahyd.eshangtech.com/goaliPay/index.html
+      // https://saas.eshangtech.com/goaliPay/index.html
+    } else {
+      this.webViewSrc = `https://saas.eshangtech.com/goaliPay/index.html#${encodedData}`;
+    }
+    console.log("this.webViewSrc", this.webViewSrc);
+  },
+  methods: {
+    async onMinLoad() {
+      // console.log("111", 11);
+      // const code = await this.login();
+      // console.log("dasldhasodhbasoudh", code);
+      // const codeString = JSON.stringify(code);
+      // const encodedCode = encodeURIComponent(codeString);
+      // console.log("encodedCode", encodedCode);
+      // this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html#${encodedCode}`;
+      // this.webViewSrc = `https://eshangtech.com/goaliPay/testwx.html`;
+      // console.log("this.webViewSrc", this.webViewSrc);
+    },
+    handleGetPoint() {
+      $wanmeiyizhan.handleGetPosition().then((res) => {});
+    },
+    onMessage(event) {
+      let _this = this;
+      console.log("收到 H5 的消息:", event.detail.data[0]);
+      if (event.detail.data[0].action === "scanCode") {
+        uni.scanCode({
+          success: function (res) {
+            console.log("res", res);
+            _this.sendMessageToH5({ type: "scanCode", res: res });
+          },
+        });
+      } else if (event.detail.data[0].action === "position") {
+        // let req = {
+        //   membershipId: _this.user.MEMBERSHIP_ID,
+        // };
+
+        // _this.$api.$get("/Html5/GetMemberLocation", req).then((res) => {
+        //   console.log("resdasda", res);
+        // });
+
+        plus.geolocation.getCurrentPosition(async function (position) {
+          console.log("当前位置:", position);
+          let res = position.coords;
+          let seatInfo = {
+            latitude: res.latitude,
+            longitude: res.longitude,
+          };
+          _this.sendMessageToH5({ type: "position", res: seatInfo });
+        });
+      } else if (event.detail.data[0].action === "openLocation") {
+        let obj = event.detail.data[0].res;
+        console.log("openLocation", obj);
+        uni.openLocation({
+          latitude: obj.latitude * 1,
+          longitude: obj.longitude * 1,
+          scale: 16, // 缩放比例
+          name: obj.name,
+          address: "", // 这个可能会影响地图的定位，所以可以选择不填
+          success(data) {
+            console.log(data);
+          },
+          fail(err) {
+            console.log(err);
+          },
+        });
+      } else if (event.detail.data[0].action === "openNewPage") {
+        let obj = event.detail.data[0].res;
+        console.log("openNewPage", obj);
+        uni.navigateTo({
+          url: `/pages/thirdParty/newPage?url=${obj.url}&title=${obj.title}`,
+        });
+      } else if (event.detail.data[0].action === "backPage") {
+        uni.navigateBack({
+          delta: 1,
+        });
+      }
+      // event.data 包含 H5 发送过来的消息内容
+    },
+    sendMessageToH5(data) {
+      console.log("收到消息", data);
+      let obj = this.nowObj;
+      obj[data.type] = data.res;
+      this.nowObj = obj;
+      console.log("obj", obj);
+      const jsonString = JSON.stringify(obj);
+      const encodedData = encodeURIComponent(jsonString);
+      console.log("encodedData", encodedData);
+      this.webViewSrc = `https://saas.eshangtech.com/goaliPay/index.html#${encodedData}`;
+      console.log("this.webViewSrc", this.webViewSrc);
+      // const webView = this.$refs.myWebView;
+      // webView.postMessage(data);
+    },
+    async login() {
+      let str = Math.random().toString(36).substr(2, 15);
+      let time = Math.floor(Date.now() / 1000);
+
+      let jsapi_ticket = await this.$api.$get(
+        "/EShangApiMain/WeChat/GetJsapiTicket",
+        {
+          appId: "wx4c497eddcec4a0e7",
+          sourcePlatform: "minprogram",
+          // minprogram
+          // publicprogram
+        }
+      );
+      console.log("jsapi_ticket", jsapi_ticket);
+      const req = {
+        jsapi_ticket: jsapi_ticket.Result_Data,
+        appId: "wx4c497eddcec4a0e7",
+        // wx4c497eddcec4a0e7 min
+        //  wxcf4dbe1815d5d872
+        timestamp: time,
+        nonceStr: str,
+        url: `https://eshangtech.com/goaliPay/testwx.html`,
+        jsApiList: ["openLocation", "getLocation", "scanQRCode"],
+      };
+      console.log("req321312", req);
+      const data = await this.$api.$post(
+        "/EShangApiMain/WeChat/GetConfigSignature",
+        req
+      );
+      console.log("datalogin", data);
+      req.result = data.Result_Data;
+      return req;
+
+      // let str = this.generateNonceStr();
+      // let time = new Date().getTime();
+      // fetch(
+      //   `https://api.eshangtech.com/EShangApiMain/WeChat/GetJsapiTicket?appId=wx4c497eddcec4a0e7&sourcePlatform=minprogram`
+      // )
+      //   .then((response) => response.json())
+      //   .then((data) => {
+      //     wx.config({
+      //       debug: true, // 开启调试模式
+      //       appId: "wx4c497eddcec4a0e7", // 微信公众号或小程序的AppID
+      //       timestamp: time, // 时间戳
+      //       nonceStr: str, // 随机字符串
+      //       signature: data.signature, // 签名
+      //       jsApiList: ["openLocation", "scanQRCode", "getLocation"], // 需要调用的API列表
+      //     });
+
+      //     wx.ready(function () {});
+      //   });
+    },
+    generateNonceStr(length = 16) {
+      let nonceStr = "";
+      const characters =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+      // 使用当前时间戳作为随机种子
+      const timestamp = Date.now();
+      // 拼接时间戳和随机数
+      for (let i = 0; i < length; i++) {
+        nonceStr += characters.charAt(
+          Math.floor(Math.random() * characters.length)
+        );
+      }
+      return nonceStr + timestamp.toString(36).slice(-4); // 添加时间戳的后4位，增加唯一性
+    },
+  },
+};
+</script>
+<style scoped lang="less">
+.main {
+  width: 100vw;
+  height: 100vh;
+}
+</style>
\ No newline at end of file