diff --git a/App.vue b/App.vue index 47f6613..c57dedd 100644 --- a/App.vue +++ b/App.vue @@ -15,6 +15,24 @@ ...mapActions(['memberLogin','getLoginCode']), ...mapMutations(['setVisitChannels']), + handleGetUserInfo(){ + wx.request({ + url: 'https://qifu-api.baidubce.com/ip/local/geo/v1/district', + success(response) { + const data = response.data; + // 处理数据 + let obj = { + ...data.data, + ip: data.ip + } + console.log('obj',obj) + uni.setStorageSync('userInfo',obj) + }, + fail(error) { + // 处理错误 + } + }); + } }, onLaunch: function(options) { uni.getSystemInfo({ @@ -63,13 +81,7 @@ }); - - - - - - - + this.handleGetUserInfo() this.$util.addUserBehavior( {intoRoute: '/'+options.path, outtoRoute: ''}) // 记录用户行为 }, diff --git a/common/utils.js b/common/utils.js index 7c3a9fa..78db376 100644 --- a/common/utils.js +++ b/common/utils.js @@ -180,6 +180,9 @@ function addUserBehavior(obj) { } obj.visitChannels = store.state.visitChannels let userDate = store.state.userData + + let baseInfo = uni.getStorageSync('userInfo') + let req = { userName:userDate.UserName, phoneNumber:userDate.Membership_Phone, @@ -188,7 +191,10 @@ function addUserBehavior(obj) { intoRoute:obj.intoRoute, outtoRoute:obj.outtoRoute, visitChannels:obj.visitChannels, - behaviorRecordDesc:'' + behaviorRecordDesc:'', + LoginIP: baseInfo.ip || '', + LoginPlace: (baseInfo.prov ? baseInfo.prov : '' ) + (baseInfo.prov && baseInfo.city ? '-' : '') + (baseInfo.city ? baseInfo.city : ''), + SOURCE_PLATFORM: '数智化看板' } request.$webGet('CommercialApi/UserBehavior/AddUserBehavior',req).then(() => { diff --git a/manifest.json b/manifest.json index 3b4fc4e..2f4706f 100644 --- a/manifest.json +++ b/manifest.json @@ -74,6 +74,7 @@ }, "usingComponents" : true, "__usePrivacyCheck__": true, + "lazyCodeLoading": "requiredComponents", "permission" : { "scope.userLocation" : { "desc" : "获取位置信息用于展示" diff --git a/pages.json b/pages.json index 39970c7..78da682 100644 --- a/pages.json +++ b/pages.json @@ -9,15 +9,6 @@ "enablePullDownRefresh": true } }, - { - "path": "pages/index/old/index", - "style": - { - "navigationBarTitleText": "驿达数智化看板", - "navigationStyle": "custom", - "enablePullDownRefresh": true - } - }, { "path": "pages/userCenter/userCenter", "style": @@ -42,6 +33,19 @@ } ], "subPackages": [ //分包加载配置 + { + "root": "pages/index/old", + "pages": [ + { + "path": "index", + "style":{ + "navigationBarTitleText": "驿达数智化看板", + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + } + ] + }, { "root": "pages/authorityApproval", "pages": [ @@ -897,12 +901,7 @@ "selectedIconPath": "static/images/tab/homeActive.png", "text": "" }, - { - "pagePath": "pages/index/old/index", - "iconPath": "static/images/tab/home.png", - "selectedIconPath": "static/images/tab/homeActive.png", - "text": "" - }, + { "pagePath": "pages/userCenter/userCenter", "iconPath": "static/images/tab/user.png", diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue index 21ef550..82e2290 100644 --- a/pages/commercialBI/businessPortrait.vue +++ b/pages/commercialBI/businessPortrait.vue @@ -89,7 +89,6 @@ import ConsumptionCompare from "./components/bussiness/consumptionCompare.vue"; import BestsellerShop from "./components/bussiness/bestsellerShop.vue"; import NoData from "./components/noData.vue"; import BandLevel from "./components/format/bandLevel.vue"; -import commercialType from "./commercialType.vue"; import {getFieldEnum} from "../../util/dateTime"; import SliderPage from "./components/sliderPage.vue"; @@ -101,7 +100,7 @@ export default { NoData, BestsellerShop, ConsumptionCompare, - BusinessFormat, LevelTop, analyse, TimePeriodAnalysis, headerTop,transactionAnalysis,commercialType}, + BusinessFormat, LevelTop, analyse, TimePeriodAnalysis, headerTop,transactionAnalysis}, data() { return { topBg:'linear-gradient(180deg, #EDD1AF 0%, #EED7BB 100%);',//顶部组件的悬浮背景色 diff --git a/pages/commercialBI/formatPortrait.vue b/pages/commercialBI/formatPortrait.vue index fc6254b..270691c 100644 --- a/pages/commercialBI/formatPortrait.vue +++ b/pages/commercialBI/formatPortrait.vue @@ -109,12 +109,11 @@ import BandLevel from "./components/format/bandLevel.vue"; import ConsumptionLevel from "./components/format/consumLevel.vue"; import BandNumber from "./components/format/bandNumber.vue"; import NoData from "./components/noData.vue"; -import commercialType from "./commercialType.vue"; import { tableList, wrapTreeNode } from '@/util/dateTime/index' export default { name: "businessPortrait", - components: {NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop,commercialType}, + components: {NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop}, data() { return { topBg:'linear-gradient(180deg, #C6C1F0 0%, #CECBF3 100%);',//顶部组件的悬浮背景色 diff --git a/pages/commercialBI/formatPortraitBI.vue b/pages/commercialBI/formatPortraitBI.vue index d990bb5..89b7b52 100644 --- a/pages/commercialBI/formatPortraitBI.vue +++ b/pages/commercialBI/formatPortraitBI.vue @@ -71,7 +71,6 @@ import BandLevel from "./components/format/bandLevel.vue"; import ConsumptionLevel from "./components/format/consumLevel.vue"; import BandNumber from "./components/format/bandNumber.vue"; import NoData from "./components/noData.vue"; -import commercialType from "./commercialType.vue"; import {getFieldEnum} from "../../util/dateTime"; import SliderPage from "./components/sliderPage.vue"; @@ -79,7 +78,7 @@ export default { name: "businessPortrait", components: { SliderPage, - NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop,commercialType}, + NoData, BandNumber, ConsumptionLevel, BandLevel, FillingDegree, analyse, headerTop}, data() { return { topBg:'linear-gradient(180deg, #C6C1F0 0%, #CECBF3 100%);',//顶部组件的悬浮背景色 diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue index cd08654..4acfb13 100644 --- a/pages/commercialBI/guestPortrait.vue +++ b/pages/commercialBI/guestPortrait.vue @@ -77,14 +77,13 @@ import ConsumPrefer from "./components/guest/consumPrefer.vue"; import ConsumptionLevel from "./components/guest/consumptionLevel.vue"; import BusinessType from "./components/guest/businessType.vue"; import NoData from "./components/noData.vue"; -import commercialType from "./commercialType.vue"; import {getFieldEnum} from "../../util/dateTime"; import SliderPage from "./components/sliderPage.vue"; export default { name: "guestPortrait", components:{ SliderPage, - NoData, BusinessType, ConsumptionLevel, ConsumPrefer, analyse, headerTop,customerFirst,customerSecond,commercialType}, + NoData, BusinessType, ConsumptionLevel, ConsumPrefer, analyse, headerTop,customerFirst,customerSecond}, data() { return { topBg:'linear-gradient(180deg, #A1D0C1 0%, #B1D9CD 100%);',//顶部组件的悬浮背景色 diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue index c669680..2d84198 100644 --- a/pages/commercialBI/managePortrait.vue +++ b/pages/commercialBI/managePortrait.vue @@ -195,7 +195,6 @@ import analyse from "./components/analyse.vue"; import RevenueTrends from "./components/manager/revenueTrends.vue"; import request from '@/util/index.js' import NoData from "./components/noData.vue"; -import commercialType from "./commercialType.vue"; import {getFieldEnum} from "../../util/dateTime"; import SliderPage from "./components/sliderPage.vue"; @@ -203,7 +202,7 @@ export default { name: "businessPortrait", components: { SliderPage, - NoData, RevenueTrends, MoneyCompare, ContractGuarantee, RevenueAnalysis, headerTop,analyse,commercialType}, + NoData, RevenueTrends, MoneyCompare, ContractGuarantee, RevenueAnalysis, headerTop,analyse}, data() { return { topBg:'linear-gradient(180deg, #D9CCEF 0%, #DED3F2 100%);', diff --git a/pages/index/components/menus.js b/pages/index/components/menus.js index 4a3b2f7..4d72053 100644 --- a/pages/index/components/menus.js +++ b/pages/index/components/menus.js @@ -2,8 +2,8 @@ const yewu = [{ "name": "财务审批", "id": "1a2907bd-c2f5-4ef9-9ead-70496650ace6", "modelName": "FinancialApproval", - "imagePath": "/static/images/index/cwsp.png", - "noImagePath": "/static/images/index/cwsp-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/cwsp.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/cwsp-no.png", "homeUrl": "/pages/expenseApproval/expenseApproval" }, { "name": "招标投标", @@ -16,23 +16,23 @@ const yewu = [{ "name": "服务区报销", "id": "8fea5036-d67e-476e-9e56-5f379ba6ae18", "modelName": "ServerPartFinancialApproval", - "imagePath": "/static/images/index/fwqbx.png", - "noImagePath": "/static/images/index/fwqbx-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/fwqbx.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/fwqbx-no.png", "homeUrl": "/pages/serviceAreaReimbursement/serviceAreaReimbursement" }, { "name": "合同审批", "id": "ac661db4-1af1-4732-88db-76bc05eec335", "modelName": "ServerPartCompactApproval", - "imagePath": "/static/images/index/htsp.png", - "noImagePath": "/static/images/index/htsp-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/htsp.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/htsp-no.png", "homeUrl": "/pages/contract/contract" }]; const work = [{ "name": "公文阅办", "id": "2580cb9f-ad2c-4d0b-b478-0be52eaf6ef6", "modelName": "Publicity", - "imagePath": "/static/images/index/gwyb.png", - "noImagePath": "/static/images/index/gwyb-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/gwyb.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/gwyb-no.png", "homeUrl": "/pages/officialDocManagement/officialDocManagement" }, { @@ -40,14 +40,14 @@ const work = [{ "id": "c870b1bc-95c8-473d-81c8-8596eb793bd4", "modelName": "Publicity", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/publicity.png", - "noImagePath": "/static/images/index/publicity-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/publicity-no.png", "homeUrl": "/pages/publicity/publicity" }, { "name": "请假加班", "id": "1ceeaa5c-d11e-4dcd-8d33-0c3df4cd4937", "modelName": "Publicity", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qjjb.png", - "noImagePath": "/static/images/index/qjjb-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qjjb-no.png", "homeUrl": "/pages/askForLeave/askForLeave" }, { @@ -78,46 +78,46 @@ const scene = [{ "name": "走动式管理", "id": "c26c1620-2149-4b3d-ac2e-07e0c0494042", "modelName": "Mbwa", - "imagePath": "/static/images/index/zdsgl.png", - "noImagePath": "/static/images/index/zdsgl-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/zdsgl.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/zdsgl-no.png", "homeUrl": "/pages/mbwa/mbwa" }, { "name": "投诉建议", "id": "d405ae13-3388-41c0-a5f6-d11194d0a943", "modelName": "Suggestion", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/tsjy.png", - "noImagePath": "/static/images/index/tsjy-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/tsjy-no.png", "homeUrl": "/pages/suggestion/suggestion" }, { "name": "收银稽核", "id": "ebd8cae4-d36d-4ea0-a7e9-61e566bf9e24", "modelName": "cashAudit", - "imagePath": "/static/images/index/syjh.png", - "noImagePath": "/static/images/index/syjh-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/syjh.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/syjh-no.png", "homeUrl": "/pages/cashAudit/list" }, { "name": "稽核异常", "id": "b548740f-a942-4de3-8d55-c0a2370171ba", "modelName": "abnormalaudit", - "imagePath": "/static/images/index/syjh.png", - "noImagePath": "/static/images/index/syjh-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/syjh.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/syjh-no.png", "homeUrl": "/pages/abnormalaudit/index" }, { "name": "设备巡检", "id": "", "modelName": "", - "imagePath": "/static/images/index/sbxj.png", - "noImagePath": "/static/images/index/sbxj-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/sbxj.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/sbxj-no.png", "homeUrl": "" }, { "name": "物业管理", "id": "", "modelName": "", - "imagePath": "/static/images/index/wygl.png", - "noImagePath": "/static/images/index/wygl-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/wygl.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/wygl-no.png", "homeUrl": "" }, ] @@ -126,7 +126,7 @@ const management = [{ "id": "74934d31-385a-4eed-80bb-9c9ed7da29b5", "modelName": "EverdayRenven", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/mrys.png", - "noImagePath": "/static/images/index/mrys-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/mrys-no.png", "homeUrl": "/pages/everdayRenven/index" }, { @@ -164,22 +164,22 @@ const management = [{ "name": "商业BI", "id": "9125e837-1961-4d92-bdc1-2200260d9643", "modelName": "AnnualData", - "imagePath": "/static/images/index/ndsj.png", - "noImagePath": "/static/images/index/ndsj-no.png", + "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/ndsj.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/ndsj-no.png", "homeUrl": "/pages/webview/webview?src=https://eshangtech.com/questionnarie/business" }, { "name": "权限审批", "id": "c802a38f-3bbd-4db0-89b6-34e404c8d8cc", "modelName": "authorityApproval", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qxsp.png", - "noImagePath": "/static/images/index/qxsp-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qxsp-no.png", "homeUrl": "/pages/authorityApproval/index" }, { "name": "资质审批", "id": "d0bc5a4d-c509-4b22-ba2b-01ae675852d6", "modelName": "commodity_temp", "imagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qxsp.png", - "noImagePath": "/static/images/index/qxsp-no.png", + "noImagePath": "https://eshangtech.com/ShopICO/ahyd-BID/index/qxsp-no.png", "homeUrl": "/pages/commodity_temp/index" } ] diff --git a/pages/index/index.vue b/pages/index/index.vue index 00d3f23..77ed396 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -123,7 +123,7 @@ - + 请输入想看的服务区 @@ -1049,8 +1049,8 @@ isShowFestival==='labour'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourLogo.png': isShowFestival==='dragonBoat'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatIcon.png': isShowFestival==='summerHoliday'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayIcon.png': - isShowFestival==='midAutumn'?'': - isShowFestival==='nationalDay'?'': + isShowFestival==='midAutumn'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnIcon.png': + isShowFestival==='nationalDay'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayIcon.png': isShowFestival==='other'? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg':''"/> @@ -1517,7 +1517,7 @@ export default { components: {SliderPage, RateCharts, MonthCharts, Tabbar,uniPopup,UniDataSelect,NumberScroll}, data() { const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) - // const lastDay = '2024-09-14' + // const lastDay = '2024-09-30' const nowDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD') return { localdata:[{text:'全局版',value:1},{text:'业务版',value:2}], @@ -1682,13 +1682,13 @@ export default { 'midAutumn':{ name: 'midAutumn', title: '中秋节', - startTime: '2024-09-13', + startTime: '2024-09-14', endTime: '2024-09-18' },// 中秋节 'nationalDay':{ name: 'nationalDay', title: '国庆节', - startTime: '2024-09-29', + startTime: '2024-09-30', endTime: '2024-10-08' },// 国庆节 },// 2024年的全部节日 @@ -1702,9 +1702,12 @@ export default { userInfo = JSON.parse(userInfo) if (this.isReturn===true){ // 无权限就会跳转到无数据的页面 - if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ + if (userInfo.userData && userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ this.isReturn = false }else{ + this.$util.addUserBehavior({ + intoRoute: `/pages/commercialBI/noData` + }) uni.redirectTo({ url:`/pages/commercialBI/noData?type=noAuthor` }) @@ -1802,7 +1805,7 @@ export default { for(let key in this.festivalObj){ let obj = this.festivalObj[key] - if(new Date(obj.startTime).getTime() < new Date(this.lastDay).getTime() && new Date(this.lastDay).getTime() < new Date(obj.endTime).getTime()){ + if(new Date(obj.startTime).getTime() <= new Date(this.lastDay).getTime() && new Date(this.lastDay).getTime() < new Date(obj.endTime).getTime()){ this.isShowFestival = obj.name } } @@ -1874,10 +1877,16 @@ export default { let userInfo = uni.getStorageSync('vuex') userInfo = JSON.parse(userInfo) this.useInfo = JSON.parse(JSON.stringify(userInfo)) + + console.log('userInfo3232312321312',userInfo) + // 判断有没有权限 - if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ + if (userInfo.userData && userInfo.userData.UserId && userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){ this.isReturn = false }else{ + this.$util.addUserBehavior({ + intoRoute: `/pages/commercialBI/noData` + }) uni.redirectTo({ url:`/pages/commercialBI/noData?type=noAuthor` }) @@ -1995,14 +2004,20 @@ export default { this.selectVersion = e uni.setStorageSync('version',this.selectVersion) if (this.selectVersion===2){ - uni.switchTab({ + this.$util.addUserBehavior({ + intoRoute: `/pages/index/old/index` + }) + uni.redirectTo({ url:`/pages/index/old/index` }) } }, // 跳转去老版本首页 goOldIndexPage(){ - uni.switchTab({ + this.$util.addUserBehavior({ + intoRoute: `/pages/index/old/index` + }) + uni.redirectTo({ url:`/pages/index/old/index` }) }, diff --git a/pages/index/old/index.vue b/pages/index/old/index.vue index 8cdc3f6..bb883fb 100644 --- a/pages/index/old/index.vue +++ b/pages/index/old/index.vue @@ -38,7 +38,7 @@ - + 请输入想看的服务区 diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue index d21cbfc..f813662 100644 --- a/pages/nationalPage/merchantRevenue.vue +++ b/pages/nationalPage/merchantRevenue.vue @@ -296,8 +296,8 @@ export default { this.howDayNumber = dayNumber }else{ this.howDayNumber = 62 - this.currentScroll = 'item'+ '2024-09-01' - this.lastDay = '2024-09-01' + this.currentScroll = 'item'+ '2024-08-31' + this.lastDay = '2024-08-31' this.allDateDay = '2024-09-01' } }else if (this.selectFestival===5){ @@ -616,6 +616,12 @@ export default { .summerHolidayTop{ background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png"); } + .midAutumnTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important; + } + .nationalDayTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important; + } .top{ width: 100%; height: 324rpx; @@ -640,6 +646,12 @@ export default { .headerSummerHoliday{ background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png"); } + .headerMidAutumn{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important; + } + .headerNationalDay{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important; + } .header{ position: fixed; width: 100%; @@ -801,7 +813,12 @@ export default { .summerHolidayContentTop{ background: linear-gradient( 360deg, rgba(214,238,243,0) 0%, #D1E9EE 100%); } - + .midAutumnContentTop{ + background: linear-gradient( 360deg, rgba(255,215,180,0) 0%, #FFF3E9 100%); + } + .nationalDayContentTop{ + background: linear-gradient( 360deg, rgba(255,218,210,0) 0%, #FFF2F0 100%); + } .contentTop{ width: 100%; height: 120rpx; @@ -936,6 +953,16 @@ export default { color: #007797!important; } } + .midAutumnNav{ + .selectItem{ + color: #DA5015; + } + } + .nationalDayNav{ + .selectItem{ + color: #D52020; + } + } } .sortBox{ diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue index 2e5ed76..7a813ef 100644 --- a/pages/nationalPage/rankPage.vue +++ b/pages/nationalPage/rankPage.vue @@ -354,8 +354,8 @@ export default { this.howDayNumber = dayNumber }else{ this.howDayNumber = 62 - this.currentScroll = 'item'+ '2024-09-01' - this.lastDay = '2024-09-01' + this.currentScroll = 'item'+ '2024-08-31' + this.lastDay = '2024-08-31' this.allDateDay = '2024-09-01' } }else if (this.selectFestival===5){ @@ -393,9 +393,9 @@ export default { }else if (this.selectFestival===4){ dateList.push({label:`第${i}天`,value:moment("2024-06-30").add(i, 'days').format("YYYY-MM-DD")})// 端午 }else if (this.selectFestival===5){ - dateList.push({label:`第${i}天`,value:moment("2024-09-13").add(i, 'days').format("YYYY-MM-DD")})// 端午 + dateList.push({label:`第${i}天`,value:moment("2024-09-13").add(i, 'days').format("YYYY-MM-DD")})// 中秋 }else if (this.selectFestival===6){ - dateList.push({label:`第${i}天`,value:moment("2024-09-29").add(i, 'days').format("YYYY-MM-DD")})// 端午 + dateList.push({label:`第${i}天`,value:moment("2024-09-29").add(i, 'days').format("YYYY-MM-DD")})// 国庆 } // if (i<7){ // dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`}) @@ -741,6 +741,12 @@ export default { .summerHolidayTop{ background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png"); } + .midAutumnTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important; + } + .nationalDayTop{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important; + } .top{ width: 100%; height: 324rpx; @@ -764,6 +770,12 @@ export default { .summerHolidayBoat{ background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png"); } + .midAutumnBoat{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important; + } + .nationalDayBoat{ + background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important; + } .header{ position: fixed; width: 100%; @@ -811,6 +823,14 @@ export default { .summerHolidayTitleBox{ background: linear-gradient( 360deg, rgba(214,238,243,0) 0%, #D1E9EE 100%); } + .midAutumnTitleBox{ + background: linear-gradient( 360deg, rgba(255,215,180,0) 0%, #FFF3E9 100%); + } + .nationalDayTitleBox{ + background: linear-gradient( 360deg, rgba(255,218,210,0) 0%, #FFF2F0 100%); + } + + .revenueDetailTitleBox{ width: 100%; height: 90rpx; @@ -948,6 +968,16 @@ export default { color: #007797!important; } } + .midAutumnNav{ + .selectItem{ + color: #DA5015; + } + } + .nationalDayNav{ + .selectItem{ + color: #D52020; + } + } } .dateText{ font-size: 24rpx; diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue index 9defd35..8ef6fce 100644 --- a/pages/nationalPage/springTravel.vue +++ b/pages/nationalPage/springTravel.vue @@ -96,8 +96,9 @@ selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayAllData.png': ''" /> {{`/统计到${allDateDay}`}} - /共统计节日数据5天 + /共统计节日数据5天 /共统计节日数据7天 + /共统计节日数据9天 {{`/统计到${allDateDay}`}}
@@ -669,8 +670,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#3E8958': selectFestival===4?'#007797': - selectFestival===5?'#3E8958': - selectFestival===6?'#3E8958': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">
对客销售 /万元 @@ -681,8 +682,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#226C61': selectFestival===4?'#007797': - selectFestival===5?'#226C61': - selectFestival===6?'#226C61': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 对客销售 /万元 @@ -714,8 +715,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#D14702': selectFestival===4?'#007797': - selectFestival===5?'#D14702': - selectFestival===6?'#D14702': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 营业收入 /万元 @@ -862,8 +863,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#226C61': selectFestival===4?'#007797': - selectFestival===5?'#226C61': - selectFestival===6?'#226C61': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 营业收入 /万元 @@ -905,8 +906,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#D14702': selectFestival===4?'#007797': - selectFestival===5?'#D14702': - selectFestival===6?'#D14702': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 入区车流 /万辆 @@ -1054,8 +1055,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#3E8958': selectFestival===4?'#007797': - selectFestival===5?'#3E8958': - selectFestival===6?'#3E8958': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 入区车流 /万辆 @@ -1097,8 +1098,8 @@ selectFestival===2?'#D14702': selectFestival===3?'#226C61': selectFestival===4?'#007797': - selectFestival===5?'#3E8958': - selectFestival===6?'#3E8958': + selectFestival===5?'#DA5015': + selectFestival===6?'#D52020': ''}">服务区排名 - + + diff --git a/static/images/index/cwsp-no.png b/static/images/index/cwsp-no.png deleted file mode 100644 index 0cfcac5..0000000 Binary files a/static/images/index/cwsp-no.png and /dev/null differ diff --git a/static/images/index/cwsp.png b/static/images/index/cwsp.png deleted file mode 100644 index 470dfa6..0000000 Binary files a/static/images/index/cwsp.png and /dev/null differ diff --git a/static/images/index/fwqbx-no.png b/static/images/index/fwqbx-no.png deleted file mode 100644 index 37465ac..0000000 Binary files a/static/images/index/fwqbx-no.png and /dev/null differ diff --git a/static/images/index/fwqbx.png b/static/images/index/fwqbx.png deleted file mode 100644 index 8dff370..0000000 Binary files a/static/images/index/fwqbx.png and /dev/null differ diff --git a/static/images/index/gwyb-no.png b/static/images/index/gwyb-no.png deleted file mode 100644 index 1a4d256..0000000 Binary files a/static/images/index/gwyb-no.png and /dev/null differ diff --git a/static/images/index/gwyb.png b/static/images/index/gwyb.png deleted file mode 100644 index d292103..0000000 Binary files a/static/images/index/gwyb.png and /dev/null differ diff --git a/static/images/index/htsp-no.png b/static/images/index/htsp-no.png deleted file mode 100644 index c7c3889..0000000 Binary files a/static/images/index/htsp-no.png and /dev/null differ diff --git a/static/images/index/htsp.png b/static/images/index/htsp.png deleted file mode 100644 index dfb7e7a..0000000 Binary files a/static/images/index/htsp.png and /dev/null differ diff --git a/static/images/index/mrys-no.png b/static/images/index/mrys-no.png deleted file mode 100644 index 0ca6cf5..0000000 Binary files a/static/images/index/mrys-no.png and /dev/null differ diff --git a/static/images/index/ndsj-no.png b/static/images/index/ndsj-no.png deleted file mode 100644 index 466156e..0000000 Binary files a/static/images/index/ndsj-no.png and /dev/null differ diff --git a/static/images/index/ndsj.png b/static/images/index/ndsj.png deleted file mode 100644 index 0519991..0000000 Binary files a/static/images/index/ndsj.png and /dev/null differ diff --git a/static/images/index/publicity-no.png b/static/images/index/publicity-no.png deleted file mode 100644 index b49f2cb..0000000 Binary files a/static/images/index/publicity-no.png and /dev/null differ diff --git a/static/images/index/qjjb-no.png b/static/images/index/qjjb-no.png deleted file mode 100644 index b498ca8..0000000 Binary files a/static/images/index/qjjb-no.png and /dev/null differ diff --git a/static/images/index/qxsp-no.png b/static/images/index/qxsp-no.png deleted file mode 100644 index 3cac3b8..0000000 Binary files a/static/images/index/qxsp-no.png and /dev/null differ diff --git a/static/images/index/sbxj-no.png b/static/images/index/sbxj-no.png deleted file mode 100644 index eeb4913..0000000 Binary files a/static/images/index/sbxj-no.png and /dev/null differ diff --git a/static/images/index/sbxj.png b/static/images/index/sbxj.png deleted file mode 100644 index 9a276c1..0000000 Binary files a/static/images/index/sbxj.png and /dev/null differ diff --git a/static/images/index/syjh-no.png b/static/images/index/syjh-no.png deleted file mode 100644 index 4cbbb82..0000000 Binary files a/static/images/index/syjh-no.png and /dev/null differ diff --git a/static/images/index/syjh.png b/static/images/index/syjh.png deleted file mode 100644 index fa6808b..0000000 Binary files a/static/images/index/syjh.png and /dev/null differ diff --git a/static/images/index/tsjy-no.png b/static/images/index/tsjy-no.png deleted file mode 100644 index 26ddb3a..0000000 Binary files a/static/images/index/tsjy-no.png and /dev/null differ diff --git a/static/images/index/wygl-no.png b/static/images/index/wygl-no.png deleted file mode 100644 index 0c11646..0000000 Binary files a/static/images/index/wygl-no.png and /dev/null differ diff --git a/static/images/index/wygl.png b/static/images/index/wygl.png deleted file mode 100644 index dfb8fa6..0000000 Binary files a/static/images/index/wygl.png and /dev/null differ diff --git a/static/images/index/zdsgl-no.png b/static/images/index/zdsgl-no.png deleted file mode 100644 index 146750d..0000000 Binary files a/static/images/index/zdsgl-no.png and /dev/null differ diff --git a/static/images/index/zdsgl.png b/static/images/index/zdsgl.png deleted file mode 100644 index eba96c9..0000000 Binary files a/static/images/index/zdsgl.png and /dev/null differ diff --git a/static/images/seach/searchIcon.svg b/static/images/seach/searchIcon.svg deleted file mode 100644 index b41ec63..0000000 --- a/static/images/seach/searchIcon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file