优化修复问题

This commit is contained in:
gyq
2025-11-25 14:37:03 +08:00
parent 980f0357c1
commit 748c20362f
15 changed files with 446 additions and 121 deletions

View File

@@ -78,9 +78,9 @@
<div class="top">
<div class="item earnings">
<div class="num_wrap">
<div class="num">{{ formatDecimal(yingyeShiShou || 0) }}</div>
<div class="num">{{ formatDecimal(trade.payAmount + trade.rechargeAmount || 0) }}</div>
<div class="tips">
营业实收
营业()
<el-tooltip popper-class="popper" effect="light" placement="bottom">
<template #content>
<div class="tips_row">
@@ -89,42 +89,49 @@
<img class="icon" src="@/assets/images/data/wx.png" />
<span>微信小程序</span>
</div>
<span class="num">{{ trade.wechatPayAmount }}</span>
<span class="num">{{ trade.wechatPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/ali.png" />
<span>支付宝小程序</span>
</div>
<span class="num">{{ trade.aliPayAmount }}</span>
<span class="num">{{ trade.aliPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/scan.png" />
<span>主扫收款</span>
</div>
<span class="num">{{ trade.scanPayAmount }}</span>
<span class="num">{{ trade.backScanPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>现金</span>
</div>
<span class="num">{{ trade.cashPayAmount }}</span>
<span class="num">{{ trade.cashPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>充值</span>
</div>
<span class="num">{{ trade.rechargeAmount }}</span>
<span class="num">{{ trade.rechargeAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>挂账</span>
</div>
<span class="num">{{ trade.creditPayAmount }}</span>
<span class="num">{{ trade.creditPayAmount || 0 }}</span>
</div>
<div class="item">
<div class="left">
<img class="icon" src="@/assets/images/data/cash.png" />
<span>会员支付</span>
</div>
<span class="num">{{ trade.memberPayAmount || 0 }}</span>
</div>
</div>
</template>
@@ -138,19 +145,19 @@
<div class="line_item">
<div class="line_item_top">
<div>销售金额</div>
<!-- <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div> -->
<!-- <div class="t">{{ formatDecimal(tradeSale.totalpayAmount || 0) }}</div> -->
</div>
<div class="line_gropress">
<div class="gropress l" :style="{
width: `${trade.saleAmount
? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
width: `${trade.payAmount
? (trade.payAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
100
: 0
}%`,
}" />
<div class="gropress r" :style="{
width: `${trade.refundAmount
? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount * 1)) *
? (trade.refundAmount / (trade.payAmount * 1 + trade.refundAmount * 1)) *
100
: 0
}%`,
@@ -159,7 +166,7 @@
<div class="line_btm">
<el-icon class="icon el-icon-caret-right" />
<div class="info">
<span class="l_t">{{ formatDecimal(trade.saleAmount || 0) }}</span>
<span class="l_t">{{ formatDecimal(trade.payAmount || 0) }}</span>
<span class="l_r">退{{ formatDecimal(trade.refundAmount || 0) }}</span>
</div>
</div>
@@ -200,7 +207,21 @@
</div>
</div>
<div class="item data">
<div class="data_item">
<div class="right_data_wrap">
<div class="item">
<div class="num">{{ formatDecimal(trade.memberPayAmount || 0) }}</div>
<div class="tips">余额支付金额</div>
</div>
<div class="item">
<div class="num">{{ trade.memberPayCount || 0 }}</div>
<div class="tips">余额支付</div>
</div>
<div class="item">
<div class="num">{{ trade.newMemberCount || 0 }}</div>
<div class="tips">新增会员数</div>
</div>
</div>
<!-- <div class="data_item">
<div class="num_wrap">
<div class="num">{{ formatDecimal(trade.memberPayAmount || 0) }}</div>
<div class="tips">会员消费</div>
@@ -215,7 +236,7 @@
<span>会员消费笔数</span>
<span class="n">{{ trade.memberPayCount || 0 }}</span>
</div>
</div>
</div> -->
</div>
</div>
<div class="btm">
@@ -223,7 +244,7 @@
<div class="title">客单价</div>
<div class="icon_wrap">
<img class="img" src="@/assets/images/data_home_item1_icon.png" />
<div class="t">{{ formatDecimal(trade.customerUnitPrice || 0) }}</div>
<div class="t">{{ formatDecimal(trade.avgPayAmount || 0) }}</div>
</div>
</div>
<div class="item item2">
@@ -237,7 +258,7 @@
</div>
<div class="icon_wrap">
<img class="img" src="@/assets/images/data_home_item2_icon.png" />
<div class="t">{{ trade.tableTurnoverRate }}</div>
<div class="t">{{ trade.turnoverRate || 0 }}%</div>
</div>
</div>
<div class="item item3">
@@ -254,6 +275,38 @@
<div class="t">{{ trade.discountCount || 0 }}</div>
</div>
</div>
<div class="item item1">
<div class="row_wrap">
<div class="row">
<div class="title">毛利润</div>
<div class="icon_wrap">
<div class="t">{{ trade.profitAmount || 0 }}</div>
</div>
</div>
<div class="row">
<div class="title">毛利率</div>
<div class="icon_wrap">
<div class="t">{{ trade.profitRate || 0 }}%</div>
</div>
</div>
</div>
</div>
<div class="item item4">
<div class="row_wrap">
<div class="row">
<div class="title">净利润</div>
<div class="icon_wrap">
<div class="t">{{ trade.netProfitAmount || 0 }}</div>
</div>
</div>
<div class="row">
<div class="title">净利率</div>
<div class="icon_wrap">
<div class="t">{{ trade.netProfitRate || 0 }}%</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -1323,6 +1376,23 @@ export default {
background-image: url("../../assets/images/data_home_item4.png");
}
.row_wrap {
display: flex;
width: 100%;
height: 100%;
.row {
flex: 1;
display: flex;
flex-direction: column;
justify-content: center;
.t {
margin-left: 0;
}
}
}
.title {
display: flex;
align-items: center;
@@ -1501,4 +1571,28 @@ export default {
}
}
}
.right_data_wrap {
width: 100%;
height: 100%;
display: flex;
align-items: center;
.item {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
.num {
font-size: 32px;
color: #3F9EFF;
}
.tips {
font-size: 14px;
color: #666666;
}
}
}
</style>