This commit is contained in:
cclu 2024-04-03 19:50:51 +08:00
parent 0409da422c
commit 3e3f701b79
5 changed files with 22 additions and 23 deletions

View File

@ -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]

View File

@ -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 = []

View File

@ -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}`})
// }
}
if(dateList && dateList.length>0){
this.scrollList = dateList
this.selectDateText = dateList[this.howDayNumber-1].value
}
this.handleGetData()
},
methods:{

View File

@ -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

View File

@ -127,7 +127,6 @@ export default {
}
},
onLoad(query){
console.log('query',query)
if (query.detailObj){
this.giveTrendObj = JSON.parse(query.detailObj)
}