diff --git a/pages/index/index.vue b/pages/index/index.vue index e907ffc..1a3ac18 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -4,6 +4,79 @@ + + + + + + + + {{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}} + 入区车流 + /百万辆 + + + + {{trafficCurrentObj.Vehicle_AddUpCount?trafficCurrentObj.AddUpCount:''}} + + + + {{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+'%':'-'}} + 环比 + + + + + + + {{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}} + 入区率 + /% + + + + {{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+'%':'-'}} + 环比 + + + + + + + {{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}} + 停留时长 + /分钟 + + + {{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+'%':'-'}} + 环比 + + + + + + + @@ -44,12 +117,12 @@
- + - + @@ -83,7 +156,7 @@ - + {{showTableData.add?showTableData.add:'-'}}% 同比 @@ -94,47 +167,48 @@ - - - - 自营:{{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:''}} - 同比 - - - @@ -145,22 +219,74 @@ 商家入账:{{shopRate}}% - - - - 营业收入 - - {{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}} + + + + + 便利店 + 3,100.65 + + +9.65% - - - 商家入账 - - {{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }} + + + + 餐饮客房 + 1,875.23 + + +23.87% + + + + + 商铺租赁 + 4,921.86 + + +15.02% + + + + + + + + + + + + + + + + + + 累计 + 对客营收/万元 + + + 13,268.97 + +14.91% + + + + + + 累计 + 营业收入/万元 + + + 13,268.97 + +23.93% + + + + + + @@ -238,7 +364,8 @@ - + + 查看更多 @@ -1427,7 +1554,8 @@ export default { showRateChart:true,// 显示百分比表格 revenueMoney:'',// 自营收入 externalMoney:'',// 外租收入 - currentMoney:'' + currentMoney:'', + showMoreFixed:false,// 显示悬浮框 } }, watch:{ @@ -1537,7 +1665,6 @@ export default { this.phoneWidth = systemInfo.windowWidth // 拿到昨天的时间戳 // 当年份不是2023 要判断有多少个可以滑动的项 - console.log('this.lastDay',this.lastDay) const nowDate = new Date(this.nowDay) let holiday = nowDate.getDay() this.howDay = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"][holiday] @@ -1550,7 +1677,6 @@ export default { let swiperList = [] if (2023-y<0){ sum = 12 * (y - 2023) + m - console.log('sum',sum) for (let i=0;i{ - console.log('res',res) // this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount,2) this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2) @@ -2847,6 +2968,129 @@ $iphoneHeight: env(safe-area-inset-bottom); top: 0;left: 0; z-index: 20; } + .showMoreFixedBox{ + width: 100vw; + height: 100vh; + position: fixed; + top: 0;left: 0; + z-index: 1000000; + background: rgba(7, 7, 7, 0.5); + .fixedBox{ + width: calc(100vw - 64rpx); + box-sizing: border-box; + padding: 32rpx 38rpx; + border-radius: 16rpx; + background: #fff; + position: fixed; + top: 10vh; left: 32rpx; + .otherDetailBottom{ + .bottomItem{ + width: 100%; + .bottomSmallItem{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + .itemLeft{ + display: flex; + align-items: center; + .itemMonth{ + padding: 4rpx 8rpx; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #FFFFFF; + line-height: 24rpx; + text-align: left; + font-style: normal; + background: #F2792E; + border-radius: 4rpx; + margin-right: 8rpx; + } + + .itemTitle{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 28rpx; + color: #160002; + line-height: 44rpx; + text-align: left; + font-style: normal; + .unit{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 28rpx; + color: #A69E9F; + line-height: 44rpx; + text-align: left; + font-style: normal; + margin-left: 4rpx; + } + } + } + .itemRight{ + .itemValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 36rpx; + color: #160002; + line-height: 44rpx; + text-align: center; + font-style: normal; + } + } + } + .itemData{ + display: flex; + justify-content: flex-end; + align-items: center; + .itemValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 28rpx; + color: #E83944; + line-height: 32rpx; + text-align: center; + font-style: normal; + } + .itemText{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 28rpx; + color: #A69E9F; + line-height: 40rpx; + text-align: left; + font-style: normal; + margin-left: 4rpx; + } + } + } + + .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; + } + } + } + } + } + } .header { width: 100%; background: linear-gradient(180deg, #DCE6FF 0%, #F3F4F9 100%); @@ -3341,6 +3585,137 @@ $iphoneHeight: env(safe-area-inset-bottom); } } } + .newRightBox{ + height: 100%; + flex: 1; + .newRightItem{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + margin: 8rpx 0; + .itemLeft{ + display: flex; + align-items: center; + .itemIcon{ + width: 12rpx; + height: 12rpx; + margin-right: 12rpx; + border-radius: 50%; + } + .itemName{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 28rpx; + color: #160002; + line-height: 40rpx; + text-align: left; + font-style: normal; + display: inline-block; + width: 120rpx; + } + .itemValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 28rpx; + color: #160002; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + } + .itemRight{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 28rpx; + color: #E83944; + line-height: 40rpx; + text-align: center; + font-style: normal; + } + } + } + } + } + .accountRevenue{ + width: 100%; + background: #F9FAFC; + box-sizing: border-box; + padding: 28rpx 24rpx; + margin-top: 48rpx; + .accountItem{ + width: 100%; + .itemTop{ + display: flex; + align-items: center; + margin-bottom: 8rpx; + .itemType{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #FFFFFF; + line-height: 24rpx; + text-align: left; + font-style: normal; + padding:4rpx 8rpx; + background: #F2792E; + border-radius: 4rpx; + margin-right: 8rpx; + } + .itemName{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 28rpx; + color: #160002; + line-height: 40rpx; + text-align: left; + font-style: normal; + .unit{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #9A9A9A; + line-height: 36rpx; + text-align: left; + font-style: normal; + margin-left: 4rpx + } + } + } + .itemBottom{ + display: flex; + align-items: center; + justify-content: space-between; + .revenueNum{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 36rpx; + color: #160002; + line-height: 44rpx; + text-align: left; + font-style: normal; + } + .revenueAdd{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 36rpx; + color: #E83944; + line-height: 44rpx; + text-align: left; + font-style: normal; + } + } + } + } + .showMoreLoading{ + width: 100%; + display: flex; + align-items: center; + justify-content: center; + margin-top: 14rpx; + .showMorenDown{ + width: 40rpx; + height: 50rpx; } } .goBusiness{ @@ -3729,11 +4104,12 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; align-items: center; .revenueNumber{ - font-size: 48rpx; - font-family: DINAlternate-Bold, DINAlternate; + font-family: DINAlternate, DINAlternate; font-weight: bold; + font-size: 56rpx; color: #160002; - line-height: 56rpx; + line-height: 64rpx; + font-style: normal; } .moreIcon{ width: 12px; @@ -3770,19 +4146,22 @@ $iphoneHeight: env(safe-area-inset-bottom); border-radius: 50%; } .addValue{ - font-size: 36rpx; font-family: DINAlternate, DINAlternate; font-weight: bold; + font-size: 36rpx; color: #E83944; line-height: 40rpx; + text-align: left; + font-style: normal; } .rightNav{ - font-size: 28rpx; font-family: PingFangSC, PingFang SC; font-weight: 400; + font-size: 28rpx; color: #A69E9F; line-height: 40rpx; - margin-left: 4rpx; + text-align: left; + font-style: normal; } } @@ -3823,7 +4202,7 @@ $iphoneHeight: env(safe-area-inset-bottom); //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; + margin-top: 32rpx; .progress{ width: 100%; height: 18rpx; @@ -3961,41 +4340,89 @@ $iphoneHeight: env(safe-area-inset-bottom); } } } - .rightBox{ + //.rightBox{ + // flex: 1; + // display: flex; + // align-items: center; + // .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; + // } + // } + //} + .newRightBox{ + height: 100%; flex: 1; display: flex; align-items: center; - .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; + .newRightItem{ + display: flex; + align-items: center; + justify-content: space-between; + .itemLeft{ + .itemIcon{ + width: 12rpx; + height: 12rpx; + margin-right: 12rpx; + border-radius: 50%; + } + .itemName{ font-family: PingFangSC, PingFang SC; font-weight: 400; - color: #A69E9F; + font-size: 28rpx; + color: #160002; line-height: 40rpx; - margin-left: 4rpx; + text-align: left; + font-style: normal; + display: inline-block; + width: 100rpx; + } + .itemValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 28rpx; + color: #160002; + line-height: 40rpx; + text-align: left; + font-style: normal; } } - .noticeMoney{ - font-size: 36rpx; - font-family: DINAlternate-Bold, DINAlternate; + .itemRight{ + font-family: DINAlternate, DINAlternate; font-weight: bold; - color: #160002; - line-height: 44rpx; + font-size: 28rpx; + color: #E83944; + line-height: 40rpx; + text-align: center; + font-style: normal; } } } diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue index 8628d97..c49bb0c 100644 --- a/pages/revenueStatistics/index.vue +++ b/pages/revenueStatistics/index.vue @@ -4,139 +4,466 @@ - - - - - {{ searchText }} - - - - + + + + + + + + + - 营收统计 + + + + + + + {{item}} + + + + + + {{thisMonth?thisMonth+'月':''}} + 对客营收 + /万元 + + - - - - - - - - - - 驿达入账收入 - - - - {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}} - 总计/万元 - + + + +14.91% + 同比去年 + + + 13,268.97 + 2024年 + + + 11,546.32 + 2023年 + + + + + 增长 + +1,722.65 + + + + + + + 营收明细 + /万元 - - - - - - 入账合计 - /万元 - - {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}} - - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} - + + + 类别 + 自营 + 便利店 + 餐饮客房 + 外包 + 餐商铺租赁 + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + 驿达入账收入 + + + + {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}} + 总计/万元 - - - - - 到账合计 - /万元 + + + + + + + 入账合计 + /万元 + + {{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}} + + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} + + + + + + + + + + + + + + + + + + - {{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}} - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} - + + + + + 到账合计 + /万元 + + {{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}} + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + 商家欠款 + /万元 + + {{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}} + + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} + + + + + + + + + + + + + + + + + + + - - - - - 商家欠款 - /万元 - - {{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}} - - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000,2):'0.00'}} - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + 商家入账收入 + + + + {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}} + 总计/万元 + + + + + + + + + 入账合计 + /万元 + + {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}} + + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000):"0.00"}} + + + + + + + + + + + + + + + + + + + + + + + + + 到账合计 + /万元 + + {{MerchantSum.AcountSum?$util.fmoney(MerchantSum.AcountSum,2):'0.00'}} + + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000):"0.00"}} + + + + + + + + + + + + + + + + + + + + + + + + + 应缴费用 + /万元 + + {{MerchantSum.ReceivableSum?$util.fmoney(MerchantSum.ReceivableSum,2):'0.00'}} + + + + {{ item.name }} + {{item.value?$util.fmoney(item.value/10000):"0.00"}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 项目数量 + /个 + + {{ pageDataObj.ProjectCount || 0 }} + + + + {{ item.name }} + {{ item.value || '0.00' }} + + + + + + + + + + + + + + + + + + + + + + + + 项目占比 + /% + + 100% + + + + {{ item.name }} + {{ item.value || '0.00' }} + + + + + + + + + + + + + + + + + + + + + + + + 对客占比 + /% + + 100% + + + + {{ item.name }} + {{ item.value || '0.00' }} + + + + + + + + + + + + + + + + + + + + + + + + 综合提成 + /% + + {{ pageDataObj.CommissionRatio || '-' }}% + + + + {{ item.name }} + {{ item.value || '0.00' }} + + + + + + + + + + + + + + + + + + @@ -145,271 +472,6 @@ - - - - - - - - - - 商家入账收入 - - - - {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}} - 总计/万元 - - - - - - - - - 入账合计 - /万元 - - {{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}} - - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000):"0.00"}} - - - - - - - - - - - - - - - - - - - - - - - - - 到账合计 - /万元 - - {{MerchantSum.AcountSum?$util.fmoney(MerchantSum.AcountSum,2):'0.00'}} - - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000):"0.00"}} - - - - - - - - - - - - - - - - - - - - - - - - - 应缴费用 - /万元 - - {{MerchantSum.ReceivableSum?$util.fmoney(MerchantSum.ReceivableSum,2):'0.00'}} - - - - {{ item.name }} - {{item.value?$util.fmoney(item.value/10000):"0.00"}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 项目数量 - /个 - - {{ pageDataObj.ProjectCount || 0 }} - - - - {{ item.name }} - {{ item.value || '0.00' }} - - - - - - - - - - - - - - - - - - - - - - - - 项目占比 - /% - - 100% - - - - {{ item.name }} - {{ item.value || '0.00' }} - - - - - - - - - - - - - - - - - - - - - - - - 对客占比 - /% - - 100% - - - - {{ item.name }} - {{ item.value || '0.00' }} - - - - - - - - - - - - - - - - - - - - - - - - 综合提成 - /% - - {{ pageDataObj.CommissionRatio || '-' }}% - - - - {{ item.name }} - {{ item.value || '0.00' }} - - - - - - - - - - - - - - - - - - - - - - - - @@ -418,14 +480,18 @@ import request from '@/util/index.js' export default { data(){ return { - statusBarHeight:'', - menu:{}, - lastDay:'', - searchText:'', - pageDataObj:{}, - OwnerListSum:{}, - MerchantSum:{}, - thisMonth:0 + statusBarHeight: '', + menu: {}, + lastDay: '', + searchText: '', + pageDataObj: {}, + OwnerListSum: {}, + MerchantSum: {}, + thisMonth: 0, + selectTab: 1,// 选择的tab + selectIndex:0,// 选择的月份 或者累计 + selectList:[],// 滚动的数组 + currentScroll:'',// 当前滚动到的地方 } }, onLoad(option){ @@ -442,6 +508,12 @@ export default { const date = new Date(this.lastDay) let m = date.getMonth() + 1 this.thisMonth = m + + for (let i=1;i<=this.thisMonth;i++){ + this.selectList.push(`${i}月`) + } + this.selectList.unshift('累计') + this.currentScroll = 'item' + this.thisMonth } if (option.month){ this.searchText = option.month @@ -449,6 +521,9 @@ export default { this.handleGetTableData() }, methods:{ + handleChangeTab(value){ + this.selectTab = value + }, handleBack(){ uni.navigateBack({ delta: 1 @@ -538,15 +613,18 @@ export default { background: #f5f5f5; .top{ width: 100%; - height: 560rpx; + height: 640rpx; position: relative; - background: linear-gradient(#FF7F37 0%, #FDA03E 60%, #F5F5F5 100%);; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueBackground.png"); + background-repeat: no-repeat; + background-size: 100% 100%; + //background: linear-gradient(#FF7F37 0%, #FDA03E 60%, #F5F5F5 100%); .header{ position: fixed; top: 0;left: 0; width: 100%; z-index: 9999; - background: linear-gradient(#FF9434 0%,#FE9139 100%); + //background: linear-gradient(#FF9434 0%,#FE9139 100%); box-sizing: border-box; .headerContent{ width: 100%; @@ -596,6 +674,59 @@ export default { position: absolute; left: 32rpx; } + .tabBox{ + width: 100%; + display: flex; + align-items: center; + position: absolute; + left: 32rpx; + .tabItem{ + width: 204rpx; + height: 68rpx; + margin-right: 48rpx; + } + } + .scrollView{ + width: calc(100vw - 64rpx); + height: 70rpx; + position: absolute; + left: 32rpx; + display: flex; + align-items: center; + .scrollItem{ + display: inline-block; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 32rpx; + color: #AFD1FF; + line-height: 44rpx; + text-align: left; + font-style: normal; + margin-right: 56rpx; + } + .selectScrollItem{ + display: inline-block; + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 32rpx; + height: 50rpx; + color: #FFFFFF; + text-align: left; + font-style: normal; + position: relative; + margin-right: 56rpx; + } + .selectScrollItem:after{ + content:''; + display: inline-block; + width: 80%; + position: absolute; + height: 4rpx; + left: 10%; + bottom: -5px; + background: #fff; + } + } } .content{ width: 100%; @@ -759,7 +890,6 @@ export default { } } - .ydRevenue{ .revenueBoxHeader{ background: linear-gradient(#FCF3E5 0%, #FDF6EC 22%,#FFFFFF 40%, #FFFFFF 100%); @@ -784,6 +914,186 @@ export default { } } } + + + .customerRevenue{ + width: 100%; + padding: 2rpx; + box-sizing: border-box; + background: #fff; + border-radius: 16rpx; + .contentRevenue{ + width: 100%; + height: 100%; + border-radius: 16rpx; + background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueBg1.png"); + background-repeat: no-repeat; + background-size: contain; + box-sizing: border-box; + padding: 30rpx 22rpx; + .contentTop{ + display: flex; + align-items: center; + .contentMonth{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #FFFFFF; + line-height: 24rpx; + text-align: left; + font-style: normal; + padding: 2rpx 8rpx; + border-radius: 4rpx; + margin-right: 8rpx; + background: #F2792E; + } + .contentTitle{ + display: flex; + align-items: center; + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 32rpx; + color: #160002; + line-height: 44rpx; + text-align: left; + font-style: normal; + margin-right: 8rpx; + .contentUnit{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #9A9A9A; + line-height: 36rpx; + text-align: left; + font-style: normal; + } + } + } + + .dataBox{ + width: 100%; + display: flex; + align-items: center; + .dataItem{ + width: calc(100% / 3); + display: flex; + flex-direction: column; + margin-top: 32rpx; + .dataBigValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 36rpx; + color: #E83944; + line-height: 64rpx; + text-align: left; + font-style: normal; + } + .dataLabel{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #9A9A9A; + line-height: 36rpx; + text-align: left; + font-style: normal; + } + .dataValue{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 36rpx; + color: #160002; + line-height: 44rpx; + text-align: left; + font-style: normal; + } + } + } + + .addBox{ + display: flex; + align-items: center; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #9A9A9A; + line-height: 36rpx; + text-align: left; + font-style: normal; + margin-top: 16rpx; + .addNumber{ + font-family: DINAlternate, DINAlternate; + font-weight: bold; + font-size: 28rpx; + color: #E83944; + line-height: 32rpx; + text-align: left; + font-style: normal; + margin-left: 8rpx; + } + } + + .line{ + width: 100%; + height: 2rpx; + background: #F5F4F4; + margin: 40rpx 0; + } + + .tableBox{ + .tableTop{ + display: flex; + align-items: center; + .tableTitle{ + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 28rpx; + color: #160002; + line-height: 40rpx; + text-align: left; + font-style: normal; + } + .tableUnit{ + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #9A9A9A; + line-height: 36rpx; + text-align: left; + font-style: normal; + margin-left: 4rpx; + } + } + + .tableContent{ + margin-top: 16rpx; + width: 100%; + height: 448rpx; + .tableLeft{ + width: 192rpx; + height: 100%; + background: #FFFFFF; + box-shadow: 4rpx 0rpx 6rpx 0rpx rgba(0,0,0,0.05); + box-sizing: border-box; + padding: 24rpx 0; + .label{ + width: 100%; + font-family: PingFangSC, PingFang SC; + font-weight: 400; + font-size: 24rpx; + color: #57607B; + line-height: 32rpx; + text-align: left; + font-style: normal; + margin-bottom: 32rpx; + } + .firstLabel{ + width: 100%; + } + } + } + } + } + } } } diff --git a/static/images/newIndex/activeFirstTab.png b/static/images/newIndex/activeFirstTab.png new file mode 100644 index 0000000..d115623 Binary files /dev/null and b/static/images/newIndex/activeFirstTab.png differ diff --git a/static/images/newIndex/activeSecondTab.png b/static/images/newIndex/activeSecondTab.png new file mode 100644 index 0000000..39a7408 Binary files /dev/null and b/static/images/newIndex/activeSecondTab.png differ diff --git a/static/images/newIndex/downIconMore.png b/static/images/newIndex/downIconMore.png new file mode 100644 index 0000000..fcc1781 Binary files /dev/null and b/static/images/newIndex/downIconMore.png differ diff --git a/static/images/newIndex/firstTab.png b/static/images/newIndex/firstTab.png new file mode 100644 index 0000000..b1d1091 Binary files /dev/null and b/static/images/newIndex/firstTab.png differ diff --git a/static/images/newIndex/revenueBackground.png b/static/images/newIndex/revenueBackground.png new file mode 100644 index 0000000..b866960 Binary files /dev/null and b/static/images/newIndex/revenueBackground.png differ diff --git a/static/images/newIndex/revenueBg1.png b/static/images/newIndex/revenueBg1.png new file mode 100644 index 0000000..e358a35 Binary files /dev/null and b/static/images/newIndex/revenueBg1.png differ diff --git a/static/images/newIndex/revenueBg2.png b/static/images/newIndex/revenueBg2.png new file mode 100644 index 0000000..e358a35 Binary files /dev/null and b/static/images/newIndex/revenueBg2.png differ diff --git a/static/images/newIndex/revenueBg3.png b/static/images/newIndex/revenueBg3.png new file mode 100644 index 0000000..d83576e Binary files /dev/null and b/static/images/newIndex/revenueBg3.png differ diff --git a/static/images/newIndex/revenueBg4.png b/static/images/newIndex/revenueBg4.png new file mode 100644 index 0000000..d232b73 Binary files /dev/null and b/static/images/newIndex/revenueBg4.png differ diff --git a/static/images/newIndex/revenueBg5.png b/static/images/newIndex/revenueBg5.png new file mode 100644 index 0000000..cdbd521 Binary files /dev/null and b/static/images/newIndex/revenueBg5.png differ diff --git a/static/images/newIndex/revenueBg6.png b/static/images/newIndex/revenueBg6.png new file mode 100644 index 0000000..eb108e6 Binary files /dev/null and b/static/images/newIndex/revenueBg6.png differ diff --git a/static/images/newIndex/secondTab.png b/static/images/newIndex/secondTab.png new file mode 100644 index 0000000..f0bf4d4 Binary files /dev/null and b/static/images/newIndex/secondTab.png differ