ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2024-03-04 09:47:24 +08:00
parent 7884f13034
commit 4f760080dc
6 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
node_modules.zip Normal file
View File

Binary file not shown.

2
pages/index/index.vue
View File

@ -2034,7 +2034,7 @@ export default {
// 实时营收 // 实时营收
handleRealRevenue(){ handleRealRevenue(){
let req = { let req = {
pushProvinceCode:this.useInfo.userData.ProvinceCode, pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
StatisticsDate:this.nowDay StatisticsDate:this.nowDay
} }
request.$webGet('CommercialApi/Revenue/GetCurRevenue',req).then(res=>{ request.$webGet('CommercialApi/Revenue/GetCurRevenue',req).then(res=>{

29
pages/nationalPage/merchantRevenue.vue
View File

@ -137,6 +137,7 @@
</template> </template>
<script> <script>
import request from '@/util/index.js' import request from '@/util/index.js'
import moment from "moment";
export default { export default {
name: "merchantRevenue", name: "merchantRevenue",
data() { data() {
@ -182,8 +183,9 @@ export default {
this.useInfo = JSON.parse(JSON.stringify(userInfo)) this.useInfo = JSON.parse(JSON.stringify(userInfo))
this.lastDay = uni.getStorageSync('lastDay') this.lastDay = uni.getStorageSync('lastDay')
if (query.time){ console.log('query',query)
this.currentScroll = 'item'+ query.time if (query.currentScroll){
this.currentScroll = query.currentScroll
}else{ }else{
this.currentScroll = 'item'+ this.lastDay this.currentScroll = 'item'+ this.lastDay
} }
@ -198,19 +200,21 @@ export default {
let lastDays = lastDate.getDate() let lastDays = lastDate.getDate()
this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日` this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日`
// 24年春运开始时间为 1.26 // 24年春运开始时间为 1.26
if (lastMonth === 1){ // if (lastMonth === 1){
dayNumber = lastDays - 26 + 1 // dayNumber = lastDays - 26 + 1
}else{ // }else{
dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
} // }
dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber this.howDayNumber = dayNumber
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=dayNumber;i++){
if (i<7){ dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) // if (i<7){
}else{ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`}) // }else{
} // dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
// }
} }
this.scrollList = dateList this.scrollList = dateList
@ -220,7 +224,6 @@ export default {
let seat = uni.getStorageSync('springService') let seat = uni.getStorageSync('springService')
if (seat){ if (seat){
this.springService = seat this.springService = seat
console.log('this.springService',this.springService)
this.showSpring = true this.showSpring = true
this.dataList = [] this.dataList = []
this.handleGetPageData() this.handleGetPageData()

25
pages/nationalPage/rankPage.vue
View File

@ -195,6 +195,7 @@
</template> </template>
<script> <script>
import request from '@/util/index.js' import request from '@/util/index.js'
import moment from "moment";
export default { export default {
name: "rankPage", name: "rankPage",
data(){ data(){
@ -250,19 +251,21 @@ export default {
let lastDays = lastDate.getDate() let lastDays = lastDate.getDate()
this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日` this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日`
// 24年春运开始时间为 1.26 // 24年春运开始时间为 1.26
if (lastMonth === 1){ // if (lastMonth === 1){
dayNumber = lastDays - 26 + 1 // dayNumber = lastDays - 26 + 1
}else{ // }else{
dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
} // }
dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber this.howDayNumber = dayNumber
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=dayNumber;i++){
if (i<7){ dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) // if (i<7){
}else{ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`}) // }else{
} // dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
// }
} }
this.scrollList = dateList this.scrollList = dateList
this.selectDateText = dateList[dayNumber-1].value this.selectDateText = dateList[dayNumber-1].value
@ -574,7 +577,7 @@ export default {
Serverpart_ID: obj.ServerpartId, Serverpart_ID: obj.ServerpartId,
} }
uni.setStorageSync('springService',springObj) //当前选中服务区信息 uni.setStorageSync('springService',springObj) //当前选中服务区信息
this.$util.toNextRoute('navigateTo', `/pages/nationalPage/merchantRevenue?ServerpartId=${obj.ServerpartId}&type=${this.type}&serverPartList=${JSON.stringify(this.serverPartList)}`) this.$util.toNextRoute('navigateTo', `/pages/nationalPage/merchantRevenue?ServerpartId=${obj.ServerpartId}&type=${this.type}&serverPartList=${JSON.stringify(this.serverPartList)}&currentScroll=${this.currentScroll}`)
} }
} }
} }

29
pages/nationalPage/springTravel.vue
View File

@ -990,24 +990,27 @@ export default {
let lastMonth = lastDate.getMonth() + 1 let lastMonth = lastDate.getMonth() + 1
let lastDays = lastDate.getDate() let lastDays = lastDate.getDate()
// 24年春运开始时间为 1.26 // 24年春运开始时间为 1.26
if (lastMonth === 1){ // if (lastMonth === 1){
dayNumber = lastDays - 26 + 1 // dayNumber = lastDays - 26 + 1
}else{ // }else{
dayNumber = 6 + lastDays // dayNumber = 6 + lastDays
} // }
dayNumber = moment().diff("2024-01-26", "days")
this.howDayNumber = dayNumber this.howDayNumber = dayNumber
let dateList = [] let dateList = []
for (let i = 1;i<=dayNumber;i++){ for (let i = 1;i<=dayNumber;i++){
if (i<7){ dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) // if (i<7){
}else{ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
if (i-6>29){ // }else{
// if (i-6>29){
}else{ // }else{
dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`}) // dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
} // }
} // }
} }
console.log('dateList',dateList)
this.scrollList = dateList this.scrollList = dateList
this.selectDateText = dateList[dayNumber-1].value this.selectDateText = dateList[dayNumber-1].value
uni.showLoading({ uni.showLoading({

3
pages/summaryOfPortraits/index.vue
View File

@ -105,6 +105,7 @@ export default {
console.log('onShow') console.log('onShow')
this.isShowSwiper = true this.isShowSwiper = true
let seat = uni.getStorageSync('currentService') let seat = uni.getStorageSync('currentService')
console.log('seat',seat)
this.serviceInfo = seat this.serviceInfo = seat
}, },
onHide(){ onHide(){
@ -114,7 +115,7 @@ export default {
// 商业汇总的滑动方法 // 商业汇总的滑动方法
handleChangeSelect(e){ handleChangeSelect(e){
console.log('e',e) console.log('e',e)
this.handleChangePreview(true) // this.handleChangePreview(true)
this.selectPortrait = e.detail.current this.selectPortrait = e.detail.current
}, },
// 切换页码 // 切换页码