ylj/ahyd_DIB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
cclu 2024-03-13 19:46:12 +08:00
parent 8e9d6d6923
commit e9b7cdaaf0
14 changed files with 1228 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

625
pages/index/index.vue
View File

@ -4,6 +4,79 @@
<view class="meng" v-if="showHaveNotice" @click.stop="handleShowHaveNoticeBox"></view> <view class="meng" v-if="showHaveNotice" @click.stop="handleShowHaveNoticeBox"></view>
<view class="meng" v-if="showMonthDetail" @click.stop="handleShowTrafficDetail"></view> <view class="meng" v-if="showMonthDetail" @click.stop="handleShowTrafficDetail"></view>
<view class="meng" v-if="ydModal" @click.stop="handleShowYDModal"></view> <view class="meng" v-if="ydModal" @click.stop="handleShowYDModal"></view>
<view class="showMoreFixedBox" v-if="showMoreFixed" @click="handleShowMore">
<view class="fixedBox">
<view class="otherDetailBottom">
<view class="bottomItem" style="margin-bottom: 16rpx">
<view class="bottomSmallItem">
<view class="itemLeft">
<view class="itemMonth">{{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}}</view>
<view class="itemTitle">入区车流
<span class="unit">/百万辆</span>
</view>
</view>
<view class="itemRight">
<text class="itemValue">{{trafficCurrentObj.Vehicle_AddUpCount?trafficCurrentObj.AddUpCount:''}}</text>
</view>
</view>
<view class="itemData">
<text class="itemValue">{{trafficYOYObj.Vehicle_GrowthRate?trafficYOYObj.Vehicle_GrowthRate>0?'+'+trafficYOYObj.Vehicle_GrowthRate+'%':trafficYOYObj.Vehicle_GrowthRate+'%':'-'}}</text>
<text class="itemText">同比</text>
</view>
<view class="itemData">
<text class="itemValue" style="color: #0E9976">{{trafficQOQObj.Vehicle_GrowthRate?trafficQOQObj.Vehicle_GrowthRate>0?'+'+trafficQOQObj.Vehicle_GrowthRate+'%':trafficQOQObj.Vehicle_GrowthRate+'%':'-'}}</text>
<text class="itemText">环比</text>
</view>
</view>
<view class="bottomItem" style="margin-bottom: 16rpx">
<view class="bottomSmallItem">
<view class="itemLeft">
<view class="itemMonth">{{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}}</view>
<view class="itemTitle">入区率
<span class="unit">/%</span></view>
</view>
<view class="itemRight">
<text class="itemValue">{{trafficCurrentObj.Entry_Rate?trafficCurrentObj.Entry_Rate:''}}</text>
</view>
</view>
<view class="itemData">
<text class="itemValue">{{trafficYOYObj.Entry_GrowthRate?trafficYOYObj.Entry_GrowthRate>0?'+'+trafficYOYObj.Entry_GrowthRate+'%':trafficYOYObj.Entry_GrowthRate+'%':'-'}}</text>
<text class="itemText">同比</text>
</view>
<view class="itemData">
<text class="itemValue" style="color: #0E9976">{{trafficQOQObj.Entry_GrowthRate?trafficQOQObj.Entry_GrowthRate>0?'+'+trafficQOQObj.Entry_GrowthRate+'%':trafficQOQObj.Entry_GrowthRate+'%':'-'}}</text>
<text class="itemText">环比</text>
</view>
</view>
<view class="bottomItem">
<view class="bottomSmallItem">
<view class="itemLeft">
<view class="itemMonth">{{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}}</view>
<view class="itemTitle">停留时长
<span class="unit">/分钟</span></view>
</view>
<view class="itemRight">
<text class="itemValue">{{trafficCurrentObj.Stay_Times?trafficCurrentObj.Stay_Times:''}}</text>
</view>
</view>
<view class="itemData">
<text class="itemValue">{{trafficYOYObj.StayTimes_GrowthRate?trafficYOYObj.StayTimes_GrowthRate>0?'+'+trafficYOYObj.StayTimes_GrowthRate+'%':trafficYOYObj.StayTimes_GrowthRate+'%':'-'}}</text>
<text class="itemText">同比</text>
</view>
<view class="itemData">
<text class="itemValue" style="color: #0E9976">{{trafficQOQObj.StayTimes_GrowthRate?trafficQOQObj.StayTimes_GrowthRate>0?'+'+trafficQOQObj.StayTimes_GrowthRate+'%':trafficQOQObj.StayTimes_GrowthRate+'%':'-'}}</text>
<text class="itemText">环比</text>
</view>
</view>
</view>
</view>
</view>
<!-- 根据要显示的内容 切换高度 --> <!-- 根据要显示的内容 切换高度 -->
<view class="header"> <view class="header">
<!-- :style="{height:loadMore?`calc(${(776/750)*phoneWidth + 260}px)`:`calc(${(776/750)*phoneWidth - 10}px)`}"--> <!-- :style="{height:loadMore?`calc(${(776/750)*phoneWidth + 260}px)`:`calc(${(776/750)*phoneWidth - 10}px)`}"-->
@ -44,12 +117,12 @@
<!-- ,height:loadMore?'200px':'38px'--> <!-- ,height:loadMore?'200px':'38px'-->
<div class="storeDetail" :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}"> <div class="storeDetail" :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}">
<swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1330rpx`:`620rpx`}" @change="handleChangeSelect" :current="selectDetail"> <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1330rpx`:`740rpx`}" @change="handleChangeSelect" :current="selectDetail">
<block v-for="(item,index) in swiperList" :key="index"> <block v-for="(item,index) in swiperList" :key="index">
<swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'"> <swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'">
<view class="bigBox" v-if="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)"> <view class="bigBox" v-if="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)">
<view class="box"> <view class="box">
<view class="top" style="height: 550rpx;"> <view class="top" style="height: 740rpx;">
<view class="topTop"> <view class="topTop">
<view class="statistics" @click="goToRevenueStatic"> <view class="statistics" @click="goToRevenueStatic">
<image class="staticImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg"/> <image class="staticImg" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg"/>
@ -83,7 +156,7 @@
</view> </view>
<view class="revenueTopRight" v-if="showTableData.add"> <view class="revenueTopRight" v-if="showTableData.add">
<!--https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg--> <!--https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg-->
<image class="addReduce" :src="Number(showTableData.add)>0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/add.svg':Number(showTableData.add)<0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg':''"/> <!-- <image class="addReduce" :src="Number(showTableData.add)>0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/add.svg':Number(showTableData.add)<0?'https://eshangtech.com/ShopICO/ahyd-BID/examine/reduce.svg':''"/>-->
<text class="addValue">{{showTableData.add?showTableData.add:'-'}}%</text> <text class="addValue">{{showTableData.add?showTableData.add:'-'}}%</text>
<text class="rightNav">同比</text> <text class="rightNav">同比</text>
</view> </view>
@ -94,47 +167,48 @@
<!-- <text class="rightNav">同比</text>--> <!-- <text class="rightNav">同比</text>-->
</view> </view>
<view class="newBox"> <view class="newBox">
<view class="progress" @click="handleShowHaveNoticeBox" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}">
<view class="have" :style="{width:progressObj.owner+'%',background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
<view class="haveNoticeBox" v-if="showHaveNotice" @click.stop="handleShowHaveNoticeBox">
<text class="label">自营:<text class="value">{{progressObj.owner}}%，</text></text>
<text class="label">外租:<text class="value">{{progressObj.other}}%</text></text>
</view>
</view> <!-- <view class="progress" @click="handleShowHaveNoticeBox" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}">-->
<view class="message" > <!-- <view class="have" :style="{width:progressObj.owner+'%',background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>-->
<view class="smallDetailItem" style="margin-right: 14px"> <!-- <view class="haveNoticeBox" v-if="showHaveNotice" @click.stop="handleShowHaveNoticeBox">-->
<view class="messageTop"> <!-- <text class="label">自营:<text class="value">{{progressObj.owner}}%，</text></text>-->
<view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view> <!-- <text class="label">外租:<text class="value">{{progressObj.other}}%</text></text>-->
<text class="typeTitle">驿达自营</text> <!-- </view>-->
<!-- <text class="unit">/万元</text>--> <!-- </view>-->
</view> <!-- <view class="message" >-->
<view class="middle" v-if="typeList && typeList.length>0"> <!-- <view class="smallDetailItem" style="margin-right: 14px">-->
<text class="money">{{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}}</text> <!-- <view class="messageTop">-->
<view class="addItem" v-if="monthAdd">{{monthAdd || ''}}%</view> <!-- <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>-->
</view> <!-- <text class="typeTitle">驿达自营</text>-->
<view class="messageBottom" v-if="typeList && typeList[0].add"> <!-- &lt;!&ndash; <text class="unit">/万元</text>&ndash;&gt;-->
<text class="addText">{{typeList[0].add?typeList[0].add:''}}</text> <!-- </view>-->
<text class="addType">同比</text> <!-- <view class="middle" v-if="typeList && typeList.length>0">-->
</view> <!-- <text class="money">{{revenueMoney?$util.fmoney(revenueMoney || 0,2):''}}</text>-->
</view> <!-- <view class="addItem" v-if="monthAdd">{{monthAdd || ''}}%</view>-->
<!-- </view>-->
<!-- <view class="messageBottom" v-if="typeList && typeList[0].add">-->
<!-- <text class="addText">{{typeList[0].add?typeList[0].add:''}}</text>-->
<!-- <text class="addType">同比</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- <view class="smallDetailItem">-->
<!-- <view class="messageTop">-->
<!-- <view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>-->
<!-- <text class="typeTitle">商铺租赁</text>-->
<!-- &lt;!&ndash; <text class="unit">/万元</text>&ndash;&gt;-->
<!-- </view>-->
<!-- <view class="middle">-->
<!-- <text class="money">{{externalMoney?$util.fmoney(externalMoney || 0,2):''}}</text>-->
<!-- &lt;!&ndash; <view class="addItem">+13.18%</view>&ndash;&gt;-->
<!-- </view>-->
<!-- <view class="messageBottom" v-if="typeList && typeList[1].add">-->
<!-- <text class="addText">{{typeList[1].add?typeList[1].add:''}}</text>-->
<!-- <text class="addType">同比</text>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view class="smallDetailItem">
<view class="messageTop">
<view class="type" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>
<text class="typeTitle">商铺租赁</text>
<!-- <text class="unit">/万元</text>-->
</view>
<view class="middle">
<text class="money">{{externalMoney?$util.fmoney(externalMoney || 0,2):''}}</text>
<!-- <view class="addItem">+13.18%</view>-->
</view>
<view class="messageBottom" v-if="typeList && typeList[1].add">
<text class="addText">{{typeList[1].add?typeList[1].add:''}}</text>
<text class="addType">同比</text>
</view>
</view>
</view>
<view class="moneyRate"> <view class="moneyRate">
<view class="leftBox" @click="handleShowYDModal" v-if="showRateChart"> <view class="leftBox" @click="handleShowYDModal" v-if="showRateChart">
<view class="rateChartsBox"> <view class="rateChartsBox">
@ -145,22 +219,74 @@
<text class="label">商家入账:<text class="value">{{shopRate}}%</text></text> <text class="label">商家入账:<text class="value">{{shopRate}}%</text></text>
</view> </view>
</view> </view>
<view class="rightBox"> <view class="newRightBox">
<view class="noticeItem"> <view class="newRightItem">
<view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view> <view class="itemLeft">
<view class="noticeText">营业收入</view> <view class="itemIcon" style="background: #1677FE"></view>
<!-- <span class="noticeSmallText">/万元</span>--> <span class="itemName">便利店</span>
<text class="noticeMoney">{{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}}</text> <span class="itemValue">3,100.65</span>
</view>
<view class="itemRight">+9.65%</view>
</view> </view>
<view class="noticeItem"> <view class="newRightItem">
<view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view> <view class="itemLeft">
<view class="noticeText">商家入账</view> <view class="itemIcon" style="background: #456497"></view>
<!-- <span class="noticeSmallText">/万元</span>--> <span class="itemName">餐饮客房</span>
<text class="noticeMoney">{{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }}</text> <span class="itemValue">1,875.23</span>
</view>
<view class="itemRight">+23.87%</view>
</view>
<view class="newRightItem">
<view class="itemLeft">
<view class="itemIcon" style="background: #97A9C6"></view>
<span class="itemName">商铺租赁</span>
<span class="itemValue">4,921.86</span>
</view>
<view class="itemRight">+15.02%</view>
</view> </view>
</view> </view>
<!-- <view class="rightBox">-->
<!-- <view class="noticeItem">-->
<!-- <view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>-->
<!-- <view class="noticeText">营业收入</view>-->
<!-- &lt;!&ndash; <span class="noticeSmallText">/万元</span>&ndash;&gt;-->
<!-- <text class="noticeMoney">{{currentPeriodData.Royalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.Royalty_Theory / 10000),2):'-'}}</text>-->
<!-- </view>-->
<!-- <view class="noticeItem">-->
<!-- <view class="noticeTop" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}"></view>-->
<!-- <view class="noticeText">商家入账</view>-->
<!-- &lt;!&ndash; <span class="noticeSmallText">/万元</span>&ndash;&gt;-->
<!-- <text class="noticeMoney">{{ currentPeriodData.SubRoyalty_Theory?$util.fmoney($util.getMoney(currentPeriodData.SubRoyalty_Theory / 10000),2):'-' }}</text>-->
<!-- </view>-->
<!-- </view>-->
</view> </view>
</view> </view>
<view class="accountRevenue">
<view class="accountItem" style="margin-bottom: 24rpx">
<view class="itemTop">
<view class="itemType">累计</view>
<view class="itemName">对客营收<span class="unit">/万元</span></view>
</view>
<view class="itemBottom">
<span class="revenueNum">13,268.97</span>
<span class="revenueAdd">+14.91%</span>
</view>
</view>
<view class="accountItem">
<view class="itemTop">
<view class="itemType">累计</view>
<view class="itemName">营业收入<span class="unit">/万元</span></view>
</view>
<view class="itemBottom">
<span class="revenueNum">13,268.97</span>
<span class="revenueAdd">+23.93%</span>
</view>
</view>
</view>
<view class="showMoreLoading">
<image @click="handleShowMore" class="showMorenDown" src="/static/images/newIndex/downIconMore.png"/>
</view>
<!-- <view class="goBusiness">--> <!-- <view class="goBusiness">-->
<!-- &lt;!&ndash; @click="handleGoProject"&ndash;&gt;--> <!-- &lt;!&ndash; @click="handleGoProject"&ndash;&gt;-->
<!-- <view class="bussinessRight" >--> <!-- <view class="bussinessRight" >-->
@ -238,7 +364,8 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore"> <!-- <view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore">-->
<view class="bottom" v-if="false" @click="handleChangeLoadMore">
<text class="searchText">查看更多</text> <text class="searchText">查看更多</text>
<image class="searchIcon" :style="{height:'16px',transform: loadMore?'rotate(180deg)':''}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/> <image class="searchIcon" :style="{height:'16px',transform: loadMore?'rotate(180deg)':''}" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
</view> </view>
@ -1427,7 +1554,8 @@ export default {
showRateChart:true,// 显示百分比表格 showRateChart:true,// 显示百分比表格
revenueMoney:'',// 自营收入 revenueMoney:'',// 自营收入
externalMoney:'',// 外租收入 externalMoney:'',// 外租收入
currentMoney:'' currentMoney:'',
showMoreFixed:false,// 显示悬浮框
} }
}, },
watch:{ watch:{
@ -1537,7 +1665,6 @@ export default {
this.phoneWidth = systemInfo.windowWidth this.phoneWidth = systemInfo.windowWidth
// 拿到昨天的时间戳 // 拿到昨天的时间戳
// 当年份不是2023 要判断有多少个可以滑动的项 // 当年份不是2023 要判断有多少个可以滑动的项
console.log('this.lastDay',this.lastDay)
const nowDate = new Date(this.nowDay) const nowDate = new Date(this.nowDay)
let holiday = nowDate.getDay() let holiday = nowDate.getDay()
this.howDay = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"][holiday] this.howDay = ["星期日","星期一","星期二","星期三","星期四","星期五","星期六"][holiday]
@ -1550,7 +1677,6 @@ export default {
let swiperList = [] let swiperList = []
if (2023-y<0){ if (2023-y<0){
sum = 12 * (y - 2023) + m sum = 12 * (y - 2023) + m
console.log('sum',sum)
for (let i=0;i<sum;i++){ for (let i=0;i<sum;i++){
if (i<=11){ if (i<=11){
swiperList.push({key:i}) swiperList.push({key:i})
@ -1566,17 +1692,13 @@ export default {
swiperList.push({key:`2023${i<10?'0'+i:i}`}) swiperList.push({key:`2023${i<10?'0'+i:i}`})
} }
} }
console.log('sum',sum)
console.log('swiperList',swiperList)
this.swiperList = swiperList this.swiperList = swiperList
// 顶部卡片滚动的第几个 // 顶部卡片滚动的第几个
this.selectDetail = this.handleGetSwiperIndex(this.lastDay) this.selectDetail = this.handleGetSwiperIndex(this.lastDay)
console.log('this.selectDetail',this.selectDetail)
// 拿到选择日期的月份 // 拿到选择日期的月份
this.nowMonth = date.getMonth() + 1 this.nowMonth = date.getMonth() + 1
// 默认选择的月份 // 默认选择的月份
this.selectMonth = date.getMonth() + 1 this.selectMonth = date.getMonth() + 1
console.log('this.selectMonth',this.selectMonth)
// 设置顶部时间选择器的开始时间 因为不能选去年数据 所以只能从当前日期的年份开始计算 // 设置顶部时间选择器的开始时间 因为不能选去年数据 所以只能从当前日期的年份开始计算
this.startDate = `${date.getFullYear()}-01` this.startDate = `${date.getFullYear()}-01`
@ -1617,7 +1739,6 @@ export default {
// 在用户选择服务区之后就会有当前服务区 // 在用户选择服务区之后就会有当前服务区
// 用户的当前坐标,如果没有就重新请求坐标 有了就去调最近的服务区 // 用户的当前坐标,如果没有就重新请求坐标 有了就去调最近的服务区
this.seat = uni.getStorageSync('seatInfo') this.seat = uni.getStorageSync('seatInfo')
console.log('this.seat11',!this.seat)
if (!this.seat){ if (!this.seat){
//获取用户的经纬度位置存在stroge里面 //获取用户的经纬度位置存在stroge里面
wx.getFuzzyLocation({ wx.getFuzzyLocation({
@ -1677,13 +1798,15 @@ export default {
}, },
methods:{ methods:{
...mapActions(['memberLogin','getLoginCode']), ...mapActions(['memberLogin','getLoginCode']),
// 显示悬浮框
handleShowMore(){
this.showMoreFixed = !this.showMoreFixed
},
// 选择的版本 // 选择的版本
handleChangeVersion(e){ handleChangeVersion(e){
console.log('e',e)
this.selectVersion = e this.selectVersion = e
uni.setStorageSync('version',this.selectVersion) uni.setStorageSync('version',this.selectVersion)
if (this.selectVersion===2){ if (this.selectVersion===2){
console.log('e2222')
uni.switchTab({ uni.switchTab({
url:`/pages/index/old/index` url:`/pages/index/old/index`
}) })
@ -1857,7 +1980,6 @@ export default {
latitude:seat.latitude, latitude:seat.latitude,
} }
const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req) const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req)
console.log('datanearestService',data)
let nearService = uni.getStorageSync('nearService') let nearService = uni.getStorageSync('nearService')
if (!nearService){ if (!nearService){
let res = { let res = {
@ -2038,7 +2160,6 @@ export default {
StatisticsDate:this.nowDay StatisticsDate:this.nowDay
} }
request.$webGet('CommercialApi/Revenue/GetCurRevenue',req).then(res=>{ request.$webGet('CommercialApi/Revenue/GetCurRevenue',req).then(res=>{
console.log('res',res)
// this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount,2) // this.currentMoney = this.$util.fmoney(res.Result_Data.CurRevenueAmount,2)
this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2) this.currentMoney = res.Result_Data.CurRevenueAmount.toFixed(2)
@ -2847,6 +2968,129 @@ $iphoneHeight: env(safe-area-inset-bottom);
top: 0;left: 0; top: 0;left: 0;
z-index: 20; 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 { .header {
width: 100%; width: 100%;
background: linear-gradient(180deg, #DCE6FF 0%, #F3F4F9 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{ .goBusiness{
@ -3729,11 +4104,12 @@ $iphoneHeight: env(safe-area-inset-bottom);
display: flex; display: flex;
align-items: center; align-items: center;
.revenueNumber{ .revenueNumber{
font-size: 48rpx; font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold; font-weight: bold;
font-size: 56rpx;
color: #160002; color: #160002;
line-height: 56rpx; line-height: 64rpx;
font-style: normal;
} }
.moreIcon{ .moreIcon{
width: 12px; width: 12px;
@ -3770,19 +4146,22 @@ $iphoneHeight: env(safe-area-inset-bottom);
border-radius: 50%; border-radius: 50%;
} }
.addValue{ .addValue{
font-size: 36rpx;
font-family: DINAlternate, DINAlternate; font-family: DINAlternate, DINAlternate;
font-weight: bold; font-weight: bold;
font-size: 36rpx;
color: #E83944; color: #E83944;
line-height: 40rpx; line-height: 40rpx;
text-align: left;
font-style: normal;
} }
.rightNav{ .rightNav{
font-size: 28rpx;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
font-size: 28rpx;
color: #A69E9F; color: #A69E9F;
line-height: 40rpx; 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; //padding: 16rpx 16rpx 0;
//background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx; //background: linear-gradient(135deg, #FFE3BA 0%, #FFF5E5 40%, #FFF1DB 78%, #FFDABC 100%); border-radius: 16rpx;
//margin-top: 32rpx; //margin-top: 32rpx;
margin-top: 48rpx; margin-top: 32rpx;
.progress{ .progress{
width: 100%; width: 100%;
height: 18rpx; 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; flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
.noticeItem{ .newRightItem{
width: 50%; display: flex;
.noticeTop{ align-items: center;
width: 24rpx; justify-content: space-between;
height: 12rpx; .itemLeft{
background: #A66A37; .itemIcon{
border-radius: 6rpx; width: 12rpx;
margin-bottom: 8rpx; height: 12rpx;
} margin-right: 12rpx;
.noticeText{ border-radius: 50%;
font-size: 28rpx; }
font-family: PingFangSC, PingFang SC; .itemName{
font-weight: 400;
color: #160002;
line-height: 40rpx;
margin-bottom: 6rpx;
.noticeSmallText{
font-size: 28rpx;
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #A69E9F; font-size: 28rpx;
color: #160002;
line-height: 40rpx; 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{ .itemRight{
font-size: 36rpx; font-family: DINAlternate, DINAlternate;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold; font-weight: bold;
color: #160002; font-size: 28rpx;
line-height: 44rpx; color: #E83944;
line-height: 40rpx;
text-align: center;
font-style: normal;
} }
} }
} }

1094
pages/revenueStatistics/index.vue
View File

File diff suppressed because it is too large Load Diff

BIN
static/images/newIndex/activeFirstTab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
static/images/newIndex/activeSecondTab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/images/newIndex/downIconMore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 637 B

BIN
static/images/newIndex/firstTab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
static/images/newIndex/revenueBackground.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 163 KiB

BIN
static/images/newIndex/revenueBg1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
static/images/newIndex/revenueBg2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
static/images/newIndex/revenueBg3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
static/images/newIndex/revenueBg4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
static/images/newIndex/revenueBg5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
static/images/newIndex/revenueBg6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
static/images/newIndex/secondTab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB