first commit

This commit is contained in:
cclu 2025-04-03 18:46:23 +08:00
parent a1908a2aad
commit a4b56b1e0c
2 changed files with 58 additions and 24 deletions

View File

@ -434,7 +434,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- 增长 / 23 -->
@ -1021,7 +1023,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- 增长 / 23 -->
@ -1238,7 +1242,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- 增长 / 23 -->
@ -1622,7 +1628,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- 增长 / 23 -->
@ -1836,7 +1844,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- 增长 / 23 -->
@ -2220,7 +2230,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- <div class="titleItem" style="width: 130rpx">同比去年</div>-->
@ -2886,7 +2898,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- <div class="titleItem" style="width: 130rpx">同比去年</div>-->
@ -3554,7 +3568,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- <div class="titleItem" style="width: 130rpx">同比去年</div>-->
@ -3642,7 +3658,9 @@
<div class="titleItem" style="width: 110rpx">
{{ curYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">{{compareYear|| "" }}</div>
<div class="titleItem" style="width: 110rpx">
{{ compareYear || "" }}
</div>
<div class="titleItem" style="width: 110rpx">增长</div>
<div class="titleItem" style="width: 110rpx">增幅</div>
<!-- <div class="titleItem" style="width: 130rpx">同比去年</div>-->
@ -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,7 +4481,7 @@ 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 ;
@ -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",

View File

@ -1,5 +1,6 @@
<template>
<web-view src="https://ahyd.eshangtech.com/robot/"></web-view>
<web-view src="https://eshangtech.com/deepseek/"></web-view>
<!-- <web-view src="https://ahyd.eshangtech.com/robot/"></web-view> -->
<!-- <web-view src="https://saas.eshangtech.com/robot/robot"></web-view> -->
<!-- <view class="main" v-if="false">
<view