From 3e3f701b79c41152da016fb231f91ca82afad5e1 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Wed, 3 Apr 2024 19:50:51 +0800 Subject: [PATCH] update --- pages/index/index.vue | 8 ++++---- pages/nationalPage/merchantRevenue.vue | 6 +++--- pages/nationalPage/rankPage.vue | 13 +++++++------ pages/nationalPage/springTravel.vue | 17 ++++++++--------- pages/nationalPage/testPage.vue | 1 - 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 66c8847..bc8cb5a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1610,7 +1610,7 @@ export default { currentMoney:'', showMoreFixed:false,// 显示悬浮框 profitSharingList:[],// 分润占比旁边的list - isShowFestival:'spring',// 显示的节日 + isShowFestival:'qm',// 显示的节日 } }, watch:{ @@ -1704,9 +1704,9 @@ export default { ...mapGetters({'user':'getUser'}) }, onLoad(option){ - if (new Date('2024-04-04 00:00:01').getTime() > new Date('2024-04-04 00:00:00').getTime()){ - this.isShowFestival = 'qm' - } + // if (new Date().getTime() > new Date('2024-04-04 00:00:00').getTime()){ + // this.isShowFestival = 'qm' + // } const _this = this // setTimeout(()=>{ // _this.moneyRateList = [0,0] diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue index d1fed38..a9692ce 100644 --- a/pages/nationalPage/merchantRevenue.vue +++ b/pages/nationalPage/merchantRevenue.vue @@ -188,8 +188,8 @@ export default { userInfo = JSON.parse(userInfo) this.useInfo = JSON.parse(JSON.stringify(userInfo)) - // this.lastDay = uni.getStorageSync('lastDay') - this.lastDay = '2024-04-03' + this.lastDay = uni.getStorageSync('lastDay') + // this.lastDay = '2024-04-03' console.log('query',query) if (this.selectFestival===0){ if (query.currentScroll){ @@ -221,7 +221,7 @@ export default { dayNumber = moment().diff("2024-01-26", "days") this.howDayNumber = dayNumber<=40?dayNumber:40 }else if(this.selectFestival===1){ - dayNumber = moment('2024-04-04').diff("2024-04-03", "days") + dayNumber = moment().diff("2024-04-03", "days") this.howDayNumber = dayNumber<=3?dayNumber:3 } let dateList = [] diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue index 9e6c239..1bcc647 100644 --- a/pages/nationalPage/rankPage.vue +++ b/pages/nationalPage/rankPage.vue @@ -230,8 +230,8 @@ export default { if (query.type){ this.type = Number(query.type) } - // this.lastDay = uni.getStorageSync('lastDay') - this.lastDay = '2024-04-03' + this.lastDay = uni.getStorageSync('lastDay') + // this.lastDay = '2024-04-03' if (query.festivalType){ this.selectFestival = Number(query.festivalType) @@ -272,7 +272,7 @@ export default { dayNumber = moment().diff("2024-01-26", "days") this.howDayNumber = dayNumber<=40?dayNumber:40 }else if(this.selectFestival===1){ - dayNumber = moment('2024-04-04').diff("2024-04-03", "days") + dayNumber = moment().diff("2024-04-03", "days") this.howDayNumber = dayNumber<=3?dayNumber:3 } let dateList = [] @@ -288,9 +288,10 @@ export default { // dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`}) // } } - 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() }, methods:{ diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue index ad45f8c..3d8831b 100644 --- a/pages/nationalPage/springTravel.vue +++ b/pages/nationalPage/springTravel.vue @@ -974,14 +974,14 @@ export default { entryCarDailyAdd:0,// 每日车流增幅 entryCarDailyNumber:0,// 每日车流增长 - selectFestival: 0,// 选择的节日 + selectFestival: 1,// 选择的节日 festivalList:[{label:'平安春运',value:1},{label:'清明节',value:2}],// 节日列表 } }, async onLoad(query){ - if (new Date('2024-04-05 00:00:01').getTime() > new Date('2024-04-05 00:00:00').getTime()){ - this.selectFestival = 1 - } + // if (new Date().getTime() > new Date('2024-04-05 00:00:00').getTime()){ + // this.selectFestival = 1 + // } // 获取手机参数对页面进行适配 let systemInfo = uni.getSystemInfoSync() @@ -1000,8 +1000,8 @@ export default { this.curYear = y this.compareYear = y - 1 - // this.lastDay = uni.getStorageSync('lastDay') - this.lastDay = '2024-04-03' + this.lastDay = uni.getStorageSync('lastDay') + // this.lastDay = '2024-04-03' // this.currentScroll = 'item'+ uni.getStorageSync('lastDay') if (this.selectFestival===0){ this.currentScroll = 'item'+ '2024-03-05' @@ -1026,9 +1026,8 @@ export default { if (this.selectFestival===0){ dayNumber = moment().diff("2024-01-26", "days") }else if (this.selectFestival===1){ - dayNumber = moment('2024-04-04').diff("2024-04-03", "days") + dayNumber = moment().diff("2024-04-03", "days") } - console.log('dayNumber',dayNumber) if (this.selectFestival===0){ this.howDayNumber = dayNumber<=40?dayNumber:40 }else if (this.selectFestival===1){ @@ -1103,7 +1102,7 @@ export default { if (this.selectFestival===0){ dayNumber = moment().diff("2024-01-26", "days") }else if (this.selectFestival===1){ - dayNumber = moment("2024-04-04").diff("2024-04-03", "days") + dayNumber = moment().diff("2024-04-03", "days") } if (this.selectFestival===0){ this.howDayNumber = dayNumber<=40?dayNumber:40 diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue index 38bcd5b..259517c 100644 --- a/pages/nationalPage/testPage.vue +++ b/pages/nationalPage/testPage.vue @@ -127,7 +127,6 @@ export default { } }, onLoad(query){ - console.log('query',query) if (query.detailObj){ this.giveTrendObj = JSON.parse(query.detailObj) }