diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue index ffef7a2..e6d7d2c 100644 --- a/pages/nationalPage/merchantRevenue.vue +++ b/pages/nationalPage/merchantRevenue.vue @@ -187,7 +187,7 @@ export default { if (query.currentScroll){ this.currentScroll = query.currentScroll }else{ - this.currentScroll = 'item'+ this.lastDay + this.currentScroll = 'item'+ '2024-03-05' } // 拿到是春运开始的第几天 @@ -206,9 +206,9 @@ export default { // dayNumber = 6 + lastDays // } dayNumber = moment().diff("2024-01-26", "days") - this.howDayNumber = dayNumber + this.howDayNumber = dayNumber<=40?dayNumber:40 let dateList = [] - for (let i = 1;i<=dayNumber;i++){ + for (let i = 1;i<=this.howDayNumber;i++){ dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) // if (i<7){ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue index 815b220..cd69104 100644 --- a/pages/nationalPage/rankPage.vue +++ b/pages/nationalPage/rankPage.vue @@ -232,7 +232,7 @@ export default { if (query.time){ this.currentScroll = 'item'+ query.time }else{ - this.currentScroll = 'item'+ this.lastDay + this.currentScroll = 'item'+ '2024-03-05' } this.ServerpartIds = query.ServerpartIds @@ -256,10 +256,10 @@ export default { // }else{ // dayNumber = 6 + lastDays // } - dayNumber = moment().diff("2024-01-26", "days") - this.howDayNumber = dayNumber + dayNumber = moment().diff("2024-01-26", "days") + this.howDayNumber = dayNumber<=40?dayNumber:40 let dateList = [] - for (let i = 1;i<=dayNumber;i++){ + for (let i = 1;i<=this.howDayNumber;i++){ dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) // if (i<7){ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) @@ -268,7 +268,7 @@ export default { // } } this.scrollList = dateList - this.selectDateText = dateList[dayNumber-1].value + this.selectDateText = dateList[this.howDayNumber-1].value this.handleGetData() }, @@ -575,7 +575,7 @@ export default { 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)}¤tScroll=${this.currentScroll}`) } diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue index 25c9c4c..92152bf 100644 --- a/pages/nationalPage/springTravel.vue +++ b/pages/nationalPage/springTravel.vue @@ -979,7 +979,8 @@ export default { this.compareYear = y - 1 this.lastDay = uni.getStorageSync('lastDay') - this.currentScroll = 'item'+ uni.getStorageSync('lastDay') + // this.currentScroll = 'item'+ uni.getStorageSync('lastDay') + this.currentScroll = 'item'+ '2024-03-05' const lastDate = new Date(this.lastDay) let lastM = lastDate.getMonth() + 1 let lastD = lastDate.getDate() @@ -995,11 +996,12 @@ export default { // }else{ // dayNumber = 6 + lastDays // } - dayNumber = moment().diff("2024-01-26", "days") - this.howDayNumber = dayNumber + dayNumber = moment().diff("2024-01-26", "days") + console.log('dayNumber',dayNumber) + this.howDayNumber = dayNumber<=40?dayNumber:40 let dateList = [] - for (let i = 1;i<=dayNumber;i++){ - dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) + for (let i = 1;i<=this.howDayNumber;i++){ + dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")}) // if (i<7){ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) // }else{ @@ -1012,7 +1014,7 @@ export default { } console.log('dateList',dateList) this.scrollList = dateList - this.selectDateText = dateList[dayNumber-1].value + this.selectDateText = dateList[this.howDayNumber-1].value uni.showLoading({ title: '正在加载...' })