diff --git a/pages/index/index.vue b/pages/index/index.vue
index 45ed2fa..d1a2be7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,7 +157,7 @@
- {{showTableData.add?showTableData.add:'-'}}%
+ {{showTableData.add?showTableData.add:'-'}}%
同比
@@ -225,9 +225,11 @@
{{subItem.name}}
- {{subItem.value?numeral(subItem.value/10000).format('0,0.00'):''}}
- {{subItem.add}}
+
+ {{subItem.value?numeral(subItem.value/10000).format('0,0.00'):''}}
+
+ {{subItem.add?`${subItem.add}%`:''}}
@@ -280,7 +282,7 @@
{{showTableData.YearRevenueAmount?numeral(showTableData.YearRevenueAmount/10000).format('0,0.00'):''}}
- {{showTableData.YearRevenueAdd?`${showTableData.YearRevenueAdd>0?'+':''}${showTableData.YearRevenueAdd}%`:'-'}}
+ {{showTableData.YearRevenueAdd?`${showTableData.YearRevenueAdd>0?'+':''}${showTableData.YearRevenueAdd}%`:'-'}}
@@ -291,7 +293,7 @@
{{showTableData.YearAccountRoyalty?numeral(showTableData.YearAccountRoyalty/10000).format('0,0.00'):''}}
- {{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}
+ {{showTableData.YearAccountAdd?`${showTableData.YearAccountAdd>0?'+':''}${showTableData.YearAccountAdd}%`:'-'}}
@@ -2586,9 +2588,9 @@ export default {
if (item.data){
let number = ((item.value - item.data)/item.data)*100
if (number>0){
- item.add ='+'+number.toFixed(2)+'%'
+ item.add ='+'+number.toFixed(2)
}else if(number<0){
- item.add =number.toFixed(2)+'%'
+ item.add =number.toFixed(2)
}else{
item.add = null
}
@@ -3639,6 +3641,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
.itemLeft{
display: flex;
align-items: center;
+ width: 33%;
.itemIcon{
width: 12rpx;
height: 12rpx;
@@ -3656,23 +3659,27 @@ $iphoneHeight: env(safe-area-inset-bottom);
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;
- }
+ }
+ .itemCenter{
+ display: inline-block;
+ width: 33%;
+ font-family: DINAlternate, DINAlternate;
+ font-weight: bold;
+ font-size: 28rpx;
+ color: #160002;
+ line-height: 40rpx;
+ text-align: right;
+ font-style: normal;
}
.itemRight{
+ display: inline-block;
+ width: 33%;
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 28rpx;
color: #E83944;
line-height: 40rpx;
- text-align: center;
+ text-align: right;
font-style: normal;
}
}
diff --git a/pages/revenueStatistics/detail.vue b/pages/revenueStatistics/detail.vue
index db325a7..debbe86 100644
--- a/pages/revenueStatistics/detail.vue
+++ b/pages/revenueStatistics/detail.vue
@@ -27,7 +27,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
对客销售/万元
@@ -35,7 +35,7 @@
- {{topDetail.RevenueINC && topDetail.RevenueINC.increaseRate?topDetail.RevenueINC.increaseRate<0?`${topDetail.RevenueINC.increaseRate}%`:`+${topDetail.RevenueINC.increaseRate}%` :'-'}}
+ {{topDetail.RevenueINC && topDetail.RevenueINC.increaseRate?topDetail.RevenueINC.increaseRate<0?`${topDetail.RevenueINC.increaseRate}%`:`+${topDetail.RevenueINC.increaseRate}%` :'-'}}
同比去年
@@ -50,7 +50,7 @@
增长
- {{topDetail.RevenueINC ? `${topDetail.RevenueINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.RevenueINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.RevenueINC ? `${topDetail.RevenueINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.RevenueINC.increaseData / 10000)}`:'-'}}
@@ -81,8 +81,8 @@
{{item.curYearData?$util.getMoney(item.curYearData/10000):'-'}}
{{item.lYearData?$util.getMoney(item.lYearData/10000):'-'}}
- {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
- {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
+ {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
+ {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
@@ -95,7 +95,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
营业收入/万元
@@ -103,7 +103,7 @@
- {{topDetail.AccountINC && topDetail.AccountINC.increaseRate?topDetail.AccountINC.increaseRate<0?`${topDetail.AccountINC.increaseRate}%`:`+${topDetail.AccountINC.increaseRate}%` :'-'}}
+ {{topDetail.AccountINC && topDetail.AccountINC.increaseRate?topDetail.AccountINC.increaseRate<0?`${topDetail.AccountINC.increaseRate}%`:`+${topDetail.AccountINC.increaseRate}%` :'-'}}
同比去年
@@ -118,7 +118,7 @@
增长
- {{topDetail.AccountINC ? `${topDetail.AccountINC.increaseData<0?'':'+'}${ $util.getMoney(topDetail.AccountINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.AccountINC ? `${topDetail.AccountINC.increaseData<0?'':'+'}${ $util.getMoney(topDetail.AccountINC.increaseData / 10000)}`:'-'}}
@@ -133,8 +133,8 @@
类别
自营 (除税)
- 便利店
- 餐饮客房
+ 便利店 (除税)
+ 餐饮客房 (除税)
@@ -146,8 +146,8 @@
{{item.curYearData?$util.getMoney(item.curYearData/10000):'-'}}
{{item.lYearData?$util.getMoney(item.lYearData/10000):'-'}}
- {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
- {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
+ {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
+ {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
@@ -160,7 +160,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
入区车流
/万辆
@@ -170,7 +170,7 @@
- {{topDetail.BayonetINC && topDetail.BayonetINC.increaseRate?`${topDetail.BayonetINC.increaseRate<0?'':'+'}${topDetail.BayonetINC.increaseRate}%` :'-'}}
+ {{topDetail.BayonetINC && topDetail.BayonetINC.increaseRate?`${topDetail.BayonetINC.increaseRate<0?'':'+'}${topDetail.BayonetINC.increaseRate}%` :'-'}}
同比去年
@@ -185,7 +185,7 @@
增长
- {{topDetail.BayonetINC ? `${topDetail.BayonetINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.BayonetINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.BayonetINC ? `${topDetail.BayonetINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.BayonetINC.increaseData / 10000)}`:'-'}}
@@ -1028,7 +1028,7 @@ export default {
font-weight: 400;
font-size: 24rpx;
color: #57607B;
- text-align: center;
+ text-align: right;
font-style: normal;
display: inline-block;
width: 148rpx;
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index 8dfb1be..db04e28 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -38,7 +38,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
对客销售/万元
@@ -49,7 +49,7 @@
- {{topDetail.RevenueINC && topDetail.RevenueINC.increaseRate?topDetail.RevenueINC.increaseRate<0?`${topDetail.RevenueINC.increaseRate}%`:`+${topDetail.RevenueINC.increaseRate}%` :'-'}}
+ {{topDetail.RevenueINC && topDetail.RevenueINC.increaseRate?topDetail.RevenueINC.increaseRate<0?`${topDetail.RevenueINC.increaseRate}%`:`+${topDetail.RevenueINC.increaseRate}%` :'-'}}
同比去年
@@ -64,7 +64,7 @@
增长
- {{topDetail.RevenueINC ? `${topDetail.RevenueINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.RevenueINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.RevenueINC ? `${topDetail.RevenueINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.RevenueINC.increaseData / 10000)}`:'-'}}
@@ -95,8 +95,8 @@
{{item.curYearData?$util.getMoney(item.curYearData/10000):'-'}}
{{item.lYearData?$util.getMoney(item.lYearData/10000):'-'}}
- {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
- {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
+ {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
+ {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
@@ -109,7 +109,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
营业收入/万元
@@ -120,7 +120,7 @@
- {{topDetail.AccountINC && topDetail.AccountINC.increaseRate?topDetail.AccountINC.increaseRate<0?`${topDetail.AccountINC.increaseRate}%`:`+${topDetail.AccountINC.increaseRate}%` :'-'}}
+ {{topDetail.AccountINC && topDetail.AccountINC.increaseRate?topDetail.AccountINC.increaseRate<0?`${topDetail.AccountINC.increaseRate}%`:`+${topDetail.AccountINC.increaseRate}%` :'-'}}
同比去年
@@ -135,7 +135,7 @@
增长
- {{topDetail.AccountINC ? `${topDetail.AccountINC.increaseData<0?'':'+'}${ $util.getMoney(topDetail.AccountINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.AccountINC ? `${topDetail.AccountINC.increaseData<0?'':'+'}${ $util.getMoney(topDetail.AccountINC.increaseData / 10000)}`:'-'}}
@@ -150,8 +150,8 @@
类别
自营 (除税)
- 便利店
- 餐饮客房
+ 便利店 (除税)
+ 餐饮客房 (除税)
@@ -163,8 +163,8 @@
{{item.curYearData?$util.getMoney(item.curYearData/10000):'-'}}
{{item.lYearData?$util.getMoney(item.lYearData/10000):'-'}}
- {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
- {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
+ {{item.increaseData?`${item.increaseData<0?'':'+'}${$util.getMoney(item.increaseData/10000)}`:'-'}}
+ {{item.increaseRate?`${item.increaseRate<0?'':'+'}${item.increaseRate}%`:'-'}}
@@ -177,7 +177,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
入区车流
/万辆
@@ -190,7 +190,7 @@
- {{topDetail.BayonetINC && topDetail.BayonetINC.increaseRate?`${topDetail.BayonetINC.increaseRate<0?'':'+'}${topDetail.BayonetINC.increaseRate}%` :'-'}}
+ {{topDetail.BayonetINC && topDetail.BayonetINC.increaseRate?`${topDetail.BayonetINC.increaseRate<0?'':'+'}${topDetail.BayonetINC.increaseRate}%` :'-'}}
同比去年
@@ -205,7 +205,7 @@
增长
- {{topDetail.BayonetINC ? `${topDetail.BayonetINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.BayonetINC.increaseData / 10000)}`:'-'}}
+ {{topDetail.BayonetINC ? `${topDetail.BayonetINC.increaseData<0?'':'+'}${$util.getMoney(topDetail.BayonetINC.increaseData / 10000)}`:'-'}}
@@ -1450,7 +1450,7 @@ export default {
font-weight: 400;
font-size: 24rpx;
color: #57607B;
- text-align: center;
+ text-align: right;
font-style: normal;
display: inline-block;
width: 148rpx;
diff --git a/pages/revenueStatistics/servicePartList.vue b/pages/revenueStatistics/servicePartList.vue
index fa1948a..221c9d2 100644
--- a/pages/revenueStatistics/servicePartList.vue
+++ b/pages/revenueStatistics/servicePartList.vue
@@ -10,7 +10,7 @@
- {{thisMonth?thisMonth+'月':'累计'}}
+
服务区明细