diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 28f2c07..1e2840a 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -391,7 +391,7 @@
? $util.getMoney(pageData.lYearRevenue.data / 10000)
: "0.00"
}}
- {{compareYear}}年/万元
+ {{ compareYear }}年/万元
![]()
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -1021,7 +1023,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -1195,7 +1199,7 @@
? $util.getMoney(pageData.lYearAccount.data / 10000)
: "0.00"
}}
- {{compareYear|| "" }}年/万元
+ {{ compareYear || "" }}年/万元
![]()
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -1622,7 +1628,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -1796,7 +1804,7 @@
? $util.getMoney(pageData.lYearBayonet.data / 10000)
: "0.00"
}}
- {{compareYear|| "" }}年/万辆
+ {{ compareYear || "" }}年/万辆
![]()
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -2220,7 +2230,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -2886,7 +2898,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -3554,7 +3568,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -3642,7 +3658,9 @@
{{ curYear || "" }}年
- {{compareYear|| "" }}年
+
+ {{ compareYear || "" }}年
+
增长
增幅
@@ -3898,7 +3916,7 @@ export default {
curYear: 2025,
compareYear: 2024,
startTime: "2025-01-14",
- endTime: "2025-02-23",
+ endTime: "2025-02-22",
lastYearStart: "2024/01/26",
lastYearEnd: "2024/03/05",
},
@@ -4108,7 +4126,7 @@ export default {
// 当前最大的时间 （索引）
let maxIndex = 0;
this.defaultFestivalList.forEach((item, index) => {
- if (new Date(item.endTime).getTime() < nowTime) {
+ if (new Date(item.endTime).getTime() <= nowTime) {
if (maxTime < new Date(item.endTime).getTime()) {
maxTime = new Date(item.endTime).getTime();
maxObj = item;
@@ -4128,6 +4146,7 @@ export default {
console.log("当前节日的索引", currentIndex);
console.log("当前节日的对象", currentObj);
console.log("当前节日", this.selectFestival);
+ console.log("当前节日currentObj", currentObj);
// 到此已经拿到了当前节日的基础数据 下面要根据节日去搞出他的列表数据
// 分为两种情况 1、当前时间在这个时间范围内容 那么天数数组就到当前时间为止
@@ -4155,10 +4174,12 @@ export default {
this.currentHoliday = dayNumber;
this.currentScroll = "item" + this.lastDay;
this.StatisticsDate = this.lastDay;
- } else if (new Date(currentObj.endTime).getTime() < nowTime) {
+ } else if (new Date(currentObj.endTime).getTime() <= nowTime) {
// 当前时间已经过了这个时间范围了
- let dayNumber =
- moment(currentObj.endTime).diff(currentObj.startTime, "days") + 1;
+ let dayNumber = moment(currentObj.endTime).diff(
+ currentObj.startTime,
+ "days"
+ )+ 1;
console.log("dayNumber", dayNumber);
if (dayNumber > 0) {
for (let i = 0; i < dayNumber; i++) {
@@ -4171,8 +4192,14 @@ export default {
}
}
this.currentHoliday = dayNumber;
- this.currentScroll = "item" + currentObj.endTime;
- this.StatisticsDate = currentObj.endTime;
+ this.currentScroll =
+ "item" +
+ moment(currentObj.startTime)
+ .add(dayNumber - 1, "days")
+ .format("YYYY-MM-DD");
+ this.StatisticsDate = moment(currentObj.startTime)
+ .add(dayNumber - 1, "days")
+ .format("YYYY-MM-DD");
}
}
console.log("dayList", dayList);
@@ -4454,10 +4481,10 @@ export default {
this.currentHoliday = dayNumber;
this.currentScroll = "item" + this.lastDay;
this.StatisticsDate = this.lastDay;
- } else if (new Date(currentObj.endTime).getTime() < nowTime) {
+ } else if (new Date(currentObj.endTime).getTime() <= nowTime) {
// 当前时间已经过了这个时间范围了
let dayNumber =
- moment(currentObj.endTime).diff(currentObj.startTime, "days") + 1;
+ moment(currentObj.endTime).diff(currentObj.startTime, "days") + 1 ;
console.log("dayNumber", dayNumber);
if (dayNumber > 0) {
for (let i = 0; i < dayNumber; i++) {
@@ -4470,8 +4497,12 @@ export default {
}
}
this.currentHoliday = dayNumber;
- this.currentScroll = "item" + currentObj.endTime;
- this.StatisticsDate = currentObj.endTime;
+ this.currentScroll = "item" + moment(currentObj.startTime)
+ .add(dayNumber - 1, "days")
+ .format("YYYY-MM-DD");
+ this.StatisticsDate = moment(currentObj.startTime)
+ .add(dayNumber - 1, "days")
+ .format("YYYY-MM-DD");
}
}
console.log("dayList", dayList);
@@ -5509,6 +5540,7 @@ export default {
// 跳转到门店详情页面
handleGoShopDetail() {
// ServerpartIds=416&time=2024-01-31&ProvinceCode=340000
+ console.log("this.currentScroll", this.currentScroll);
let time = this.currentScroll.split("item")[1];
this.$util.toNextRoute(
"navigateTo",
@@ -5519,6 +5551,7 @@ export default {
},
// 跳转更多记录的页面
handleGoMorePage(type) {
+ console.log("this.currentScroll", this.currentScroll);
let time = this.currentScroll.split("item")[1];
this.$util.toNextRoute(
"navigateTo",
diff --git a/pages/robot/index.vue b/pages/robot/index.vue
index 6bc97c8..0a168a4 100644
--- a/pages/robot/index.vue
+++ b/pages/robot/index.vue
@@ -1,5 +1,6 @@
-
+
+