From 1254d54064bf535c672de35a6be602e65df39651 Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Thu, 28 Dec 2023 20:03:28 +0800 Subject: [PATCH] update --- common/utils.js | 1 + pages.json | 35 +- pages/commercialBI/businessPortrait.vue | 3 +- pages/commercialBI/commercialType.vue | 2 +- pages/commercialBI/components/headerTop.vue | 21 +- .../components/manager/revenueAnalysis.vue | 6 +- pages/commercialBI/components/sliderPage.vue | 230 +- pages/commercialBI/formatPortraitBI.vue | 3 +- pages/commercialBI/guestPortrait.vue | 4 +- pages/commercialBI/managePortrait.vue | 7 +- pages/commercialBI/serviceMessage.vue | 80 +- .../carPortrait.vue | 784 +-- pages/commercialBINew/commercialType.vue | 211 + pages/commercialBINew/components/analyse.vue | 94 + .../components/bussiness/bestsellerShop.vue | 168 + .../components/bussiness/businessFormat.vue | 129 + .../bussiness/consumptionCompare.vue | 176 + .../components/bussiness/levelTop.vue | 137 + .../bussiness/timePeriodAnalysis.vue | 136 + .../bussiness/transactionAnalysis.vue | 143 + .../components/car/carTypeTime.vue | 0 .../components/car/entryRate.vue | 0 .../components/car/entryZone.vue | 0 .../components/car/homePlace.vue | 0 .../components/car/monthTotal.vue | 0 .../components/car/percentEntry.vue | 0 .../components/car/timeAnalysis.vue | 0 .../components/format/bandLevel.vue | 208 + .../components/format/bandNumber.vue | 201 + .../components/format/consumLevel.vue | 139 + .../components/format/fillingDegree.vue | 151 + .../components/guest/businessType.vue | 99 + .../components/guest/consumPrefer.vue | 115 + .../components/guest/consumptionLevel.vue | 326 ++ .../components/guest/customerFirst.vue | 369 ++ .../components/guest/customerSecond.vue | 296 + .../commercialBINew/components/headerTop.vue | 648 +++ .../components/manager/contractGuarantee.vue | 81 + .../components/manager/moneyCompare.vue | 243 + .../components/manager/revenueAnalysis.vue | 326 ++ .../components/manager/revenueTrends.vue | 151 + pages/commercialBINew/components/noData.vue | 61 + .../commercialBINew/components/sliderPage.vue | 267 + pages/examine/commercialType.vue | 2 +- pages/examine/detail.vue | 24 +- pages/examine/sliderPage.vue | 241 +- pages/index/components/sliderPage.vue | 52 + pages/index/index.vue | 2864 ++++++---- pages/index/new_file.html | 0 pages/index/old/index.vue | 5059 +++++++++++++++++ pages/map/commercialType.vue | 2 +- pages/map/detail.vue | 40 +- pages/map/index.vue | 8 +- pages/map/sliderPage.vue | 243 +- pages/newamine/index.vue | 17 +- pages/userCenter/userCenter.vue | 2 +- 56 files changed, 12937 insertions(+), 1668 deletions(-) rename pages/{commercialBI => commercialBINew}/carPortrait.vue (82%) create mode 100644 pages/commercialBINew/commercialType.vue create mode 100644 pages/commercialBINew/components/analyse.vue create mode 100644 pages/commercialBINew/components/bussiness/bestsellerShop.vue create mode 100644 pages/commercialBINew/components/bussiness/businessFormat.vue create mode 100644 pages/commercialBINew/components/bussiness/consumptionCompare.vue create mode 100644 pages/commercialBINew/components/bussiness/levelTop.vue create mode 100644 pages/commercialBINew/components/bussiness/timePeriodAnalysis.vue create mode 100644 pages/commercialBINew/components/bussiness/transactionAnalysis.vue rename pages/{commercialBI => commercialBINew}/components/car/carTypeTime.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/entryRate.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/entryZone.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/homePlace.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/monthTotal.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/percentEntry.vue (100%) rename pages/{commercialBI => commercialBINew}/components/car/timeAnalysis.vue (100%) create mode 100644 pages/commercialBINew/components/format/bandLevel.vue create mode 100644 pages/commercialBINew/components/format/bandNumber.vue create mode 100644 pages/commercialBINew/components/format/consumLevel.vue create mode 100644 pages/commercialBINew/components/format/fillingDegree.vue create mode 100644 pages/commercialBINew/components/guest/businessType.vue create mode 100644 pages/commercialBINew/components/guest/consumPrefer.vue create mode 100644 pages/commercialBINew/components/guest/consumptionLevel.vue create mode 100644 pages/commercialBINew/components/guest/customerFirst.vue create mode 100644 pages/commercialBINew/components/guest/customerSecond.vue create mode 100644 pages/commercialBINew/components/headerTop.vue create mode 100644 pages/commercialBINew/components/manager/contractGuarantee.vue create mode 100644 pages/commercialBINew/components/manager/moneyCompare.vue create mode 100644 pages/commercialBINew/components/manager/revenueAnalysis.vue create mode 100644 pages/commercialBINew/components/manager/revenueTrends.vue create mode 100644 pages/commercialBINew/components/noData.vue create mode 100644 pages/commercialBINew/components/sliderPage.vue create mode 100644 pages/index/components/sliderPage.vue delete mode 100644 pages/index/new_file.html create mode 100644 pages/index/old/index.vue diff --git a/common/utils.js b/common/utils.js index f33604e..c6bba96 100644 --- a/common/utils.js +++ b/common/utils.js @@ -301,6 +301,7 @@ function getThisMonthHave(value){ return `${y}-${m}` } + // 输入时间拿到月份 输出月份的字符串 function getThisTimeMonth(value){ const date = new Date(value) diff --git a/pages.json b/pages.json index 1aa627e..7ea6e29 100644 --- a/pages.json +++ b/pages.json @@ -156,16 +156,30 @@ } ] }, - { // 商业BI - "root": "pages/commercialBI", + { + "root": "pages/commercialBINew", "pages": [ + { + "path": "flowAnalysis", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom", + "disableScroll": true + } + }, { "path": "carPortrait", "style": { "navigationBarTitleText": "", "navigationStyle": "custom" } - }, + } + ] + }, + { // 商业BI + "root": "pages/commercialBI", + "pages": [ + { "path": "guestPortrait", "style": { @@ -277,20 +291,7 @@ } ] }, - { - // 商业BI新版 - "root": "pages/commercialBINew", - "pages": [ - { - "path": "flowAnalysis", - "style": { - "navigationBarTitleText": "", - "navigationStyle": "custom", - "disableScroll": true - } - } - ] - }, + { "root": "pages/plan", "pages": [ diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue index cd76017..c06dc89 100644 --- a/pages/commercialBI/businessPortrait.vue +++ b/pages/commercialBI/businessPortrait.vue @@ -6,8 +6,7 @@ - + :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType" :pageIndex="4"/>
diff --git a/pages/commercialBI/commercialType.vue b/pages/commercialBI/commercialType.vue index 595f820..48c4b41 100644 --- a/pages/commercialBI/commercialType.vue +++ b/pages/commercialBI/commercialType.vue @@ -34,7 +34,7 @@ export default { data(){ return { typeList:[ - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBI/carPortrait',text:'车流'}, + {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBINew/carPortrait',text:'车流'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/guest.svg',url:'/pages/commercialBI/guestPortrait',text:'客群'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/business_icon.svg',url:'/pages/commercialBI/managePortrait',text:'经营'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/trade.svg',url:'/pages/commercialBI/businessPortrait',text:'交易'}, diff --git a/pages/commercialBI/components/headerTop.vue b/pages/commercialBI/components/headerTop.vue index 8b5a145..cf09619 100644 --- a/pages/commercialBI/components/headerTop.vue +++ b/pages/commercialBI/components/headerTop.vue @@ -26,6 +26,9 @@
+ + +
@@ -42,7 +45,7 @@ -
+
{{serviceTypeObj[serviceInfoObj.SERVERPART_TYPE]}}
@@ -93,8 +96,10 @@ diff --git a/pages/commercialBI/formatPortraitBI.vue b/pages/commercialBI/formatPortraitBI.vue index cdd56c1..e169416 100644 --- a/pages/commercialBI/formatPortraitBI.vue +++ b/pages/commercialBI/formatPortraitBI.vue @@ -6,8 +6,7 @@ - + :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType" :pageIndex="5"/>

品牌指数

diff --git a/pages/commercialBI/guestPortrait.vue b/pages/commercialBI/guestPortrait.vue index 469bc1c..47070a6 100644 --- a/pages/commercialBI/guestPortrait.vue +++ b/pages/commercialBI/guestPortrait.vue @@ -6,8 +6,8 @@ - + :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType" :pageIndex="2"/> +
diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue index be57fb8..6a4ae4b 100644 --- a/pages/commercialBI/managePortrait.vue +++ b/pages/commercialBI/managePortrait.vue @@ -6,8 +6,7 @@ - + :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType" :pageIndex="3"/>

营收分析{{lastDay}}

@@ -497,6 +496,10 @@ export default { const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',req) console.log('data22222',data) this.monthDetail = data.Result_Data.RevenuePushModel + if (this.serviceInfo.SERVERPART_NAME!=='安徽驿达' && this.monthDetail.BudgetRevenue){ + this.monthDetail.comparePlan = Number(this.$util.getMoney(((this.monthDetail.CashPay/this.monthDetail.BudgetRevenue)-1)*100)) + console.log('monthDetail',this.monthDetail) + } }, async getRevenueList(){ diff --git a/pages/commercialBI/serviceMessage.vue b/pages/commercialBI/serviceMessage.vue index 277a3da..27d59c2 100644 --- a/pages/commercialBI/serviceMessage.vue +++ b/pages/commercialBI/serviceMessage.vue @@ -29,15 +29,15 @@
-
- 车流数据 -
+ 车流数据 + +
- {{serviceInfo.SERVERPART_NAME?serviceInfo.SERVERPART_NAME.split('服务区')[0]:''}} + {{item.Serverpart_Name || ''}}
@@ -65,7 +65,7 @@
-
+
@@ -98,6 +98,15 @@ export default { } this.searchText = this.time console.log('this.serviceInfo',this.serviceInfo) + }, + onShow(){ + let storeServiceInfo = uni.getStorageSync('currentService') + let nearServiceInfo = uni.getStorageSync('nearService') + if (!storeServiceInfo){ + this.serviceInfo = nearServiceInfo + }else{ + this.serviceInfo = storeServiceInfo + } this.getCarData() }, methods:{ @@ -111,17 +120,33 @@ export default { }, handleGoSelectService() { uni.navigateTo({ - url:`/pages/map/index?chartType=${true}&page=/pages/commercialBI/carPortrait&serviceInfo=${JSON.stringify(this.serviceInfo)}` + url:`/pages/map/index?chartType=${true}&page=/pages/commercialBINew/carPortrait&serviceInfo=${JSON.stringify(this.serviceInfo)}` }) }, getCarData(){ - request.$webGet('CommercialApi/BigData/GetMonthAnalysis',{ - // StatisticsDate: this.time, - StartDate:this.time, - EndDate:this.time, - // Serverpart_ID :this.serviceInfo.Serverpart_ID!==0?this.serviceInfo.Serverpart_ID:null, - // Serverpart_ID :419, - }).then(res=>{ + this.regionList=[] + uni.showLoading({ + title:'加载中' + }) + const date = new Date(this.time) + const y = date.getFullYear() + let m = date.getMonth() + 1 + if (m<10){ + m = '0' + m + } + let req + if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){ + req = { + StatisticsMonth:`${y}${m}`, + } + }else{ + req = { + StatisticsMonth:`${y}${m}`, + Serverpart_ID :this.serviceInfo.Serverpart_ID || "", + } + } + request.$webGet('CommercialApi/BigData/GetProvinceMonthAnalysis',req).then(res=>{ + console.log('res',res) this.carData = res.Result_Data.List this.carData.forEach(item=>{ item.Serverpart_ID = this.serviceInfo.Serverpart_ID @@ -129,6 +154,7 @@ export default { }) this.regionList = this.carData console.log('this.carData',this.carData) + uni.hideLoading() // let sumObj = { // Serverpart_Name:'', // Serverpart_Region:'', @@ -150,9 +176,9 @@ export default { // this.regionList = [sumObj] }) }, - handleNoneChild(obj){ - this.regionList.forEach(item=>{ - if (item.name === obj.name){ + handleNoneChild(obj,selectIndex){ + this.regionList.forEach((item,index)=>{ + if (item.name === obj.name && index===selectIndex){ item.showChild = !item.showChild } }) @@ -350,18 +376,20 @@ export default { } } } + .itemTitle{ + display: block; + font-size: 16px; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; + margin-top: 12px; + } .list{ + width: 100%; + height: calc(100ch - 400px); margin-top: 24px; box-sizing: border-box; padding-bottom: 12px; - .itemTitle{ - display: block; - font-size: 16px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - margin-bottom: 12px; - } .listItem{ margin-bottom: 12px; border: 1px solid #D9DBE0; @@ -396,7 +424,7 @@ export default { margin-right: 4px; } .serverName{ - font-size: 20px; + font-size: 16px; font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; white-space: nowrap; @@ -411,7 +439,7 @@ export default { display: flex; flex-direction: column; .entryValue{ - font-size: 18px; + font-size: 16px; font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; color: red; diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBINew/carPortrait.vue similarity index 82% rename from pages/commercialBI/carPortrait.vue rename to pages/commercialBINew/carPortrait.vue index 33ed81d..99fc2e6 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBINew/carPortrait.vue @@ -19,6 +19,9 @@
+ + +
@@ -90,32 +93,37 @@
-
+
-
- - - - {{ searchText }} - +
+
+ + + + {{serviceInfo.SERVERPART_NAME}} +

{{serviceInfo.SPREGIONTYPE_NAME}}

+ + - +
+ + + + + + + + + + + + + + -
-
- - - - {{serviceInfo.SERVERPART_NAME}} -

{{serviceInfo.SPREGIONTYPE_NAME}}

- - - -
-
@@ -149,7 +157,6 @@ -
@@ -247,71 +254,59 @@
- 车流数据 -
- -
-
-
-
- - {{item.name.split('管理中心')[0]}} -
-
- -
-
-
- {{item.entry}} - 入区流量 -
-
- {{item.flow}} - 断面流量 -
-
- - - -
- {{item.flowRate}} - 入区率 -
-
-
-
+ + 车流数据 -
-
-
-
-
- +
+ + + + + {{ searchTextMonth }} + + + + +
+ + + +
+
+
+
+
+ + {{item.Serverpart_Name || ''}}
- {{subItem.name}}
- -
-
-
-
{{thirdItem.name}}区
-
-
{{thirdItem.LargeVehicle_Count}}/{{thirdItem.MediumVehicle_Count}}/{{thirdItem.MinVehicle_Count}}
-
大/中/小型车
-
-
-
{{thirdItem.Vehicle_Count}}/{{thirdItem.SectionFlow_Count}}
-
入区/断面
-
-
-
{{thirdItem.entryRate!==0 && thirdItem.Vehicle_Count< thirdItem.SectionFlow_Count ? `${thirdItem.entryRate}%`:'-'}}
-
入区率
+
+
+ {{item.Entry_Rate ||''}}% + 入区率
+
+ +
+ + {{item.RevenueAmount?$util.fmoney($util.getMoney(item.RevenueAmount/10000)):''}} + 营收 /万元 + + + {{item.AvgVehicleAmount ||''}} + 单车 /元 + + + {{item.Vehicle_Count?$util.fmoney($util.getMoney(item.Vehicle_Count/10000)):''}} + 入区 /万辆 + +
-
+ + @@ -447,6 +442,7 @@ export default { headMsg:null, searchEndTime:'', searchText:'',// 展示全省情況时显示的日期内容 + searchTextMonth:'',// 展示全省情況时显示的日期内容 haveFun:{}, serviceTypeObj:{},// 服务区类型对象 serviceInfoObj:{}, @@ -494,6 +490,7 @@ export default { } this.single = this.$util.getThisMonthHave(this.time) this.searchText = this.time + this.searchTextMonth = this.$util.getThisMonthHave(this.time) const date = new Date(this.time) //设置日期选择器的开始时间和结束时间 let searchYear = date.getFullYear() @@ -537,7 +534,7 @@ export default { if (this.isShowAllProvince === true){ this.serviceInfo.SERVERPART_NAME = '安徽驿达' this.serviceInfo.Serverpart_ID = undefined - this.getDetail(this.theRequest) + this.getDetail() }else{ //获取服务区基本信息 this.getServiceInfo() @@ -572,6 +569,7 @@ export default { this.selectProvinceName = '' this.carType = '' this.searchText='' + this.searchTextMonth = '' }, methods:{ // 滚动轮播图 @@ -640,98 +638,152 @@ export default { cxt_arc.stroke() //对当前路径进行描边 cxt_arc.draw() }, - handleNoneChild(obj){ - this.regionList.forEach(item=>{ - if (item.name === obj.name){ + handleNoneChild(obj,selectIndex){ + this.regionList.forEach((item,index)=>{ + if (item.name === obj.name && index===selectIndex){ item.showChild = !item.showChild } }) + this.$forceUpdate() }, - async getDetail(obj) { + async getDetail() { uni.showLoading({ - title: '正在加载...' + title:'加载中' }) - const requestParamas = { - Statistics_Date: obj.time , - Statistics_Month: obj.month , - Province_Code: obj.ProvinceCode , - pushProvinceCode: obj.ProvinceCode , - Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '', - SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', - // Revenue_Include: 1 + this.regionList=[] + const date = new Date(this.searchText) + const y = date.getFullYear() + let m = date.getMonth() + 1 + if (m<10){ + m = '0' + m } - - const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) - const res = bayonetCount.Result_Data.List - let bayonetPie = [] // 区域车流饼图统计数据 - res.map(async (n, index) => { - bayonetPie = anhuiYestodayRevenueData.getBayonetPie('Serverpart_Name', n, bayonetPie) - }) - bayonetPie.forEach((item,index)=>{ - let entryNum = 0 // 该片区总计的入区车流 - let flowNum = 0 // 该片区总计的断面流量 - let entryNumNoZero = 0 // - let flowNumNoZero = 0 // - item.spList.forEach(subItem=>{ - entryNum+=subItem.Vehicle_Count - flowNum+=subItem.SectionFlow_Count - if (subItem.regionList && subItem.regionList.length>0){ - subItem.regionList.forEach(thirdItem=>{ - if (thirdItem.SectionFlow_Count===0 || thirdItem.Vehicle_Count===0){ - thirdItem.entryRate = 0 - }else{ - thirdItem.entryRate = Number(((thirdItem.Vehicle_Count / thirdItem.SectionFlow_Count)*100).toFixed(2)) - } - - if (thirdItem.Vehicle_Count{ + console.log('res',res) + this.carData = res.Result_Data.List + this.carData.forEach(item=>{ + item.Serverpart_ID = this.serviceInfo.Serverpart_ID item.showChild = false - item.entryList = [{name:'已入区',value:Number(item.flowRate.split('%')[0])},{name:'未入区',value:100 - item.flowRate.split('%')[0]}] - item.bg = item.name.indexOf('皖中')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/Middle.png':item.name.indexOf('皖西')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/west.png':item.name.indexOf('皖东')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/east.png':item.name.indexOf('皖南')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/south.png':item.name.indexOf('皖北')!==-1?'https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/north.png':'' + }) + this.regionList = this.carData + console.log('this.carData',this.carData) + uni.hideLoading() + // let sumObj = { + // Serverpart_Name:'', + // Serverpart_Region:'', + // SectionFlow_Count:0, + // Vehicle_Count:0, + // showChild:false + // } + // this.carData.forEach(item=>{ + // sumObj.Serverpart_Name = item.Serverpart_Name + // sumObj.Serverpart_Region = item.Serverpart_Region + // sumObj.SectionFlow_Count += item.SectionFlow_Count + // sumObj.Vehicle_Count += item.Vehicle_Count + // }) + // if (sumObj.Vehicle_Count && sumObj.SectionFlow_Count){ + // sumObj.Entry_Rate = ((sumObj.Vehicle_Count / sumObj.SectionFlow_Count)*100).toFixed(2) + // } + // console.log('sumObj',sumObj) + // sumObj.Vehicle_Count = this.$util.fmoney(this.$util.getMoney(sumObj.Vehicle_Count / 10000),2) + // this.regionList = [sumObj] }) - if (bayonetPie && bayonetPie.length>0){ - for (let i=0;i<=bayonetPie.length-1;i++){ - for (let j=0;j<=bayonetPie.length - i - 1;j++){ - if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){ - if (bayonetPie[j].entry < bayonetPie[j+1].entry){ - let temp = bayonetPie[j] - bayonetPie[j] = bayonetPie[j + 1] - bayonetPie[j + 1] = temp - } - } - } - } - } - bayonetPie.forEach(item=>{ - if (item.spList && item.spList.length>0){ - for (let i=0;i<=item.spList.length-1;i++){ - for (let j=0;j<=item.spList.length - i - 1;j++){ - if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){ - if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){ - let temp = item.spList[j] - item.spList[j] = item.spList[j + 1] - item.spList[j + 1] = temp - } - } - } - } - } - }) - this.regionList = bayonetPie - this.regionList.forEach((item,index)=>{ - const number = Number(item.flowRate.split('%')[0]) - this.showScoreAnimation1(number,index) - }) - uni.hideLoading() + + // uni.showLoading({ + // title: '正在加载...' + // }) + // const requestParamas = { + // Statistics_Date: obj.time , + // Statistics_Month: obj.month , + // Province_Code: obj.ProvinceCode , + // pushProvinceCode: obj.ProvinceCode , + // Serverpart_ID: obj.GroupType != 1020 ? obj.ServerpartIds : '', + // SPRegionType_ID: obj.GroupType == 1020 ? obj.ServerpartIds : '', + // // Revenue_Include: 1 + // } + // + // const bayonetCount = await request.$webGet('CommercialApi/Revenue/GetSPBayonetList', requestParamas) + // const res = bayonetCount.Result_Data.List + // let bayonetPie = [] // 区域车流饼图统计数据 + // res.map(async (n, index) => { + // bayonetPie = anhuiYestodayRevenueData.getBayonetPie('Serverpart_Name', n, bayonetPie) + // }) + // bayonetPie.forEach((item,index)=>{ + // let entryNum = 0 // 该片区总计的入区车流 + // let flowNum = 0 // 该片区总计的断面流量 + // let entryNumNoZero = 0 // + // let flowNumNoZero = 0 // + // item.spList.forEach(subItem=>{ + // entryNum+=subItem.Vehicle_Count + // flowNum+=subItem.SectionFlow_Count + // if (subItem.regionList && subItem.regionList.length>0){ + // subItem.regionList.forEach(thirdItem=>{ + // if (thirdItem.SectionFlow_Count===0 || thirdItem.Vehicle_Count===0){ + // thirdItem.entryRate = 0 + // }else{ + // thirdItem.entryRate = Number(((thirdItem.Vehicle_Count / thirdItem.SectionFlow_Count)*100).toFixed(2)) + // } + // + // if (thirdItem.Vehicle_Count0){ + // for (let i=0;i<=bayonetPie.length-1;i++){ + // for (let j=0;j<=bayonetPie.length - i - 1;j++){ + // if (bayonetPie[j] && bayonetPie[j + 1] && bayonetPie[j].entry && bayonetPie[j+1].entry){ + // if (bayonetPie[j].entry < bayonetPie[j+1].entry){ + // let temp = bayonetPie[j] + // bayonetPie[j] = bayonetPie[j + 1] + // bayonetPie[j + 1] = temp + // } + // } + // } + // } + // } + // + // bayonetPie.forEach(item=>{ + // if (item.spList && item.spList.length>0){ + // for (let i=0;i<=item.spList.length-1;i++){ + // for (let j=0;j<=item.spList.length - i - 1;j++){ + // if (item.spList[j] && item.spList[j + 1] && item.spList[j].Vehicle_Count && item.spList[j+1].Vehicle_Count){ + // if (item.spList[j].Vehicle_Count < item.spList[j+1].Vehicle_Count){ + // let temp = item.spList[j] + // item.spList[j] = item.spList[j + 1] + // item.spList[j + 1] = temp + // } + // } + // } + // } + // } + // }) + // this.regionList = bayonetPie + // this.regionList.forEach((item,index)=>{ + // const number = Number(item.flowRate.split('%')[0]) + // this.showScoreAnimation1(number,index) + // }) + // uni.hideLoading() }, //车型选择 handleCarType(selectItem){ @@ -812,8 +864,9 @@ export default { month: `${y}${m}`, time: `${y}-${m}-${d}`, } - await this.getDetail(this.theRequest) this.searchText = e.detail.value + this.searchTextMonth = e.detail.value + await this.getDetail() }, // 时间选择器改变的时间 bindDateChange(e){ @@ -890,7 +943,7 @@ export default { //跳转到地图 handleGoSelectService() { uni.navigateTo({ - url:`/pages/map/index?chartType=${true}&page=/pages/commercialBI/carPortrait&serviceInfo=${JSON.stringify(this.serviceInfo)}` + url:`/pages/map/index?chartType=${true}&page=/pages/commercialBINew/carPortrait&serviceInfo=${JSON.stringify(this.serviceInfo)}` }) }, handleBack(){ @@ -1400,6 +1453,14 @@ export default { height: 100%; } } + .sliderBox{ + width: 100vw; + box-sizing: border-box; + padding: 0 16rpx; + position: absolute; + z-index: 9; + left: 0; + } .pickerTop{ margin-left: 16rpx; .selectService{ @@ -1607,72 +1668,76 @@ export default { height: 24px; margin-right: 16px; } - .timeSelect{ - display: flex; - align-items: center; - .selectIcon{ - width: 16px; - height: 16px; - } - .time{ + .picker{ + + .selectService{ display: flex; align-items: center; - .text{ - margin: 0 5px; - color: #fff; + .img{ + width: 40px; + height: 40px; + z-index: 2; } - .icon{ - width: 18px; - height: 18px; + .select{ + height: 32px; + background: #F8F8FA; + border-radius: 0 16px 16px 0; + transform: translateX(-20px); + box-sizing: border-box; + padding-left: 25px; + display: flex; + align-items: center; + .content{ + display: flex; + align-items: center; + .uni-input{ + padding: 0; + background: transparent; + font-size: 14px; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; + } + .area{ + font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 40px; + margin-left: 4px; + } + .rightArrow{ + width: 24px; + height: 12px; + } + } + } } } } - .picker{ + .sliderBox{ + width: 100%; + position: absolute; + left: 0; + } + .timeSelect{ position: absolute; left: 16px; - .selectService{ + .selectIcon{ + width: 16px; + height: 16px; + } + .time{ display: flex; align-items: center; - .img{ - width: 40px; - height: 40px; - z-index: 2; + .text{ + margin: 0 5px; + color: #fff; } - .select{ - height: 32px; - background: #F8F8FA; - border-radius: 0 16px 16px 0; - transform: translateX(-20px); - box-sizing: border-box; - padding-left: 25px; - display: flex; - align-items: center; - .content{ - display: flex; - align-items: center; - .uni-input{ - padding: 0; - background: transparent; - font-size: 14px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - } - .area{ - font-size: 12px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #786B6C; - line-height: 40px; - margin-left: 4px; - } - .rightArrow{ - width: 24px; - height: 12px; - } - } - + .icon{ + width: 18px; + height: 18px; } } } @@ -1962,170 +2027,171 @@ export default { margin-top: 24px; box-sizing: border-box; padding-bottom: 12px; - .itemTitle{ - display: block; - font-size: 16px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; + .listTop{ + display: flex; + align-items: center; + justify-content: space-between; margin-bottom: 12px; - } - .listItem{ - margin-bottom: 12px; - border: 1px solid #D9DBE0; - border-radius: 8px; - position: relative; - .bg{ - position: absolute; - right: 0;top: 0; - width: 97px; - height: 97px; + .itemTitle{ + display: block; + font-size: 16px; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; } - .listBox{ - width: 100%; - box-sizing: border-box; - padding: 12px 16px; - background: linear-gradient(314deg, #EAEFFF 0%, #F3F5FF 32%, #F5FCFF 50%, #F0F7FF 67%, #DBE5FF 100%); - border-bottom: 1px solid #D9DBE0; - border-radius: 8px; - .itemTop{ - width: 100%; + .timeSelect{ + .selectIcon{ + width: 16px; + height: 16px; + } + .time{ display: flex; - justify-content: space-between; align-items: center; - .itemLeft{ - display: inline-block; - padding: 2px 8px; - background: rgba(26, 95, 255, 0.1); - border-radius: 14px; - .itemFixed{ - width: 12px; - height: 14px; - margin-right: 4px; - } - .serverName{ - font-size: 16px; - font-family: Alimama ShuHeiTi; - color: #1A5FFF; - line-height: 22px - } + .text{ + margin: 0 5px; } - .itemRight{ - width: 26px; - height: 14px; + .icon{ + width: 18px; + height: 18px; } } - .itemDetail{ - margin-top: 16px; + } + } + + .listBigBox{ + width: 100%; + height: calc(100ch - 400px); + margin-top: 24px; + box-sizing: border-box; + padding-bottom: 12px; + .listItem{ + margin-bottom: 12px; + border: 1px solid #D9DBE0; + border-radius: 8px; + position: relative; + .bg{ + position: absolute; + right: 0;top: 0; + width: 97px; + height: 97px; + } + .listBox{ width: 100%; + box-sizing: border-box; + padding: 12px 16px; + background: linear-gradient(314deg, #EAEFFF 0%, #F3F5FF 32%, #F5FCFF 50%, #F0F7FF 67%, #DBE5FF 100%); + border-bottom: 1px solid #D9DBE0; + border-radius: 8px; + .itemTop{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + .itemLeft{ + display: inline-block; + padding: 4px 12px; + background: rgba(26, 95, 255, 0.1); + border-radius: 14px; + .itemFixed{ + width: 12px; + height: 14px; + margin-right: 4px; + } + .serverName{ + font-size: 16px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + white-space: nowrap; + color: #1A5FFF; + line-height: 22px + } + } + .itemRight{ + display: flex; + align-items: center; + .entryRate{ + display: flex; + flex-direction: column; + .entryValue{ + font-size: 16px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: red; + line-height: 24px; + white-space: nowrap; + } + .entryLabel{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 20px; + } + } + .img{ + width: 26px; + height: 14px; + } + + } + } + .itemDetail{ + margin-top: 16px; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + .message{ + display: flex; + flex-direction: column; + .cirRate{ + width: 40px; + height: 40px; + } + .label{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 20px + } + .value{ + font-size: 20px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 24px; + white-space: nowrap; + } + } + } + } + .childList{ + border-radius: 8px 8px 0 0; + box-sizing: border-box; + margin-left: 16px; + width: calc(100% - 32px); display: flex; - justify-content: space-between; align-items: center; - .message{ + justify-content: space-between; + padding: 8px; + .childItem{ + width: calc(100% / 3); display: flex; flex-direction: column; - .cirRate{ - width: 40px; - height: 40px; - } - .label{ + .childLabel{ font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #786B6C; line-height: 20px } - .value{ - font-size: 20px; + .childValue{ + font-size: 18px; font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; color: #160002; line-height: 24px; - white-space: nowrap; - } - } - } - } - .childList{ - margin-top: 20px; - border-radius: 8px 8px 0 0; - box-sizing: border-box; - margin-left: 16px; - width: calc(100% - 32px); - .childItem{ - width: 100%; - border-bottom: 1px solid #EEEEEE; - margin-bottom: 8px; - .childTop{ - width: 100%; - margin-bottom: 12px; - display: flex; - align-items: center; - justify-content: space-between; - .topLeft{ - display: flex; - align-items: center; - .imgBox{ - width: 28px; - height: 28px; - border-radius: 50%; - border: 1px solid #FFFFFF; - overflow: hidden; - .topIcon{ - width: 100%; - height: 100%; - } - } - .serviceName{ - font-size: 16px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - line-height: 22px; - margin-left: 6px; - } - } - .topRight{ - width: 16px; - height: 16px; - } - } - .childDetail{ - .thirdItem{ - width: 100%; - margin-bottom: 12px; - display: flex; - align-items: flex-start; - .serviceFixed{ - display: inline-block; - width: 40px; - box-sizing: border-box; - white-space: nowrap; - font-size: 14px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - line-height: 18px; - } - .itemType{ - display: inline-block; - width: calc((100% - 40px)*0.4); - white-space: nowrap; - .typeValue{ - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #160002; - line-height: 20px; - } - .typeLabel{ - font-size: 12px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #786B6C; - line-height: 18px; - } - } } } } diff --git a/pages/commercialBINew/commercialType.vue b/pages/commercialBINew/commercialType.vue new file mode 100644 index 0000000..48c4b41 --- /dev/null +++ b/pages/commercialBINew/commercialType.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/pages/commercialBINew/components/analyse.vue b/pages/commercialBINew/components/analyse.vue new file mode 100644 index 0000000..c01c31b --- /dev/null +++ b/pages/commercialBINew/components/analyse.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/bestsellerShop.vue b/pages/commercialBINew/components/bussiness/bestsellerShop.vue new file mode 100644 index 0000000..629d487 --- /dev/null +++ b/pages/commercialBINew/components/bussiness/bestsellerShop.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/businessFormat.vue b/pages/commercialBINew/components/bussiness/businessFormat.vue new file mode 100644 index 0000000..950fbd4 --- /dev/null +++ b/pages/commercialBINew/components/bussiness/businessFormat.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/consumptionCompare.vue b/pages/commercialBINew/components/bussiness/consumptionCompare.vue new file mode 100644 index 0000000..8b311c6 --- /dev/null +++ b/pages/commercialBINew/components/bussiness/consumptionCompare.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/levelTop.vue b/pages/commercialBINew/components/bussiness/levelTop.vue new file mode 100644 index 0000000..aca2c13 --- /dev/null +++ b/pages/commercialBINew/components/bussiness/levelTop.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/timePeriodAnalysis.vue b/pages/commercialBINew/components/bussiness/timePeriodAnalysis.vue new file mode 100644 index 0000000..d78e5b2 --- /dev/null +++ b/pages/commercialBINew/components/bussiness/timePeriodAnalysis.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/pages/commercialBINew/components/bussiness/transactionAnalysis.vue b/pages/commercialBINew/components/bussiness/transactionAnalysis.vue new file mode 100644 index 0000000..a83224b --- /dev/null +++ b/pages/commercialBINew/components/bussiness/transactionAnalysis.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/pages/commercialBI/components/car/carTypeTime.vue b/pages/commercialBINew/components/car/carTypeTime.vue similarity index 100% rename from pages/commercialBI/components/car/carTypeTime.vue rename to pages/commercialBINew/components/car/carTypeTime.vue diff --git a/pages/commercialBI/components/car/entryRate.vue b/pages/commercialBINew/components/car/entryRate.vue similarity index 100% rename from pages/commercialBI/components/car/entryRate.vue rename to pages/commercialBINew/components/car/entryRate.vue diff --git a/pages/commercialBI/components/car/entryZone.vue b/pages/commercialBINew/components/car/entryZone.vue similarity index 100% rename from pages/commercialBI/components/car/entryZone.vue rename to pages/commercialBINew/components/car/entryZone.vue diff --git a/pages/commercialBI/components/car/homePlace.vue b/pages/commercialBINew/components/car/homePlace.vue similarity index 100% rename from pages/commercialBI/components/car/homePlace.vue rename to pages/commercialBINew/components/car/homePlace.vue diff --git a/pages/commercialBI/components/car/monthTotal.vue b/pages/commercialBINew/components/car/monthTotal.vue similarity index 100% rename from pages/commercialBI/components/car/monthTotal.vue rename to pages/commercialBINew/components/car/monthTotal.vue diff --git a/pages/commercialBI/components/car/percentEntry.vue b/pages/commercialBINew/components/car/percentEntry.vue similarity index 100% rename from pages/commercialBI/components/car/percentEntry.vue rename to pages/commercialBINew/components/car/percentEntry.vue diff --git a/pages/commercialBI/components/car/timeAnalysis.vue b/pages/commercialBINew/components/car/timeAnalysis.vue similarity index 100% rename from pages/commercialBI/components/car/timeAnalysis.vue rename to pages/commercialBINew/components/car/timeAnalysis.vue diff --git a/pages/commercialBINew/components/format/bandLevel.vue b/pages/commercialBINew/components/format/bandLevel.vue new file mode 100644 index 0000000..7fd6109 --- /dev/null +++ b/pages/commercialBINew/components/format/bandLevel.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/pages/commercialBINew/components/format/bandNumber.vue b/pages/commercialBINew/components/format/bandNumber.vue new file mode 100644 index 0000000..96e918f --- /dev/null +++ b/pages/commercialBINew/components/format/bandNumber.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/pages/commercialBINew/components/format/consumLevel.vue b/pages/commercialBINew/components/format/consumLevel.vue new file mode 100644 index 0000000..6c43c39 --- /dev/null +++ b/pages/commercialBINew/components/format/consumLevel.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/pages/commercialBINew/components/format/fillingDegree.vue b/pages/commercialBINew/components/format/fillingDegree.vue new file mode 100644 index 0000000..d3349e7 --- /dev/null +++ b/pages/commercialBINew/components/format/fillingDegree.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/commercialBINew/components/guest/businessType.vue b/pages/commercialBINew/components/guest/businessType.vue new file mode 100644 index 0000000..5b51b2d --- /dev/null +++ b/pages/commercialBINew/components/guest/businessType.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/pages/commercialBINew/components/guest/consumPrefer.vue b/pages/commercialBINew/components/guest/consumPrefer.vue new file mode 100644 index 0000000..e34d030 --- /dev/null +++ b/pages/commercialBINew/components/guest/consumPrefer.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/pages/commercialBINew/components/guest/consumptionLevel.vue b/pages/commercialBINew/components/guest/consumptionLevel.vue new file mode 100644 index 0000000..0d6b1e2 --- /dev/null +++ b/pages/commercialBINew/components/guest/consumptionLevel.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/pages/commercialBINew/components/guest/customerFirst.vue b/pages/commercialBINew/components/guest/customerFirst.vue new file mode 100644 index 0000000..afd2487 --- /dev/null +++ b/pages/commercialBINew/components/guest/customerFirst.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/pages/commercialBINew/components/guest/customerSecond.vue b/pages/commercialBINew/components/guest/customerSecond.vue new file mode 100644 index 0000000..be20082 --- /dev/null +++ b/pages/commercialBINew/components/guest/customerSecond.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/pages/commercialBINew/components/headerTop.vue b/pages/commercialBINew/components/headerTop.vue new file mode 100644 index 0000000..b939800 --- /dev/null +++ b/pages/commercialBINew/components/headerTop.vue @@ -0,0 +1,648 @@ + + + + + diff --git a/pages/commercialBINew/components/manager/contractGuarantee.vue b/pages/commercialBINew/components/manager/contractGuarantee.vue new file mode 100644 index 0000000..71866c5 --- /dev/null +++ b/pages/commercialBINew/components/manager/contractGuarantee.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/pages/commercialBINew/components/manager/moneyCompare.vue b/pages/commercialBINew/components/manager/moneyCompare.vue new file mode 100644 index 0000000..0252357 --- /dev/null +++ b/pages/commercialBINew/components/manager/moneyCompare.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/pages/commercialBINew/components/manager/revenueAnalysis.vue b/pages/commercialBINew/components/manager/revenueAnalysis.vue new file mode 100644 index 0000000..cc74d9e --- /dev/null +++ b/pages/commercialBINew/components/manager/revenueAnalysis.vue @@ -0,0 +1,326 @@ + + + + + diff --git a/pages/commercialBINew/components/manager/revenueTrends.vue b/pages/commercialBINew/components/manager/revenueTrends.vue new file mode 100644 index 0000000..321d6f4 --- /dev/null +++ b/pages/commercialBINew/components/manager/revenueTrends.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/pages/commercialBINew/components/noData.vue b/pages/commercialBINew/components/noData.vue new file mode 100644 index 0000000..0e24df1 --- /dev/null +++ b/pages/commercialBINew/components/noData.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/pages/commercialBINew/components/sliderPage.vue b/pages/commercialBINew/components/sliderPage.vue new file mode 100644 index 0000000..01d0222 --- /dev/null +++ b/pages/commercialBINew/components/sliderPage.vue @@ -0,0 +1,267 @@ + + + + diff --git a/pages/examine/commercialType.vue b/pages/examine/commercialType.vue index f9402d9..0b42753 100644 --- a/pages/examine/commercialType.vue +++ b/pages/examine/commercialType.vue @@ -34,7 +34,7 @@ export default { data(){ return { typeList:[ - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBI/carPortrait',text:'车流'}, + {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBINew/carPortrait',text:'车流'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/guest.svg',url:'/pages/commercialBI/guestPortrait',text:'客群'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/business_icon.svg',url:'/pages/commercialBI/managePortrait',text:'经营'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/trade.svg',url:'/pages/commercialBI/businessPortrait',text:'交易'}, diff --git a/pages/examine/detail.vue b/pages/examine/detail.vue index cbf6907..cb9d42d 100644 --- a/pages/examine/detail.vue +++ b/pages/examine/detail.vue @@ -24,10 +24,11 @@ - - + + + @@ -554,16 +555,21 @@ export default { .swiperItem{ width:100%; height: 340px; - .header{ - width:100%; + //background: url("https://eshangtech.com/ShopICO/ahyd-BID/examine/bg.png")no-repeat; + .header { + width: 100%; height: 340px; position: absolute; - top: 0;left: 0; - z-index:1; - .sliderBox{ - width: 100%; + top: 0; + left: 0; + z-index: 1; + + .sliderBox { position: absolute; - bottom: 20px; + left: 0; + width: 100%; + background: #E5D5FF; + padding-bottom: 12rpx; } } } diff --git a/pages/examine/sliderPage.vue b/pages/examine/sliderPage.vue index 82d4338..acbdb6d 100644 --- a/pages/examine/sliderPage.vue +++ b/pages/examine/sliderPage.vue @@ -1,47 +1,99 @@ diff --git a/pages/index/components/sliderPage.vue b/pages/index/components/sliderPage.vue new file mode 100644 index 0000000..58db0ba --- /dev/null +++ b/pages/index/components/sliderPage.vue @@ -0,0 +1,52 @@ + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 89de15c..18cd478 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -5,12 +5,10 @@ - + -
+
@@ -24,8 +22,8 @@ - - 数智驿达 + + @@ -37,147 +35,160 @@
- + - - - - - - 营收分析 - - - - - - - {{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}} - - - - - - - - - - - - {{showTableData.add?showTableData.add:'-'}}% - - - - - 对客营收 - 同比 - - - - - - 自营:{{progressObj.owner}}%， - 外租:{{progressObj.other}}% - - - - - - - - 自营收入 - - - - {{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}} - {{monthAdd || ''}}% - - - {{typeList[0].add?typeList[0].add:''}} - 同比 - - - - - - - 外租收入 - - - - {{externalMoney?$util.fmoney(externalMoney || 0,2):''}} - - - - {{typeList[1].add?typeList[1].add:''}} - 同比 - - - - - - - - - - 驿达入账:{{ydRate}}% - 商家入账:{{shopRate}}% - - - - - - 驿达入账 - - {{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}} - - - - 商家入账 - - {{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }} - - - - - - - - 单位：万元 - ? + + + + + + + 对客营收 + /万元 + ? 对客营收：{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}} 自营收入：{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}} 外租收入：{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}} - - + + + 查看更多 + - - - - - - - ? - - 对客营收：- - 自营收入：- - 外租收入：- + + + + {{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}} + + + + + + + + + + + + {{showTableData.add?showTableData.add:'-'}}% + 同比 + + + + + + + + + + + + 自营:{{progressObj.owner}}%， + 外租:{{progressObj.other}}% + + + + + + + + 自营收入 + + + + {{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}} + {{monthAdd || ''}}% + + + {{typeList[0].add?typeList[0].add:''}} + 同比 + + + + + + + 外租收入 + + + + {{externalMoney?$util.fmoney(externalMoney || 0,2):''}} + + + + {{typeList[1].add?typeList[1].add:''}} + 同比 + + + + + + + + + + 驿达入账:{{ydRate}}% + 商家入账:{{shopRate}}% + + + + + + 驿达入账 + + {{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}} + + + + 商家入账 + + {{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }} + - - - - + + + + + + + + + + + + + + + + + + + + - + ? + + 对客营收：- + 自营收入：- + 外租收入：- + + + + + + + + + + + -月对客营收/万元 + 同比 - - - -月对客营收/万元 - 同比 - @@ -213,10 +224,12 @@ 同比 + + - + 查看更多 @@ -351,6 +364,9 @@ +
+ +
@@ -393,130 +409,502 @@
-
- -
- {{index>11?(index+1)%12===0?12:(index+1)%12:index+1}}月 + + + + + + + + 对客营收 + /万元 + + + 查看更多 + + + + + + + {{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}} + + + + + + + + + + + + {{showTableData.add?showTableData.add:'-'}}% + 同比 + + + + + + + + + + + + 自营:{{progressObj.owner}}%， + 外租:{{progressObj.other}}% + + + + + + + + 自营收入 + + + + {{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}} + {{monthAdd || ''}}% + + + {{typeList[0].add?typeList[0].add:''}} + 同比 + + + + + + + 外租收入 + + + + {{externalMoney?$util.fmoney(externalMoney || 0,2):''}} + + + + {{typeList[1].add?typeList[1].add:''}} + 同比 + + + + + + + + + + 驿达入账:{{ydRate}}% + 商家入账:{{shopRate}}% + + + + + + 驿达入账 + + {{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}} + + + + 商家入账 + + {{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }} + + + + + + + + + + + + + + + + + + + + + + + + - + ? + + 对客营收：- + 自营收入：- + 外租收入：- + + + + + + + + + + + -月对客营收/万元 + 同比 + + + + + + + + + + + 自营收入/万元 + + + - + - + + + - + 同比 + + + + + + + 外租收入/万元 + + + - + + + + - + 同比 + + + + + + + 查看更多 + + +
+ + + + + {{showTableData.allRevenueYear?showTableData.allRevenueYear:''}} + 年度累计/亿元 + + + + + + {{showTableData.yearYoY?showTableData.yearYoY+'%':''}} + + 同比 + + + + + + 对客营收/环比 + {{showTableData.customerQoQ?showTableData.customerQoQ:''}} + + + 自营收入/环比 + {{typeList[0].addQOQ?typeList[0].addQOQ:''}} + + + 外租收入/环比 + {{typeList[1].addQOQ?typeList[1].addQOQ:''}} + + + + + + + + + 入区车流 + + + + + {{trafficCurrentObj.Vehicle_AddUpCount?trafficCurrentObj.AddUpCount:''}} + {{`/${trafficeUnit || '-'}`}} + + + + + + + + {{trafficYOYObj.Vehicle_GrowthRate?trafficYOYObj.Vehicle_GrowthRate>0?'+'+trafficYOYObj.Vehicle_GrowthRate+'%':trafficYOYObj.Vehicle_GrowthRate+'%':'-'}} + /同比 + + + {{trafficQOQObj.Vehicle_GrowthRate?trafficQOQObj.Vehicle_GrowthRate>0?'+'+trafficQOQObj.Vehicle_GrowthRate+'%':trafficQOQObj.Vehicle_GrowthRate+'%':'-'}} + /环比 + + + + + + + + + 入区率 + + + + + {{trafficCurrentObj.Entry_Rate?trafficCurrentObj.Entry_Rate + '%':''}} + + + + + + + {{trafficYOYObj.Entry_GrowthRate?trafficYOYObj.Entry_GrowthRate>0?'+'+trafficYOYObj.Entry_GrowthRate+'%':trafficYOYObj.Entry_GrowthRate+'%':'-'}} + /同比 + + + {{trafficQOQObj.Entry_GrowthRate?trafficQOQObj.Entry_GrowthRate>0?'+'+trafficQOQObj.Entry_GrowthRate+'%':trafficQOQObj.Entry_GrowthRate+'%':'-'}} + /环比 + + + + + + + + + 停留时长 + + + + + {{trafficCurrentObj.Stay_Times?trafficCurrentObj.Stay_Times + '分钟':''}} + + + + + + + {{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}} + /同比 + + + {{trafficQOQObj.StayTimes_GrowthRate?trafficQOQObj.StayTimes_GrowthRate>0?'+'+trafficQOQObj.StayTimes_GrowthRate+'%':trafficQOQObj.StayTimes_GrowthRate+'%':'-'}} + /环比 + + + + + + + + {{ `${index+1}月入区车流` }} + {{trafficCurrentObj.Vehicle_Count?$util.noDecimal(trafficCurrentObj.Vehicle_Count) + '辆':''}} + + + {{ `${index+1}月入区率` }} + {{trafficCurrentObj.Entry_Rate?trafficCurrentObj.Entry_Rate + '%':''}} + + + {{ `${index+1}月停留时长` }} + {{trafficCurrentObj.Stay_Times?trafficCurrentObj.Stay_Times + '分钟':''}} + + + + + + + +

-

+

长款金额/元

+ + +

-

+

短款金额/元

+ + +

-

+

优惠金额/元

+ + +

-

+
+ 门店上传 +
+ + +

-

+

商品出售/件

+ + +

-

+

商品均价/元

+ + +

-

+

日均入区/辆

+ + +

-

+

入区率/%

+ + +

-

+

停留时长/分钟

+ + +
+
+ +
+
+ + + - -
- -
- -
- 车流预警 - + + +
+ +
+ +
+ 车流预警 + /Top3 + +
+
+
+ +
-
- 更多记录 - -
-
-
-
-
-
- {{index + 1}} -
-
- {{item.name}} - {{item.SERVERPART_REGION}}区 -
-
- {{item.VEHICLE_COUNT}} - /辆 -
-
- - {{item.VEHICLE_RATE}}% +
+
+
+
+ {{index + 1}} +
+
+ {{item.name}} + {{item.SERVERPART_REGION}}区 +
+
+ {{item.VEHICLE_COUNT}} + /辆 +
+
+ + {{item.VEHICLE_RATE}}% +
-
+ - - - - 昨日营收/万元 - {{yesObj.Revenue_Upload?yesObj.Revenue_Upload:'-'}}/{{yesObj.TotalShopCount?yesObj.TotalShopCount:'-'}} + + + + + - - - {{yesObj.CashPay?yesObj.CashPay:''}} - - - - {{yesObjCompared?yesObjCompared>0?'+'+yesObjCompared+'%':yesObjCompared+'%':'-'}} - - - - - - - - - - {{lastDay}} - - + 昨日营收 - - - 服务区信息 - - - - - - - - - 商业经营 - - - - - 商业品牌 - - - - - - - 财务月报 - - + + + + + + + 服务区信息 - - - 数智统计 - - + + + + + + + + 经营报表 - - 现场管理 - - + + + + + + + + + 经营品牌库 - - 节日特刊 - - + + + + + + + + + 财务报表 + + + + + + + + + + 数智统计 + + + + + + + + + + 现场管理 + + + + + + + + + + 节日特刊 @@ -884,9 +1272,10 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; import anhuiYestodayRevenueData from "../everdayRenven/components/anhuiYestodayRevenueData"; import MonthCharts from "./components/monthCharts.vue"; import RateCharts from "./components/rateCharts.vue"; +import SliderPage from "./components/sliderPage.vue"; var rincanvas = {}; export default { - components: {RateCharts, MonthCharts, Tabbar,uniPopup}, + components: {SliderPage, RateCharts, MonthCharts, Tabbar,uniPopup}, data() { const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) // const lastDay = '2025-01-01' @@ -907,7 +1296,7 @@ export default { {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: 'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg', path: '/pages/commercialBINew/carPortrait', name: '车流'}, { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/guest.svg', path: '/pages/commercialBI/guestPortrait', name: '客群' }, { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/business_icon.svg', path: '/pages/commercialBI/managePortrait', name: '经营' }, { imgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/index/trade.svg', path: '/pages/commercialBI/businessPortrait', name: '交易' } @@ -1325,7 +1714,7 @@ export default { this.loadMore = !this.loadMore }, handleGoCarBi(){ - this.$util.toNextRoute('navigateTo', `/pages/commercialBI/carPortrait?mustAllProvince=${true}`) + this.$util.toNextRoute('navigateTo', `/pages/commercialBINew/carPortrait?mustAllProvince=${true}`) }, handleGoWarning(){ this.$util.toNextRoute('navigateTo', `/pages/commercialBI/specialCase`) @@ -1627,7 +2016,17 @@ export default { this.$util.toNextRoute('navigateTo', `/pages/operatingStatements/index?time=${this.single}`) }, changeShowPortrait(){ - this.showPortrait = !this.showPortrait + let YD = { + SERVERPART_NAME: "安徽驿达", + SPREGIONTYPE_NAME: "", + SPRegionType_ID: null, + Serverpart_ID: 424, + latitude: 32, + longitude: 117, + } + uni.setStorageSync('currentService',YD) + // this.showPortrait = !this.showPortrait + this.$util.toNextRoute('navigateTo', `/pages/commercialBINew/carPortrait`) }, handleFestival(){ this.$util.toNextRoute('navigateTo', `/pages/commercialBI/formatPortrait?time=${this.lastDay}&serviceInfo=${JSON.stringify(this.nearServiceInfo)}`) @@ -2331,6 +2730,7 @@ $iphoneHeight: env(safe-area-inset-bottom); width: 100%; box-sizing: border-box; padding-bottom: calc( 45px + env(safe-area-inset-bottom)); + background: #F3F4F9; .meng{ width: 100vw; height: 100vh; @@ -2340,13 +2740,14 @@ $iphoneHeight: env(safe-area-inset-bottom); } .header { width: 100%; - background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%); + background: linear-gradient(180deg, #DCE6FF 0%, #F3F4F9 100%); box-sizing: border-box; + padding-bottom: 20rpx; //padding: 0 16px; //position: relative; .headerTop{ width: 100%; - background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6 100%); + background: #DCE6FF; position: fixed; top: 0;left:0; box-sizing: border-box; @@ -2360,9 +2761,8 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; align-items: center; .dateIcon { - width: 16px; - height: 16px; - margin-right: 4px; + width: 168rpx; + height: 50rpx; } .searchIconText{ font-size: 30rpx; @@ -2427,7 +2827,6 @@ $iphoneHeight: env(safe-area-inset-bottom); width: 100%; margin-top: 16rpx; box-sizing: border-box; - padding-bottom: 64rpx; .storeName{ font-size: 14px; font-family: PingFangSC-Regular, PingFang SC; @@ -2447,45 +2846,109 @@ $iphoneHeight: env(safe-area-inset-bottom); .detailItemBox{ width:100%!important; display: inline-block; + .bigBox{ + width: calc(100% - 10px)!important; + background: #fff; + box-shadow: 0rpx 20rpx 40rpx 0rpx rgba(1,27,90,0.06); + border-radius: 38rpx; + padding: 4rpx; + box-sizing: border-box; .box{ - width: calc(100% - 10px)!important; + width: 100%; display: inline-block; border-radius: 32rpx; overflow: hidden; position: relative; - background: rgba(254, 192, 168,0.8); + //background: rgba(254, 192, 168,0.8); .top{ width: 100%; - height: 610rpx; - background: linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%); + background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 68%, #FFFFFF 100%); border-bottom-right-radius: 32rpx; border-bottom-left-radius: 32rpx; box-sizing: border-box; padding: 12px 16px; - .statistics{ + .topTop{ + width: 100%; display: flex; align-items: center; - .staticImg{ - width: 50rpx; - height: 40rpx; + justify-content: space-between; + .statistics{ + display: flex; + align-items: center; + .staticImg{ + width: 50rpx; + height: 40rpx; + } + .staticTitle{ + font-size: 28rpx; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; + line-height: 40rpx; + margin: 0 4px; + } + .staticUnit{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + } + .moreIcon{ + width: 12px; + height: 12px; + display: flex; + align-items: center; + justify-content: center; + border: 2px solid #A69E9F; + border-radius: 50%; + color: #A69E9F; + font-size: 12px; + font-weight: 600; + margin-left: 6px; + position: relative; + .realBox{ + position: absolute; + left: 0;top: 10px; + transform: translateX(-50%); + //right: 0;bottom: 0; + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + } + } + .staticIcon{ + width: 32rpx; + height: 32rpx; + opacity: 0.25; + margin-left: 12rpx; + } } - .staticTitle{ - font-size: 28rpx; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - line-height: 40rpx; - margin: 0 4px; - } - .staticIcon{ - width: 32rpx; - height: 32rpx; - opacity: 0.25; + .haveMore{ + display: flex; + align-items: center; + background: #fff; + padding:10rpx 16rpx; + border-radius: 16rpx; + .haveMoreText{ + font-size: 24rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 36rpx; + } + .haveMoreICon{ + width: 12px; + height: 18px; + } } } .revenueBox{ .revenueTop{ - margin-top: 12px; + margin-top: 16rpx; display: flex; align-items: center; justify-content: space-between; @@ -2535,11 +2998,19 @@ $iphoneHeight: env(safe-area-inset-bottom); } .addValue{ font-size: 36rpx; - font-family: DINAlternate-Bold, DINAlternate; + font-family: DINAlternate, DINAlternate; font-weight: bold; color: #E83944; line-height: 40rpx; } + .rightNav{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 4rpx; + } } } @@ -2576,21 +3047,22 @@ $iphoneHeight: env(safe-area-inset-bottom); .newBox{ width: 100%; box-sizing: border-box; - padding: 16rpx 16rpx 0; + //padding: 16rpx 16rpx 0; //background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx; //margin-top: 32rpx; + margin-top: 48rpx; .progress{ width: 100%; height: 18rpx; border-radius: 12rpx; - background: #FFAB30; + background: #B1C8FF; //overflow: hidden; position: relative; .have{ position: absolute; top: 0;left: 0; width: 60%; - background: #DB573B; + background: #2363FF; height: 100%; border-radius: 12rpx; } @@ -2805,210 +3277,6 @@ $iphoneHeight: env(safe-area-inset-bottom); } } } - .bottom{ - width: 100%; - height: 72rpx; - background: rgba(254, 192, 168,0.8); - box-sizing: border-box; - padding: 16rpx 32rpx; - display: flex; - justify-content: space-between; - align-items: center; - .searchText{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #B33115; - line-height: 40rpx; - } - .searchIcon{ - width: 25px; - height: 14px; - } - } - .otherDetail{ - width: 100%; - .detail{ - width: 100%; - height: 290px; - box-sizing: border-box; - padding: 16px; - border-radius: 8rpx; - //margin-top: 12px; - .detailMessage{ - width: 100%; - height: 100%; - .otherDetailTop{ - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - .otherDetailTopLeft{ - .yearAll{ - font-size: 40rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #6D1301; - line-height: 40rpx; - } - .yearLabel{ - margin-top: 4rpx; - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #6D1301; - line-height: 40rpx; - .unit{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #C5846F; - line-height: 40rpx; - margin-left: 4rpx; - } - } - } - .otherDetailRight{ - .otherDetailAddBox{ - display: flex; - align-items: center; - .otherDetailAddIcon{ - width: 28rpx; - height: 28rpx; - margin-right: 6rpx; - } - .otherDetailAddValue{ - font-size: 36rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; - line-height: 40rpx; - } - } - .otherDetailAddLabel{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #6D1301; - line-height: 40rpx; - text-align: right; - } - } - } - - .otherDetailMiddle{ - margin-top: 42rpx; - .middleItem{ - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - .itemLabel{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #6D1301; - line-height: 40rpx; - .itemText{ - width: 70rpx; - height: 40rpx; - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #C5836E; - line-height: 40rpx; - } - } - .itemValue{ - font-size: 32rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #6D1301; - line-height: 40rpx; - } - } - } - - .otherDetailBottom{ - margin-top: 40rpx; - position: relative; - .bottomItem{ - width: 100%; - .bottomSmallItem{ - width: 100%; - display: flex; - align-items: center; - } - .itemLeft{ - width: 140rpx; - display: flex; - align-items: center; - .leftIcon{ - width: 32rpx; - height: 32rpx; - margin-right: 8rpx; - } - .itemTitle{ - font-size: 26rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #6D1301; - line-height: 40rpx; - text-align: left; - } - } - .itemCenter,.itemRight{ - width: calc((100% - 140rpx)/2); - .itemValue{ - font-size: 28rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #6D1301; - line-height: 40rpx; - } - .itemText{ - font-size: 26rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #6D1301; - line-height: 40rpx; - margin-left: 4rpx; - } - } - .itemCenter{ - text-align: right; - } - .itemRight{ - text-align: right; - } - } - - .monthDetail{ - position: absolute; - left: 50%;top: 50%; - transform: translate(-50%,-50%); - display: inline-block; - padding: 5px 10px; - background: #fff; - border-radius: 10rpx; - box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); - z-index:9; - .monthItem{ - .label{ - display: inline-block; - width: 100px; - } - .value{ - display: inline-block; - text-align: left; - margin-right: 12rpx; - } - } - } - } - } - } - } .noShowMoreBox{ width: 100%; display: flex; @@ -3035,210 +3303,658 @@ $iphoneHeight: env(safe-area-inset-bottom); border-radius: 0rpx 30rpx 0rpx 30rpx; } } + .bottom{ + width: 100%; + height: 72rpx; + background: #DCE7FF; + box-sizing: border-box; + padding: 16rpx 32rpx; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom-left-radius: 38rpx; + border-bottom-right-radius: 38rpx; + .searchText{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #B33115; + line-height: 40rpx; + } + .searchIcon{ + width: 25px; + height: 14px; + } + } + .otherDetail{ + width: 100%; + margin-top: 30px; + .detail{ + width: 100%; + //height: 290px; + box-sizing: border-box; + padding: 16px; + background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 68%, #FFFFFF 100%); + border-bottom-left-radius: 32rpx; + border-bottom-right-radius: 32rpx; + //margin-top: 12px; + .detailMessage{ + width: 100%; + height: 100%; + .otherDetailTop{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .otherDetailTopLeft{ + .yearAll{ + font-size: 40rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .yearLabel{ + margin-top: 4rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .unit{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5846F; + line-height: 40rpx; + margin-left: 4rpx; + } + } + } + .otherDetailRight{ + .otherDetailAddBox{ + display: flex; + align-items: center; + .otherDetailAddIcon{ + width: 28rpx; + height: 28rpx; + margin-right: 6rpx; + } + .otherDetailAddValue{ + font-size: 36rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 40rpx; + } + } + .otherDetailAddLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: right; + } + } + } + + .otherDetailMiddle{ + margin-top: 42rpx; + .middleItem{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .itemLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .itemText{ + width: 70rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5836E; + line-height: 40rpx; + } + } + .itemValue{ + font-size: 32rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + } + } + + .otherDetailBottom{ + margin-top: 40rpx; + position: relative; + .bottomItem{ + width: 100%; + .bottomSmallItem{ + width: 100%; + display: flex; + align-items: center; + } + .itemLeft{ + width: 140rpx; + display: flex; + align-items: center; + .leftIcon{ + width: 32rpx; + height: 32rpx; + margin-right: 8rpx; + } + .itemTitle{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: left; + } + } + .itemCenter,.itemRight{ + width: calc((100% - 140rpx)/2); + .itemValue{ + font-size: 28rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .itemText{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + margin-left: 4rpx; + } + } + .itemCenter{ + text-align: right; + } + .itemRight{ + text-align: right; + } + } + + .monthDetail{ + position: absolute; + left: 50%;top: 50%; + transform: translate(-50%,-50%); + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + .monthItem{ + .label{ + display: inline-block; + width: 100px; + } + .value{ + display: inline-block; + text-align: left; + margin-right: 12rpx; + } + } + } + } + } + .noShowMoreBox{ + width: 100%; + display: flex; + align-items: center; + justify-content: center; + margin-top: 12rpx; + .noShowMore{ + width: 25px; + height: 14px; + } + } + } + + } + } } .noSelectItemBox{ display: inline-block; - margin-top: 12px; - .box{ + .bigBox{ width: calc(100% - 10px)!important; - height: 100%; - display: inline-block; - border-radius: 32rpx; - overflow: hidden; - background: rgba(254, 192, 168,0.8); - .top{ + height: 560rpx; + background: #fff; + box-shadow: 0rpx 20rpx 40rpx 0rpx rgba(1,27,90,0.06); + border-radius: 38rpx; + padding: 4rpx; + box-sizing: border-box; + .box{ width: 100%; - height: 80%; - background: linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%); - border-bottom-right-radius: 32rpx; - border-bottom-left-radius: 32rpx; - box-sizing: border-box; - padding: 12px 16px; - .statistics{ - display: flex; - align-items: center; - .staticImg{ - width: 50rpx; - height: 40rpx; - } - .staticTitle{ - font-size: 28rpx; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - line-height: 40rpx; - margin: 0 4px; - } - .staticIcon{ - width: 32rpx; - height: 32rpx; - } - } - .revenueBox{ - .revenueTop{ + display: inline-block; + border-radius: 32rpx; + overflow: hidden; + position: relative; + //background: rgba(254, 192, 168,0.8); + .top{ + width: 100%; + height: 550rpx; + background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 68%, #FFFFFF 100%); + border-bottom-right-radius: 32rpx; + border-bottom-left-radius: 32rpx; + box-sizing: border-box; + padding: 12px 16px; + .topTop{ + width: 100%; display: flex; align-items: center; justify-content: space-between; - .revenueTopLeft{ + .statistics{ display: flex; align-items: center; - .revenueNumber{ - font-size: 48rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; + .staticImg{ + width: 50rpx; + height: 40rpx; + } + .staticTitle{ + font-size: 28rpx; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; color: #160002; - line-height: 56rpx; + line-height: 40rpx; + margin: 0 4px; } - - } - .revenueTopRight{ - display: flex; - align-items: center; - .addReduce{ - width: 28rpx; - height: 28rpx; - margin-right: 4px; - border-radius: 50%; - } - .addValue{ - font-size: 36rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; + .staticUnit{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; line-height: 40rpx; } + .staticIcon{ + width: 32rpx; + height: 32rpx; + opacity: 0.25; + margin-left: 12rpx; + } + } + .haveMore{ + display: flex; + align-items: center; + background: #fff; + padding:10rpx 16rpx; + border-radius: 16rpx; + .haveMoreText{ + font-size: 24rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 36rpx; + } + .haveMoreICon{ + width: 12px; + height: 18px; + } } - } - .revenueNav{ - display: flex; - align-items: center; - justify-content: space-between; - .leftNav{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #160002; - line-height: 40rpx; - .unit{ + .revenueBox{ + .revenueTop{ + margin-top: 16rpx; + display: flex; + align-items: center; + justify-content: space-between; + .revenueTopLeft{ + display: flex; + align-items: center; + .revenueNumber{ + font-size: 48rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 56rpx; + } + .moreIcon{ + width: 12px; + height: 12px; + display: flex; + align-items: center; + justify-content: center; + border: 2px solid #A69E9F; + border-radius: 50%; + color: #A69E9F; + font-size: 12px; + font-weight: 600; + margin-left: 6px; + position: relative; + .realBox{ + position: absolute; + left: 0;top: 0; + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + } + } + } + .revenueTopRight{ + display: flex; + align-items: center; + .addReduce{ + width: 28rpx; + height: 28rpx; + margin-right: 4px; + border-radius: 50%; + } + .addValue{ + font-size: 36rpx; + font-family: DINAlternate, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 40rpx; + } + .rightNav{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 4rpx; + } + } + + } + .revenueNav{ + display: flex; + align-items: center; + justify-content: space-between; + .leftNav{ + margin-top: 2px; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + //color: #160002; + color: #A69E9F; + line-height: 40rpx; + .unit{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 2px; + } + } + .rightNav{ font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #A69E9F; line-height: 40rpx; - margin-left: 2px; + margin-right: 64rpx; } } - .rightNav{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #A69E9F; - line-height: 40rpx; - margin-right: 64rpx; - } - } - .progress{ + .newBox{ width: 100%; - margin: 6px 0; - height: 24rpx; - border-radius: 12rpx; - background: #FFAB30; - overflow: hidden; - position: relative; - .have{ - position: absolute; - top: 0;left: 0; - width: 60%; - background: #DB573B; - height: 100%; + box-sizing: border-box; + //padding: 16rpx 16rpx 0; + //background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx; + //margin-top: 32rpx; + margin-top: 48rpx; + .progress{ + width: 100%; + height: 18rpx; border-radius: 12rpx; + background: #B1C8FF; + //overflow: hidden; + position: relative; + .have{ + position: absolute; + top: 0;left: 0; + width: 60%; + background: #2363FF; + height: 100%; + border-radius: 12rpx; + } + .haveNoticeBox{ + position: absolute; + bottom: 13px;left: 50%; + transform: translateX(-50%); + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + + } } - } - .message{ - width: 100%; - display: flex; - .smallDetailItem{ - width: 50%; - .messageTop{ - display: flex; - align-items: center; - .type{ - width: 24rpx; - height: 12rpx; - background: #DB573B; - border-radius: 6rpx; - margin-right: 6px; + .message{ + width: 100%; + display: flex; + margin-top: 16rpx; + .smallDetailItem{ + width: 50%; + .messageTop{ + display: flex; + align-items: center; + .type{ + width: 24rpx; + height: 12rpx; + border-radius: 6rpx; + margin-right: 6px; + } + .typeTitle{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #160002; + line-height: 40rpx; + .unit{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 2px; + } + } } - .typeTitle{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #160002; - line-height: 40rpx; - .unit{ + .middle{ + margin-top: 6px; + margin-left: 20px; + display: flex; + align-items: center; + .money{ + font-size: 36rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 44rpx; + } + .addItem{ + margin-left: 6px; + display: inline-block; + padding: 2px 4px; + font-size: 28rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 32rpx; + background: rgba(232, 57, 68, 0.1); + border-radius: 18rpx; + } + } + .messageBottom{ + margin-left: 20px; + display: flex; + align-items: center; + .addText{ + font-size: 28rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 32rpx + } + .addType{ font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #A69E9F; line-height: 40rpx; - margin-left: 2px; + margin-left: 4px; } } } - .middle{ - margin-top: 6px; - margin-left: 20px; - display: flex; - align-items: center; - .money{ - font-size: 36rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #160002; - line-height: 44rpx; + } + .moneyRate{ + width: 100%; + box-sizing: border-box; + margin-top: 16rpx; + height: 144rpx; + display: flex; + align-items: center; + .leftBox{ + width: 144rpx; + height: 144rpx; + margin-right: 16rpx; + position: relative; + .rateChartsBox{ + width: 144rpx; + height: 144rpx; } - .addItem{ - margin-left: 6px; + .haveNoticeBox{ + position: absolute; + bottom: 0;left: 0; + transform: translateY(80%); display: inline-block; - padding: 2px 4px; - font-size: 28rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; - line-height: 32rpx; - background: rgba(232, 57, 68, 0.1); - border-radius: 18rpx; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + .label{ + display: block; + } } } - .messageBottom{ - margin-left: 20px; + .rightBox{ + flex: 1; display: flex; align-items: center; - .addText{ - font-size: 28rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; - line-height: 32rpx - } - .addType{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #A69E9F; - line-height: 40rpx; - margin-left: 4px; + .noticeItem{ + width: 50%; + .noticeTop{ + width: 24rpx; + height: 12rpx; + background: #A66A37; + border-radius: 6rpx; + margin-bottom: 8rpx; + } + .noticeText{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #160002; + line-height: 40rpx; + margin-bottom: 6rpx; + .noticeSmallText{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 4rpx; + } + } + .noticeMoney{ + font-size: 36rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 44rpx; + } } } } } + .goBusiness{ + width: 100%; + display: flex; + justify-content: flex-end; + .bussinessRight{ + display: flex; + align-items: center; + .bussinessText{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin: 0 4px; + } + .moreIcon{ + width: 12px; + height: 12px; + display: flex; + align-items: center; + justify-content: center; + border: 2px solid #A69E9F; + border-radius: 50%; + color: #A69E9F; + font-size: 12px; + font-weight: 600; + margin-left: 6px; + position: relative; + .realBox{ + position: absolute; + //left: 0;top: 0; + right: 0;bottom: 0; + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + } + } + .staticIcon{ + width: 32rpx; + height: 32rpx; + opacity: 0.25; + } + } + } + } + } + + + .monthBox{ + display: inline-block; + position: absolute; + right: 1px;top: 1px; + padding: 4rpx 26rpx; + font-size: 28rpx; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #B33115; + line-height: 40rpx; + background: #FFD2C4; + border-radius: 0rpx 30rpx 0rpx 30rpx; } } .bottom{ width: 100%; - height: 20%; - background: rgba(254, 192, 168,0.8); + height: 72rpx; + background: #DCE7FF; box-sizing: border-box; padding: 16rpx 32rpx; display: flex; @@ -3253,77 +3969,206 @@ $iphoneHeight: env(safe-area-inset-bottom); } .searchIcon{ width: 25px; - height: 16px; + height: 14px; } } .otherDetail{ width: 100%; + margin-top: 30px; .detail{ width: 100%; - height: 190px; + //height: 290px; box-sizing: border-box; - padding: 16px 0; - border-radius: 8rpx; + padding: 16px; + background: linear-gradient(180deg, #DCE6FF 0%, #FFFFFF 68%, #FFFFFF 100%); + border-bottom-left-radius: 32rpx; + border-bottom-right-radius: 32rpx; //margin-top: 12px; - .detailItem { - width: 33%; - box-sizing: border-box; - padding-left: 16px; - height: 42px; - text-align: left; - float: left; - margin-bottom: 16px; - .itemName { - font-size: 14px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #782717; - opacity: 0.8; - line-height: 40rpx; - margin-bottom: 2px; - .prompt{ - width: 12px; - height: 12px; - border: 1px solid #782717; - border-radius:50%; - display: flex; - align-items: center; - justify-content: center; - font-size: 10px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 600; - color: #782717; + .detailMessage{ + width: 100%; + height: 100%; + .otherDetailTop{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .otherDetailTopLeft{ + .yearAll{ + font-size: 40rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .yearLabel{ + margin-top: 4rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .unit{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5846F; + line-height: 40rpx; + margin-left: 4rpx; + } + } } - .itemUnit { - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #C8806C; - line-height: 40rpx; - margin-left: 2px; + .otherDetailRight{ + .otherDetailAddBox{ + display: flex; + align-items: center; + .otherDetailAddIcon{ + width: 28rpx; + height: 28rpx; + margin-right: 6rpx; + } + .otherDetailAddValue{ + font-size: 36rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 40rpx; + } + } + .otherDetailAddLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: right; + } } } - .price { - font-size: 16px; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #782717; - line-height: 40rpx; + + .otherDetailMiddle{ + margin-top: 42rpx; + .middleItem{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .itemLabel{ + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + .itemText{ + width: 70rpx; + height: 40rpx; + font-size: 28rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #C5836E; + line-height: 40rpx; + } + } + .itemValue{ + font-size: 32rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + } + } + + .otherDetailBottom{ + margin-top: 40rpx; + position: relative; + .bottomItem{ + width: 100%; + .bottomSmallItem{ + width: 100%; + display: flex; + align-items: center; + } + .itemLeft{ + width: 140rpx; + display: flex; + align-items: center; + .leftIcon{ + width: 32rpx; + height: 32rpx; + margin-right: 8rpx; + } + .itemTitle{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + text-align: left; + } + } + .itemCenter,.itemRight{ + width: calc((100% - 140rpx)/2); + .itemValue{ + font-size: 28rpx; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #6D1301; + line-height: 40rpx; + } + .itemText{ + font-size: 26rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #6D1301; + line-height: 40rpx; + margin-left: 4rpx; + } + } + .itemCenter{ + text-align: right; + } + .itemRight{ + text-align: right; + } + } + + .monthDetail{ + position: absolute; + left: 50%;top: 50%; + transform: translate(-50%,-50%); + display: inline-block; + padding: 5px 10px; + background: #fff; + border-radius: 10rpx; + box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21); + z-index:9; + .monthItem{ + .label{ + display: inline-block; + width: 100px; + } + .value{ + display: inline-block; + text-align: left; + margin-right: 12rpx; + } + } + } + } + } + .noShowMoreBox{ + width: 100%; + display: flex; + align-items: center; + justify-content: center; + margin-top: 12rpx; + .noShowMore{ + width: 25px; + height: 14px; } } } - } - .noShowMoreBox{ - width: 100%; - display: flex; - align-items: center; - justify-content: center; - position: absolute; - left: 0;bottom: 30px; - .noShowMore{ - width: 25px; - height: 14px; - } + } } } @@ -3413,6 +4258,11 @@ $iphoneHeight: env(safe-area-inset-bottom); } } } + .sliderBox{ + width: 100%; + height: 16rpx; + margin-top: 20rpx; + } .other { width: calc(100% - 32px); position: absolute; @@ -3660,168 +4510,6 @@ $iphoneHeight: env(safe-area-inset-bottom); } } } - //.firstHeader{ - // background: linear-gradient(315deg, #FF8670 0%, #FFDCA8 100%)!important; - // .headerTop{ - // background: linear-gradient(315deg, #FFAF95 0%, #FFD6A6 100%)!important; - // } - //} - .secondHeader{ - background: linear-gradient(315deg, #69BDE6 0%, #9BE2F5 100%)!important; - .headerTop{ - background: linear-gradient(315deg, #69BDE6 0%, #9BE2F5 100%)!important; - } - .storeDetail{ - .detailItemBox{ - .box{ - .bottom{ - .searchText{ - color: #025B93!important; - } - } - .monthBox{ - background: linear-gradient(134deg, #A6DDFF 0%, #BCEFFF 100%)!important; - color: #025B93!important; - } - .otherDetail{ - .detail{ - .yearAll{ - color: #013F66!important; - } - .yearLabel{ - color: #013F66!important; - .unit{ - color: #649BB9!important; - } - } - .otherDetailAddLabel{ - color: #5E97B7!important; - } - .itemLabel{ - color: #013F66!important; - .itemText{ - color: #6199B9!important; - } - } - .itemValue{ - color: #013F66!important; - } - .itemTitle{ - color: #013F66!important; - } - .itemText{ - color: #5B95B7!important; - } - } - } - } - } - } - } - .thirdHeader{ - background: linear-gradient(315deg, #4876E1 0%, #AFD2FD 100%)!important; - .headerTop{ - background: linear-gradient(315deg, #769FEE 0%, #A9CCFB 100%)!important; - } - .storeDetail{ - .detailItemBox{ - .box{ - .bottom{ - .searchText{ - color: #2249A2!important; - } - } - .monthBox{ - background: linear-gradient(134deg, #B9CEFF 0%, #CADFFF 100%)!important; - color: #2249A2!important; - } - .otherDetail{ - .detail{ - .yearAll{ - color: #002780!important; - } - .yearLabel{ - color: #002780!important; - .unit{ - color: #6786C5!important; - } - } - .otherDetailAddLabel{ - color: #6483C4!important; - } - .itemLabel{ - color: #002780!important; - .itemText{ - color: #6786C5!important; - } - } - .itemValue{ - color: #002780!important; - } - .itemTitle{ - color: #002780!important; - } - .itemText{ - color: #6786C5!important; - } - } - } - } - } - } - } - .forthHeader{ - background: linear-gradient(315deg, #D9A879 0%, #F6D6AC 100%)!important; - .headerTop{ - background: linear-gradient(315deg, #D9A879 0%, #F6D6AC 100%)!important; - } - .storeDetail{ - .detailItemBox{ - .box{ - .bottom{ - .searchText{ - color: #783F0F!important; - } - } - .monthBox{ - background: linear-gradient(134deg, #FFCDA3 0%, #FFE8CA 100%)!important; - color: #783F0F!important; - } - .otherDetail{ - .detail{ - .yearAll{ - color: #572800!important; - } - .yearLabel{ - color: #572800!important; - .unit{ - color: #B08C6B!important; - } - } - .otherDetailAddLabel{ - color: #AC8766!important; - } - .itemLabel{ - color:#572800!important; - .itemText{ - color: #B08C6B!important; - } - } - .itemValue{ - color: #572800!important; - } - .itemTitle{ - color: #572800!important; - } - .itemText{ - color: #B08C6B!important; - } - } - } - } - } - } - } .funEntry{ width: 100%; //height: 208px; @@ -3829,190 +4517,48 @@ $iphoneHeight: env(safe-area-inset-bottom); background-repeat: no-repeat; background-size: 100% 100%; box-sizing: border-box; - padding: 20px 0 40px 0; - transform: translateY(-16px); - background-color: #fff; + padding: 14rpx 0 32px 0; + //transform: translateY(-16px); border-top-right-radius: 16px; border-top-left-radius: 16px; .funBox{ width: calc(100% - 64rpx); margin-left: 32rpx; - height: 530rpx; - margin-bottom: 16px; - .firstBox{ + background: #FFFFFF; + border-radius: 16rpx; + box-sizing: border-box; + padding:32rpx; + display: flex; + flex-flow: wrap; + .funItem{ + width: 25%; display: flex; - margin-bottom: 18rpx; - .yesterday{ - display: inline-block; - width: 450rpx; - height: 212rpx; - background: linear-gradient(135deg, #D7ECFF 0%, #E8F1FF 38%, #E7F2FF 60%, #E1EDFE 79%, #C2DCFE 100%); - margin-right: 18rpx; - border-radius: 20rpx; - box-sizing: border-box; - padding: 20rpx 24rpx; - position: relative; - overflow: hidden; - .dayTop{ - display: flex; - justify-content: space-between; - align-items: center; - .dayTitle{ - font-size: 32rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - color: #0F62D9; - line-height: 40rpx; - .unit{ - margin-left: 4px; - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #8BB7F5; - line-height: 40rpx; - } - } - .uploadNumber{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #0561E5; - line-height: 40rpx; + justify-content: center; + .funItemContent{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + .funIconBox{ + width: 88rpx; + height: 88rpx; + border-radius: 50%; + overflow: hidden; + margin-bottom: 16rpx; + .funIcon{ + width: 100%; + height: 100%; } } - .valueBox{ - display: flex; - align-items: center; - margin-top: 16rpx; - .value{ - font-size: 40rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #001635; - line-height: 48rpx; - } - .addBox{ - display: flex; - align-items: center; - margin-left: 16rpx; - .addIcon{ - width: 28rpx; - height: 28rpx; - } - .addValue{ - font-size: 32rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; - line-height: 40rpx; - } - .noData{ - width: 40rpx; - height: 40rpx; - } - .noDataText{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 600; - color: #0561E5; - margin-left: 8rpx; - } - } - } - .timeBox{ - display: flex; - align-items: center; - margin-top: 32rpx; - .timeIcon{ - width: 32rpx; - height: 32rpx; - margin-right: 12rpx; - } - .timeText{ - font-size: 24rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #90BFFF; - line-height: 34rpx; - } - } - .typeImg{ - width: 52px; - height: 52px; - position: absolute; - right: 0;bottom: 0; - } - } - .report{ - display: inline-block; - background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex/funSecond.svg"); - background-repeat: no-repeat; - background-size: 100% 100%; - width: 218rpx; - height: 212rpx; - border-radius: 20rpx; - box-sizing: border-box; - padding: 20rpx 24rpx; - position: relative; - overflow: hidden; - .reportTitle{ - font-size: 32rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - color: #0283B5; + .funText{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #160002; line-height: 40rpx; - display: block; - } - .timeIcon{ - width: 32rpx; - height: 32rpx; - margin-top: 96rpx; - } - .typeImg{ - width: 52px; - height: 52px; - position: absolute; - bottom: 0;right: 0; } } } - .secondView{ - width: 100%; - height: 148rpx; - display: flex; - justify-content: space-between; - .funItemView{ - display: inline-block; - background-repeat: no-repeat; - background-size: 100% 100%; - width:216rpx; - height: 148rpx; - border-radius: 20rpx; - box-sizing: border-box; - padding: 20rpx 24rpx; - position: relative; - overflow: hidden; - .funItemTitle{ - font-size: 32rpx; - font-family: Alimama ShuHeiTi; - font-weight: bold; - line-height: 40rpx; - display: block; - } - .timeIcon{ - width: 32rpx; - height: 32rpx; - margin-top: 32rpx; - } - .typeImg{ - width: 80rpx; - height: 80rpx; - position: absolute; - right: 0;bottom: 0; - } - } - } - } .funList{ @@ -4232,161 +4778,159 @@ $iphoneHeight: env(safe-area-inset-bottom); } } - .carWarning{ - width:calc(100% - 32px); - margin-left: 16px; - //margin-top: 20px; - margin-bottom: 20px; - background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/home/warningBg.svg"); - background-repeat: no-repeat; - background-size: cover; - box-sizing: border-box; - padding: 12px 16px; + .bigCarBox{ + width: calc(100vw - 68rpx); + margin-left: 34rpx; + background: #fff; border-radius: 16rpx; - position: relative; - .carWarningTop{ - width: 100%; - display: flex; - justify-content: space-between; - align-items: center; - .moreStoreBox{ - display: flex; - align-items: center; - .moreText{ - font-size: 28rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #A69E9F; - line-height: 36rpx; - } - .moreIcon{ - width: 18px; - height: 18px; - } - } - .warningBox{ - width: 150px; - height: 36px; - position: relative; - .warningIcon{ - position: absolute; - left: 0;top: 0; - width: 36px; - height: 36px; - z-index: 2; - } - .trafficBox{ - position: absolute; - left: 28px;top: 3px; - z-index: 1; - width: 120px; - height: 30px; - background: #D4F0F5; - border-top-right-radius: 15px; - border-bottom-right-radius: 15px; - box-sizing: border-box; - padding: 4px 12px; - display: flex; - align-items: center; - .trafficCar{ - font-size: 16px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 600; - color: #007DA5; - line-height: 16px; - } - .moreIcon{ - margin-left: 16rpx; - width: 32rpx; - height: 32rpx; - } - } - } - } - .contentList{ - width: 100%; - border-radius: 8px; - .contentItem{ - padding: 6px 0; + box-sizing: border-box; + padding: 2rpx; + margin-bottom: 26rpx; + .carWarning{ + background: linear-gradient(180deg, #EDF5FF 0%, #FFFFFF 100%); + padding: 12px 16px 8rpx; + border-radius: 16rpx; + position: relative; + .carWarningTop{ + width: 100%; display: flex; justify-content: space-between; align-items: center; - .index{ - width: 12px; - height: 12px; - position: relative; - .boxBg{ - width: 12px; - height: 12px; - background: #10BFCE; - filter: blur(4px); - position: absolute; - top: 0;left: 0; - } - .indexText{ - position: absolute; - top: 50%;left: 50%; - transform: translate(-50%,-50%); - z-index: 2; - font-size: 16px; - font-family: DingTalk-JinBuTi, DingTalk; - font-weight: normal; - color: #160002; - line-height: 20px; - } - } - .serviceBox{ - width: 35%; - display: inline-block; - margin-left: 8px; - .name{ - font-size: 14px; - font-family: PingFangSC-Semibold, PingFang SC; - font-weight: 600; - color: #160002; - line-height: 26px; - } - .position{ - font-size: 12px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #786B6C; - line-height: 20px; - margin-left: 4rpx; - } - } - .numberBox{ - width: 30%; - .number{ - font-size: 16px; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #160002; - line-height: 24px; - } - .unit{ - font-size: 14px; + .moreStoreBox{ + display: flex; + align-items: center; + .moreText{ + font-size: 28rpx; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #A69E9F; - line-height: 20px; - margin-left: 2px; + line-height: 36rpx; + } + .moreIcon{ + width: 18px; + height: 18px; } } - .addBox{ - width: calc(30% - 20px); + .warningBox{ display: flex; align-items: center; - .addIcon{ - width: 14px; - height: 14px; + .warningIcon{ + width: 48rpx; + height: 48rpx; + margin-right: 8rpx; } - .add{ - font-size: 16px; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: #E83944; - line-height: 24px; + .trafficBox{ + display: flex; + align-items: center; + .trafficCar{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 600; + color: #160002; + line-height: 40rpx; + } + .trafficUnit{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + margin-left: 8rpx; + } + .moreIcon{ + margin-left: 16rpx; + width: 32rpx; + height: 32rpx; + } + } + } + } + .contentList{ + width: 100%; + border-radius: 8px; + margin-top: 32rpx; + .contentItem{ + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 24rpx; + .index{ + width: 12px; + height: 12px; + position: relative; + .boxBg{ + width: 12px; + height: 12px; + background: #8BBBFF; + filter: blur(4px); + position: absolute; + top: 0;left: 0; + } + .indexText{ + position: absolute; + top: 50%;left: 50%; + transform: translate(-50%,-50%); + z-index: 2; + font-size: 16px; + font-family: DingTalk-JinBuTi, DingTalk; + font-weight: normal; + color: #160002; + line-height: 20px; + } + } + .serviceBox{ + width: 35%; + display: inline-block; + margin-left: 8px; + .name{ + font-size: 14px; + font-family: PingFangSC-Semibold, PingFang SC; + font-weight: 600; + color: #160002; + line-height: 26px; + } + .position{ + font-size: 12px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 20px; + margin-left: 4rpx; + } + } + .numberBox{ + width: 30%; + .number{ + font-size: 16px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 24px; + } + .unit{ + font-size: 14px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 20px; + margin-left: 2px; + } + } + .addBox{ + width: calc(30% - 20px); + display: flex; + align-items: center; + .addIcon{ + width: 14px; + height: 14px; + } + .add{ + font-size: 16px; + font-family: DINAlternate-Bold, DINAlternate; + font-weight: bold; + color: #E83944; + line-height: 24px; + } } } } diff --git a/pages/index/new_file.html b/pages/index/new_file.html deleted file mode 100644 index e69de29..0000000 diff --git a/pages/index/old/index.vue b/pages/index/old/index.vue new file mode 100644 index 0000000..7deb8ad --- /dev/null +++ b/pages/index/old/index.vue @@ -0,0 +1,5059 @@ + + + + + diff --git a/pages/map/commercialType.vue b/pages/map/commercialType.vue index e8b374c..351262a 100644 --- a/pages/map/commercialType.vue +++ b/pages/map/commercialType.vue @@ -34,7 +34,7 @@ export default { data(){ return { typeList:[ - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBI/carPortrait',text:'车流'}, + {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBINew/carPortrait',text:'车流'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/guest.svg',url:'/pages/commercialBI/guestPortrait',text:'客群'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/business_icon.svg',url:'/pages/commercialBI/managePortrait',text:'经营'}, {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/trade.svg',url:'/pages/commercialBI/businessPortrait',text:'交易'}, diff --git a/pages/map/detail.vue b/pages/map/detail.vue index a575497..6946d17 100644 --- a/pages/map/detail.vue +++ b/pages/map/detail.vue @@ -34,14 +34,14 @@ - +
- {{ currentImg<1?1:currentImg>topBgRealLength?topBgRealLength:currentImg }} / {{ topBgRealLength }} + {{ currentImg<1?1:currentImg>topBgRealLength?topBgRealLength:currentImg }} / {{ topBgRealLength }}
@@ -226,7 +226,7 @@ export default { let seat = uni.getStorageSync('currentService') this.handleSearch(seat) this.topBg = [] - this.currentImg = 1 + this.currentImg = 1 }, onUnload() { @@ -245,7 +245,7 @@ export default { }) }else if(value==='next'){ uni.redirectTo({ - url:`/pages/commercialBI/carPortrait` + url:`/pages/commercialBINew/carPortrait` }) } }, @@ -283,7 +283,6 @@ export default { } this.typeList[1].isShow = this.info.STARTDATE if (this.info && this.info.ImageLits && this.info.ImageLits.length>0){ - console.log('111') this.topBg = this.info.ImageLits this.topBg.unshift({key:'previous'}) this.topBg.push({key:'next'}) @@ -298,6 +297,22 @@ export default { this.currentImg = 1 this.topBgRealLength = this.topBg.length - 2 } + // if (this.info && this.info.ImageLits && this.info.ImageLits.length>0){ + // console.log('111') + // this.topBg = this.info.ImageLits + // this.topBg.unshift({key:'previous'}) + // this.topBg.push({key:'next'}) + // this.currentImg = 1 + // this.topBgRealLength = this.topBg.length-2 + // console.log('this.topBg',this.topBg) + // this.$forceUpdate() + // }else{ + // this.topBg = ['https://eshangtech.com/ShopICO/ahyd-BID/service/default.png'] + // this.topBg.unshift({key:'previous'}) + // this.topBg.push({key:'next'}) + // this.currentImg = 1 + // this.topBgRealLength = this.topBg.length - 2 + // } }, //选择服务区 @@ -472,19 +487,14 @@ export default { background-size: 100% 100%; .sliderPage{ width: 100%; - height: 16rpx; z-index: 9; position: absolute; - bottom: 20px; + top: 20px; left: 0; - display: flex; - justify-content: center; - align-items: center; - .sliderBg{ - width: 120rpx; - background: #fff; - border-radius: 8rpx; - } + border-top: 2px solid #6F747A; + border-bottom: 2px solid #6F747A; + background: transparent; + padding-bottom: 12rpx; } //.img{ // width: 100%; diff --git a/pages/map/index.vue b/pages/map/index.vue index 6758fdd..7dfcced 100644 --- a/pages/map/index.vue +++ b/pages/map/index.vue @@ -321,11 +321,9 @@ export default { this.$util.toNextRoute('navigateTo', `/pages/map/detail`) }else{ if (this.chartType){ - if (pageList.length>2){ - uni.navigateBack({ - delta: 1 - }) - } + uni.navigateBack({ + delta: 1 + }) }else{ if (pageList.length>2){ uni.navigateBack({ diff --git a/pages/map/sliderPage.vue b/pages/map/sliderPage.vue index 0d58a54..acbdb6d 100644 --- a/pages/map/sliderPage.vue +++ b/pages/map/sliderPage.vue @@ -1,43 +1,99 @@ diff --git a/pages/newamine/index.vue b/pages/newamine/index.vue index ee1f0b9..601aa8d 100644 --- a/pages/newamine/index.vue +++ b/pages/newamine/index.vue @@ -363,6 +363,7 @@ export default { dailyServiceList:[],// 整改显示的列表 dailyAllList:[], // 整改的全部列表 dailyFlag:true,// 是否能调用巡检方法 + comePage:'' } }, onLoad(query){ @@ -373,6 +374,9 @@ export default { if (query.type){ this.selectTab = Number(query.type) } + if (query.comePage){ + this.comePage = query.comePage + } // 获取手机参数对页面进行适配 let systemInfo = uni.getSystemInfoSync() @@ -783,9 +787,16 @@ export default { url: '/pages/index/index' }) }else{ - uni.switchTab({ - url: '/pages/userCenter/userCenter' - }) + if (this.comePage){ + uni.navigateBack({ + delta: 1 + }) + }else{ + uni.switchTab({ + url: '/pages/userCenter/userCenter' + }) + } + } }, diff --git a/pages/userCenter/userCenter.vue b/pages/userCenter/userCenter.vue index 63dc1ed..1b5167f 100644 --- a/pages/userCenter/userCenter.vue +++ b/pages/userCenter/userCenter.vue @@ -103,7 +103,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue"; { id:'', name: '车流', - homeUrl: '/pages/commercialBI/carPortrait', + homeUrl: '/pages/commercialBINew/carPortrait', imagePath: 'https://eshangtech.com/ShopICO/ahyd-BID/user/traffic.svg', isNotice:'', value: 2,