diff --git a/pages.json b/pages.json index 2fcabba..3ec4dce 100644 --- a/pages.json +++ b/pages.json @@ -212,6 +212,20 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "servicePartList", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } + }, + { + "path": "detail", + "style": { + "navigationBarTitleText": "", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 6f8ba1d..45ed2fa 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -6,9 +6,9 @@ - + - + {{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}} @@ -30,7 +30,7 @@ - + {{ `${selectMonth<10?'0'+selectMonth:selectMonth}月`}} @@ -215,8 +215,9 @@ - 驿达入账:{{ydRate}}% - 商家入账:{{shopRate}}% + 便利店:{{ydRate}}% + 餐饮:{{shopRate}}% + 商铺租赁:{{shopOutRate}}% @@ -1560,8 +1561,9 @@ export default { moneyRateList:[], currentPeriodData:{},// 本期数据 ydModal: false,// 显示驿达百分比的具体值 - ydRate:'',// 驿达百分比 - shopRate:'',// 商家百分比 + ydRate:'',// 便利店百分比 + shopRate:'',// 餐饮客房百分比 + shopOutRate:'',// 商铺租赁 showRateChart:true,// 显示百分比表格 revenueMoney:'',// 自营收入 externalMoney:'',// 外租收入 @@ -2573,15 +2575,7 @@ export default { console.log('result2',result) let progressAll = 0 this.currentPeriodData = result.MonthRevenueModel.CurAccountRoyalty - let sum = this.currentPeriodData.Royalty_Theory+this.currentPeriodData.SubRoyalty_Theory - console.log('currentPeriodData',this.currentPeriodData) - if(sum===0){ - this.ydRate = '-' - this.shopRate = '-' - }else{ - this.ydRate = ((this.currentPeriodData.Royalty_Theory / sum)*100).toFixed(2) - this.shopRate = ((this.currentPeriodData.SubRoyalty_Theory / sum)*100).toFixed(2) - } + console.log('result.BusinessTypeList',result.BusinessTypeList) let shareList = [{},{},{}] result.BusinessTypeList.forEach(item=>{ @@ -2621,6 +2615,23 @@ export default { }) console.log('shareList',shareList) this.moneyRateList = [Number(shareList[0].value),Number(shareList[1].value),Number(shareList[2].value)] + + let sum = 0 + shareList.forEach(item=>{ + console.log('Number(item.value)',Number(item.value)) + sum += Number(item.value) + }) + console.log('sum',sum) + if(sum===0){ + this.ydRate = '-' + this.shopRate = '-' + this.shopOutRate = '-' + }else{ + this.ydRate = ((Number(shareList[0].value) / sum)*100).toFixed(2) + this.shopRate = ((Number(shareList[1].value) / sum)*100).toFixed(2) + this.shopOutRate = ((1-( (Number(shareList[0].value) / sum) + (Number(shareList[1].value) / sum)) )*100).toFixed(2) + } + this.profitSharingList = shareList this.typeList = result.BusinessTypeList this.revenueMoney = result.BusinessTypeList[0].showValue @@ -3007,11 +3018,11 @@ $iphoneHeight: env(safe-area-inset-bottom); .fixedBox{ width: calc(100vw - 64rpx); box-sizing: border-box; - padding: 32rpx 38rpx; + padding: 38rpx 32rpx; border-radius: 16rpx; background: #fff; position: fixed; - top: 10vh; left: 32rpx; + left: 32rpx; .otherDetailBottom{ .bottomItem{ width: 100%; @@ -3020,6 +3031,7 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; align-items: center; justify-content: space-between; + margin-bottom: 8rpx; .itemLeft{ display: flex; align-items: center; @@ -3073,6 +3085,7 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; justify-content: flex-end; align-items: center; + margin-bottom: 8rpx; .itemValue{ font-family: DINAlternate, DINAlternate; font-weight: bold; @@ -3090,7 +3103,7 @@ $iphoneHeight: env(safe-area-inset-bottom); line-height: 40rpx; text-align: left; font-style: normal; - margin-left: 4rpx; + margin-left: 8rpx; } } } @@ -3670,7 +3683,7 @@ $iphoneHeight: env(safe-area-inset-bottom); width: 100%; background: #F9FAFC; box-sizing: border-box; - padding: 24rpx 28rpx; + padding: 28rpx 24rpx; margin-top: 48rpx; .accountItem{ width: 100%; @@ -3741,10 +3754,10 @@ $iphoneHeight: env(safe-area-inset-bottom); display: flex; align-items: center; justify-content: center; - margin-top: 14rpx; + margin-top: 16rpx; .showMorenDown{ - width: 40rpx; - height: 50rpx; + width: 32rpx; + height: 32rpx; } } .goBusiness{ diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue index cd69104..62254f3 100644 --- a/pages/nationalPage/rankPage.vue +++ b/pages/nationalPage/rankPage.vue @@ -133,7 +133,7 @@ 增长 {{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00': - type===2?item.RevenueINC.AccountINC?$util.getMoney(item.AccountINC.increaseData / 10000):'0.00': + type===2?item.AccountINC.increaseData?$util.getMoney(item.AccountINC.increaseData / 10000):'0.00': type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}} diff --git a/pages/revenueStatistics/detail.vue b/pages/revenueStatistics/detail.vue new file mode 100644 index 0000000..db325a7 --- /dev/null +++ b/pages/revenueStatistics/detail.vue @@ -0,0 +1,1077 @@ + + + diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue index 87e36a3..8dfb1be 100644 --- a/pages/revenueStatistics/index.vue +++ b/pages/revenueStatistics/index.vue @@ -1,612 +1,630 @@ + +