diff --git a/pages.json b/pages.json index 1323756..c85d005 100644 --- a/pages.json +++ b/pages.json @@ -82,6 +82,18 @@ } ] }, + { + "root": "pages/nationalPage", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + } + ] + }, { "root": "pages/revenue", "pages": [ diff --git a/pages/index/index.vue b/pages/index/index.vue index 9507d87..c3e1369 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -380,6 +380,29 @@ +
+
+
+ +
+ +
+ 欢度国庆 + +
+
+
+ +
+
+

{{item.value || '-'}}

+

{{item.title}}{{item.unit}}

+ +
+
+
+
+ @@ -749,6 +772,11 @@ export default { popupType:'center', popupShow:false, popup:true, + nationalDayList:[ + {title:'当日营收',unit:'/万元',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueBg.svg'}, + {title:'当日车流',unit:'/辆',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/carIcon.svg'}, + {title:'车流增幅Top1',unit:'',value:'',bg:'https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/add.png'}, + ], tabTypeList:[ { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg', path: '/pages/commercialBI/carPortrait', name: '车流'}, { imgUrl: '/static/images/index/guest.svg', path: '/pages/commercialBI/guestPortrait', name: '客群' }, @@ -1023,7 +1051,21 @@ export default { }, methods:{ ...mapActions(['memberLogin','getLoginCode']), - + // 拿到国庆数据 + async handleGetNationalData(){ + let req = { + pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000', + StatisticsEndDate:this.lastDay, + ShowGrowthRate:true + } + const data = await request.$webGet('CommercialApi/BigData/GetBayonetGrowthAnalysis',req) + this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.noDecimal(data.Result_Data.sumEntryCount):'' + this.nationalDayList[2].value = data.Result_Data.GrowthList[0].Entry_GrowthRate>0?'+' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%':'-' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%' + console.log('拿到国庆数据data',data) + }, + goToNational(){ + this.$util.toNextRoute('navigateTo', `/pages/nationalPage/index?time=${this.lastDay}`) + }, handleShowTrafficDetail(){ this.showMonthDetail = !this.showMonthDetail }, @@ -1222,6 +1264,8 @@ export default { this.handleGetDailyPatrol() // 获取全省平均车流量 this.handleGetAllCarTraffic() + // 国庆数据 + this.handleGetNationalData() } else if (this.user.Membership_Id){ // 默认 // 不是从推送进来 走正常的请求方法 // if (!this.PushAuthority){return} @@ -1246,6 +1290,8 @@ export default { this.handleGetDailyPatrol() // 获取全省平均车流量 this.handleGetAllCarTraffic() + // 国庆数据 + this.handleGetNationalData() } // 老代码 不知道干啥用的 @@ -1663,9 +1709,11 @@ export default { if (str==='first'){ this.yesObj = result.RevenuePushModel + if (this.yesObj){ let indexYes = (result.RevenuePushModel.CashPay / 10000).toString().indexOf('.') this.yesObj.CashPay = (result.RevenuePushModel.CashPay / 10000).toString().substring(0,indexYes+3) + this.nationalDayList[0].value = this.$util.fmoney(this.yesObj.CashPay,2) } if (result.GrowthRate){ this.yesObjCompared = result.GrowthRate @@ -1876,7 +1924,6 @@ export default { let index1= (this.showTableData.CashPay / 10000).toString().indexOf('.') this.showTableData.CashPayChange = (this.showTableData.CashPay / 10000).toString().substring(0,index1+3) - // for (let key in this.showTableData){ // if (this.showTableData[key]){ // // 在有值的前提下 @@ -3510,6 +3557,102 @@ $iphoneHeight: env(safe-area-inset-bottom); } } + .nationalDay{ + width: calc(100% - 64rpx); + height: 286rpx; + margin-left: 32rpx; + border-radius: 16rpx; + background: linear-gradient(135deg, rgba(255, 238, 232, 1) 0%, rgba(255, 238, 231, 1) 79%, rgba(255, 221, 215, 1) 100%); + //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/indexBg.svg"); + //background-repeat: no-repeat; + //background-size: 100% 100%; + .national{ + box-sizing: border-box; + padding: 0 24rpx 24rpx; + width: 100%; + height: 100%; + .nationalTop{ + width: 100%; + display: flex; + align-items: center; + .lanternImg{ + width: 104rpx; + height: 126rpx; + margin-left: 8rpx; + } + .titleBox{ + width: 300rpx; + height: 60rpx; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/titleBox.svg"); + background-repeat: no-repeat; + background-size: contain; + padding-left: 36rpx; + box-sizing: border-box; + display: flex; + transform: translateX(-30px); + align-items: center; + .title{ + display: flex; + align-items: center; + .text{ + font-size: 32rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 600; + color: #E93113; + line-height: 44rpx; + } + .rightIcon{ + width: 32rpx; + height: 32rpx; + margin-left: 16rpx; + } + } + } + } + .nationalContent{ + width: 100%; + display: flex; + justify-content: space-between; + .itemContent{ + width: calc((100% - 32rpx)/3); + box-sizing: border-box; + padding: 24rpx 16rpx; + background: #FFFAF7; + box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(162,4,4,0.1); + border-radius: 12rpx; + border: 2rpx solid #FFFFFF; + overflow: hidden; + position: relative; + .itemBg{ + position: absolute; + bottom: 0;right: 0; + width: 100rpx; + height: 100rpx; + } + .value{ + font-size: 32rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E23038; + line-height: 40rpx; + margin-bottom: 8rpx; + } + .title{ + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 500; + color: rgba(120, 107, 108, 1); + line-height: 36rpx; + span{ + margin-left: 4rpx; + } + } + } + } + } + + } + .otherFunBox{ width: 100%; box-sizing: border-box; diff --git a/pages/nationalPage/index.vue b/pages/nationalPage/index.vue new file mode 100644 index 0000000..036ce27 --- /dev/null +++ b/pages/nationalPage/index.vue @@ -0,0 +1,598 @@ + + + + + + + diff --git a/static/public/fontNational/qL6Y7kMqM7Kt.woff b/static/public/fontNational/qL6Y7kMqM7Kt.woff new file mode 100644 index 0000000..12ed61c Binary files /dev/null and b/static/public/fontNational/qL6Y7kMqM7Kt.woff differ diff --git a/static/public/fontNational/stylesheet.css b/static/public/fontNational/stylesheet.css new file mode 100644 index 0000000..8a28f97 --- /dev/null +++ b/static/public/fontNational/stylesheet.css @@ -0,0 +1,8 @@ +@font-face { + font-family: 'Alimama ShuHeiTi'; + src:url("/static/public/fontNational/qL6Y7kMqM7Kt.woff"); + font-weight: bold; + font-style: normal; + font-display: swap; +} +