From 0003a55c0a63cb9bc8827f9084107e5310f75fae Mon Sep 17 00:00:00 2001 From: cclu <1106109051@qq.com> Date: Wed, 13 Dec 2023 18:34:07 +0800 Subject: [PATCH] update --- pages.json | 12 + pages/commercialBI/businessPortrait.vue | 19 +- pages/commercialBI/carPortrait.vue | 117 ++- pages/commercialBI/commercialType.vue | 38 +- pages/commercialBI/components/headerTop.vue | 149 +++- pages/commercialBI/guestPortrait.vue | 20 +- pages/commercialBI/managePortrait.vue | 18 +- pages/index/components/rateCharts.vue | 123 ++- pages/index/index.vue | 821 ++++++++++-------- pages/operatingStatements/detail.vue | 2 +- pages/revenue/component/otherCharts.vue | 1 + pages/revenueStatistics/index.vue | 627 ++++++++++++- static/public/font2/stylesheet.css | 2 +- .../public/revenueStatistics/stylesheet.css | 2 +- 14 files changed, 1541 insertions(+), 410 deletions(-) diff --git a/pages.json b/pages.json index db09e74..72a8463 100644 --- a/pages.json +++ b/pages.json @@ -132,6 +132,18 @@ } ] }, + { + "root": "pages/revenueStatistics", + "pages": [ + { + "path": "index", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + } + ] + }, { "root": "pages/newamine", "pages": [ diff --git a/pages/commercialBI/businessPortrait.vue b/pages/commercialBI/businessPortrait.vue index b1ddc63..41d27b8 100644 --- a/pages/commercialBI/businessPortrait.vue +++ b/pages/commercialBI/businessPortrait.vue @@ -4,7 +4,8 @@ + :serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo" + :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"/>
@@ -104,8 +105,22 @@ export default { labelList:['女性','高消费','喜爱奶茶','浙江','20-30岁','江苏'],//标签 title:'交易画像',//页面标题 bgColor:'180deg, #FFBA07 0%, #F38309 100%', - bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/commercial/businessPortraitBg.svg',//背景图片路径 + bgUrl: '/static/images/newCommercialBI/businessPortraitBg.svg',//背景图片路径 page:'/pages/commercialBI/businessPortrait', + + detailBoxBg:'linear-gradient(136deg, #F6F2E9 0%, #FFFFFF 100%);', + topLeftBg:'linear-gradient(180deg, rgba(255, 186, 7, 0.2) 0%, rgba(243, 131, 9, 0.2) 100%)',// 类别背景 + topLeftColor:'#F38609',// 类别文字颜色 + iconObj:{ + car:'/static/images/newCommercialBI/businessCar.svg', + charge:'/static/images/newCommercialBI/businessCharge.svg', + bady:'/static/images/newCommercialBI/businessBady.svg', + guestRoom:'/static/images/newCommercialBI/businessGuestRoom.svg' + }, + haveIconObj:{ + have:'/static/images/newCommercialBI/businessHave.svg', + noHave:'/static/images/newCommercialBI/businessNoHave.svg' + }, time: '',//跳转携带的时间 menu: {},//手机配置信息 transactionList:[],//交易分析数据 diff --git a/pages/commercialBI/carPortrait.vue b/pages/commercialBI/carPortrait.vue index 0b597ae..240dbfe 100644 --- a/pages/commercialBI/carPortrait.vue +++ b/pages/commercialBI/carPortrait.vue @@ -2,10 +2,10 @@
- +
-
+
分析 {{analyseText}} @@ -33,13 +33,44 @@
-
-
-
- {{item}} -
-
+ + + + + + + +
+
+
A类
+
+ 查看更多 + +
+
+
+ + + 司机之家 +
+
+ + + 充电桩 +
+
+ + + 母婴室 +
+
+ + + 客房 +
+
+
@@ -1173,12 +1204,14 @@ export default { min-height: 100vh; .header{ width: 100%; - height: calc(1.056 * 100vw); + height: 648rpx; + //height: calc(1.056 * 100vw); padding: 0 16px; box-sizing: border-box; position: relative; background-repeat: no-repeat; - background-size: cover; + //background-size: cover; + background-size: 100% 100%; .car{ width: 100vw; height: 100%; @@ -1369,6 +1402,70 @@ export default { height: 95px; } } + .detailBox{ + width: 340rpx; + height: 312rpx; + background: linear-gradient(136deg, #F0F6FF 0%, #FFFFFF 100%); + border-radius: 16rpx; + margin-top: 32rpx; + box-sizing: border-box; + padding: 24rpx 32rpx; + .detailTop{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .topLeft{ + background: linear-gradient(180deg, rgba(49, 144, 255, 0.2) 0%, rgba(22, 87, 255, 0.2) 100%); + border-radius: 8rpx; + padding: 0 16rpx; + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #1E67FF; + line-height: 40rpx; + } + .topRight{ + display: flex; + align-items: center; + .rightText{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #A69E9F; + line-height: 40rpx; + } + .moreIcon{ + width: 24rpx; + height: 24rpx; + } + } + } + .functionList{ + .functionItem{ + margin-top: 16rpx; + display: flex; + align-items: center; + .haveFun{ + width: 32rpx; + height: 32rpx; + margin-right: 18rpx; + } + .carIcon{ + width: 32rpx; + height: 32rpx; + margin-right: 4rpx; + } + .funText{ + font-size: 28rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #6C737A; + line-height: 40rpx; + } + } + } + } } } .headerTop{ diff --git a/pages/commercialBI/commercialType.vue b/pages/commercialBI/commercialType.vue index cf07d6a..07dcff8 100644 --- a/pages/commercialBI/commercialType.vue +++ b/pages/commercialBI/commercialType.vue @@ -2,6 +2,7 @@
+ {{item.text}}
@@ -13,11 +14,13 @@ export default { data(){ return { typeList:[ - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBI/carPortrait'}, - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/guest.svg',url:'/pages/commercialBI/guestPortrait'}, - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/business_icon.svg',url:'/pages/commercialBI/managePortrait'}, - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/trade.svg',url:'/pages/commercialBI/businessPortrait'}, - {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/brand.svg',url:'/pages/commercialBI/formatPortrait'}, + {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/car.svg',url:'/pages/commercialBI/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:'交易'}, + {img:'https://eshangtech.com/ShopICO/ahyd-BID/index/brand.svg',url:'/pages/commercialBI/formatPortrait',text:'品牌'}, + {img:'/static/images/newCommercialBI/newExamineIcon.svg',url:`/pages/newamine/index?come=index&type=${1}&time=${this.time}`,text:'考核'}, + {img:'/static/images/newCommercialBI/inspectionIcon.svg',url:`/pages/newamine/index?come=index&type=${2}&time=${this.time}`,text:'巡检'}, ], showTypeList:[], selectIndex: 5, @@ -28,6 +31,10 @@ export default { have:{ type:Number, default:5 + }, + time:{ + type: String, + default: '' } }, watch:{ @@ -74,21 +81,30 @@ export default { .typeBigList{ position: fixed; right: 0; - top: 15%; + top: 12%; .item{ - width: 45px; - height: 40px; + width: 150rpx; + height: 80rpx; border-radius: 20px 0 0 20px; + box-sizing: border-box; + padding: 14rpx; background: rgba(255,255,255,0.8); display: flex; align-items: center; margin-bottom: 10px; border: 1px solid #ccc; .icon{ - width: 30px; - height: 30px; + width: 52.5rpx; + height: 52.5rpx; border-radius: 50%; - margin-left: 10px; + margin-right: 10rpx; + } + .text{ + font-size: 24rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + color: #786B6C; + line-height: 36rpx; } } } diff --git a/pages/commercialBI/components/headerTop.vue b/pages/commercialBI/components/headerTop.vue index 8bb548f..24acc0b 100644 --- a/pages/commercialBI/components/headerTop.vue +++ b/pages/commercialBI/components/headerTop.vue @@ -24,17 +24,49 @@
-
-
{{ item }}
+ +
+
+
A类
+
+ 查看更多 + +
+
+
+
+ + + 司机之家 +
+
+ + + 充电桩 +
+
+ + + 母婴室 +
+
+ + + 客房 +
+
+ + + + + +
-
- 分析 - {{analyseText}} -
+ + + +
@@ -86,7 +118,35 @@ export default { analyseInfo:{ type:Object, default:()=>{} - } + }, + iconObj:{ + type:Object, + default:{ + car:'', + charge:'', + bady:'', + guestRoom:'' + } + }, + haveIconObj:{ + type:Object, + default:{ + have:'', + noHave:'', + } + }, + topLeftBg:{ + type:String, + default:'' + }, + topLeftColor:{ + type:String, + default:'' + }, + detailBoxBg:{ + type:String, + default:'' + }, }, data() { return { @@ -172,12 +232,14 @@ export default { diff --git a/pages/index/index.vue b/pages/index/index.vue index e61d54b..349d06b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -26,15 +26,17 @@
- + - + - - - 营收统计 - + + + + 营收统计 + + @@ -59,43 +61,61 @@ 同比 - - - - 自营:{{progressObj.owner}}%， - 外租:{{progressObj.other}}% + + + + + 自营:{{progressObj.owner}}%， + 外租:{{progressObj.other}}% + + - - - - - - - - 自营收入/万元 + + + + + 自营收入/万元 + + + {{typeList[0].showValue?$util.fmoney(typeList[0].showValue,2):''}} + {{monthAdd || ''}}% + + + {{typeList[0].add?typeList[0].add:''}} + 同比 + - - {{typeList[0].showValue?$util.fmoney(typeList[0].showValue,2):''}} - {{monthAdd || ''}}% - - - {{typeList[0].add?typeList[0].add:''}} - 同比 + + + + + 外租收入/万元 + + + {{typeList[1].showValue?$util.fmoney(typeList[1].showValue,2):''}} + + + + {{typeList[1].add?typeList[1].add:''}} + 同比 + - - - - - 外租收入/万元 + + + - - {{typeList[1].showValue?$util.fmoney(typeList[1].showValue,2):''}} - - - - {{typeList[1].add?typeList[1].add:''}} - 同比 + + + + 驿站营收/万元 + 3,512.54 + + + + 商家营收/万元 + 2,615.68 + @@ -123,40 +143,40 @@ 同比 - - - - - - - - - 自营收入/万元 - - - - - - - - - - - 同比 - + + - - - - 外租收入/万元 + + + + + 自营收入/万元 + + + - + - + + + - + 同比 + - - - - + + + + + 外租收入/万元 + + + - + + + + - + 同比 + - - - - 同比 - - @@ -335,37 +355,59 @@ - + {{lastDay}} - - 经营报表 - - + + 服务区信息 + + + + - - 数智统计 - + + + 经营报表 + - - 经营品牌库 - - + + 经营品牌库 + + + + 财务报表 - + + + + 数智统计 + + + + + 现场管理 + + + + + 节日特刊 + + + + @@ -418,71 +460,41 @@
- - - - - - 营收占比 - - - - - {{ item.name }} - - - - -
-
-
-
-
-
- - {{o+1}} -
-

{{item.name}}

-
-

{{$util.fmoney(item.value,2)}}

-
-
-
-
-
-

{{item.percentage+'%'}}

-
-
-
+ + +
+
+ +
+ 人流预警 +
-
-
-
-
-
-
- - {{o+1}} -
-

{{item.name}}

-
-

{{$util.fmoney(item.value,2)}}

-
-
-
-
-
-

{{item.percentage+'%'}}

-
-
-
+
+
+ + +
+
+
+
+
+
+ {{index + 1}}
- - +
+ {{item.name}} + {{item.SERVERPART_REGION}}区 +
+
+ {{item.VEHICLE_COUNT}} + /人 +
+
+ + {{item.VEHICLE_RATE}}% +
+
+
@@ -575,46 +587,77 @@ + + + 营收占比 - - -
-
- -
- 人流预警 - + + + + {{ item.name }} + + + + +
+
+
+
+
+
+ + {{o+1}} +
+

{{item.name}}

+
+

{{$util.fmoney(item.value,2)}}

+
+
+
+
+
+

{{item.percentage+'%'}}

+
+
+
-
-
- - -
-
-
-
-
-
- {{index + 1}} +
+
+
+
+
+
+ + {{o+1}} +
+

{{item.name}}

+
+

{{$util.fmoney(item.value,2)}}

+
+
+
+
+
+

{{item.percentage+'%'}}

+
+
+
-
- {{item.name}} - {{item.SERVERPART_REGION}}区 -
-
- {{item.VEHICLE_COUNT}} - /人 -
-
- - {{item.VEHICLE_RATE}}% -
-
-
+ + + + + + + - + 巡检考核 @@ -687,8 +730,8 @@ - -
+ +
@@ -766,9 +809,10 @@ import uniPopup from "../../components/uni-popup.vue"; 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"; var rincanvas = {}; export default { - components: {MonthCharts, Tabbar,uniPopup}, + components: {RateCharts, MonthCharts, Tabbar,uniPopup}, data() { const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1) const nowDay = this.$util.cutDate(new Date(), 'MM月DD日') @@ -876,6 +920,7 @@ export default { trafficCurrentObj:{},// 当前月 showMonthDetail:false,//月度车流的显示框 yesObjCompared:'',//昨日营收的比较值 + moneyRateList:[] } }, watch:{ @@ -970,6 +1015,9 @@ export default { }, onLoad(option){ const _this = this + setTimeout(()=>{ + _this.moneyRateList = [3512.54,2615.68] + },3000) // 顶部显示的时间 this.single = timestampToTimeMonth((new Date(this.lastDay).getTime())) // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置 @@ -1092,6 +1140,10 @@ export default { this.nationalDayList[1].value = data.Result_Data.sumEntryCount?this.$util.fmoney(Number((data.Result_Data.sumEntryCount / 10000).toFixed(2))):'' this.nationalDayList[2].value = data.Result_Data.GrowthList[0].Entry_GrowthRate>0?'+' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%':'-' + data.Result_Data.GrowthList[0].Entry_GrowthRate + '%' }, + // 跳转到营收统计 + goToRevenueStatic(){ + this.$util.toNextRoute('navigateTo', `/pages/revenueStatistics/index?time=${this.lastDay}`) + }, goToNational(){ this.$util.toNextRoute('navigateTo', `/pages/nationalPage/index?time=${this.lastDay}`) }, @@ -2112,7 +2164,7 @@ $iphoneHeight: env(safe-area-inset-bottom); background: rgba(254, 192, 168,0.8); .top{ width: 100%; - height: 436rpx; + height: 700rpx; background: linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%); border-bottom-right-radius: 32rpx; border-bottom-left-radius: 32rpx; @@ -2228,108 +2280,165 @@ $iphoneHeight: env(safe-area-inset-bottom); margin-right: 64rpx; } } - .progress{ + .newBox{ width: 100%; - height: 24rpx; - border-radius: 12rpx; - background: #FFAB30; - margin-top: 24rpx; - //overflow: hidden; - position: relative; - .have{ - position: absolute; - top: 0;left: 0; - width: 60%; - background: #DB573B; - 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; + box-sizing: border-box; + padding: 32rpx 16rpx; + background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx; margin-top: 32rpx; - .smallDetailItem{ - width: 50%; - .messageTop{ - display: flex; - align-items: center; - .type{ - width: 24rpx; - height: 12rpx; - border-radius: 6rpx; - margin-right: 6px; + .progress{ + width: 100%; + height: 24rpx; + border-radius: 12rpx; + background: #FFAB30; + //overflow: hidden; + position: relative; + .have{ + position: absolute; + top: 0;left: 0; + width: 60%; + background: #DB573B; + 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; + margin-top: 32rpx; + .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; - } - .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; - } + } + .moneyRate{ + width: 100%; + box-sizing: border-box; + margin-top: 40rpx; + height: 144rpx; + display: flex; + align-items: center; + .leftBox{ + width: 144rpx; + height: 144rpx; + margin-right: 16rpx; } - .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, DINAlternate; + font-weight: bold; + color: #160002; + line-height: 44rpx; + } } } } @@ -2543,7 +2652,7 @@ $iphoneHeight: env(safe-area-inset-bottom); align-items: center; justify-content: center; position: absolute; - left: 0;bottom: 10px; + left: 0;bottom: 8px; .noShowMore{ width: 25px; height: 14px; @@ -2666,101 +2775,101 @@ $iphoneHeight: env(safe-area-inset-bottom); margin-right: 64rpx; } } - .progress{ - 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%; + .progress{ + 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%; + border-radius: 12rpx; + } } - } - .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; + .smallDetailItem{ + width: 50%; + .messageTop{ + display: flex; + align-items: center; + .type{ + width: 24rpx; + height: 12rpx; + background: #DB573B; + 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; - } - .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: 4px; - } - } } - } } } .bottom{ @@ -3365,7 +3474,7 @@ $iphoneHeight: env(safe-area-inset-bottom); .funBox{ width: calc(100% - 64rpx); margin-left: 32rpx; - height: 378rpx; + height: 530rpx; margin-bottom: 16px; .firstBox{ display: flex; @@ -4001,7 +4110,7 @@ $iphoneHeight: env(safe-area-inset-bottom); .boxBg{ width: 12px; height: 12px; - background: #10BFCE; + background: #589CFF; filter: blur(4px); position: absolute; top: 0;left: 0; diff --git a/pages/operatingStatements/detail.vue b/pages/operatingStatements/detail.vue index 1b37cbf..49173a7 100644 --- a/pages/operatingStatements/detail.vue +++ b/pages/operatingStatements/detail.vue @@ -24,7 +24,7 @@ {{pageMsg.Serverpart_N}}    ¥{{$util.fmoney(pageMsg.Serverpart_RevenueN,2)}} - + diff --git a/pages/revenue/component/otherCharts.vue b/pages/revenue/component/otherCharts.vue index 3d4cd40..57fe0b2 100644 --- a/pages/revenue/component/otherCharts.vue +++ b/pages/revenue/component/otherCharts.vue @@ -109,6 +109,7 @@ export default { uni.canvasToTempFilePath({ canvasId:id, complete:(res)=>{ + console.log('res',res) if (res.tempFilePath){ uni.getFileSystemManager().readFile({ filePath: res.tempFilePath, diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue index dc1f789..67c8903 100644 --- a/pages/revenueStatistics/index.vue +++ b/pages/revenueStatistics/index.vue @@ -1,11 +1,626 @@ - - + + diff --git a/static/public/font2/stylesheet.css b/static/public/font2/stylesheet.css index fdd12e3..03c1747 100644 --- a/static/public/font2/stylesheet.css +++ b/static/public/font2/stylesheet.css @@ -1,6 +1,6 @@ @font-face { font-family: 'Alimama ShuHeiTi'; - src:url("/static/public/font2/uj4HAtspu5eH.woff"); + src:url("/static/public/font2/tzfy1e4Fbqbs.woff"); font-weight: bold; font-style: normal; font-display: swap; diff --git a/static/public/revenueStatistics/stylesheet.css b/static/public/revenueStatistics/stylesheet.css index 03c1747..aba05ad 100644 --- a/static/public/revenueStatistics/stylesheet.css +++ b/static/public/revenueStatistics/stylesheet.css @@ -1,6 +1,6 @@ @font-face { font-family: 'Alimama ShuHeiTi'; - src:url("/static/public/font2/tzfy1e4Fbqbs.woff"); + src:url("/static/public/revenueStatistics/uKTjcNOXuZpJ.woff"); font-weight: bold; font-style: normal; font-display: swap;