chuangte/electripper-v2-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into wjh

Browse Source
This commit is contained in:
磷叶 2025-05-24 09:12:50 +08:00
commit 146f431549
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/filter.js
View File

@ -10,19 +10,19 @@ const filters = {
return isEmpty(data) ? '--' : data; return isEmpty(data) ? '--' : data;
}, },
fix2(num) { fix2(num) {
if (num == null) { if (num == null || isNaN(num)) {
return num; return num;
} }
return num.toFixed(2); return num.toFixed(2);
}, },
fix10(num) { fix10(num) {
if (num == null) { if (num == null || isNaN(num)) {
return num; return num;
} }
return num.toFixed(10); return num.toFixed(10);
}, },
fix8(num) { fix8(num) {
if (num == null) { if (num == null || isNaN(num)) {
return num; return num;
} }
return num.toFixed(8); return num.toFixed(8);

2
src/views/bst/channel/index.vue
View File

@ -61,7 +61,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="渠道成本" align="center" prop="costRate"> <el-table-column label="渠道成本" align="center" prop="costRate">
<template slot-scope="d">{{d.row.costRate | money}} %</template> <template slot-scope="d">{{d.row.costRate | fix2}} %</template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="创建时间" align="center" prop="createTime"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

4
src/views/bst/order/view/view.vue
View File

@ -264,8 +264,8 @@
<el-descriptions-item label="支付时间"> <el-descriptions-item label="支付时间">
{{ detail.ridePayTime | dv }} {{ detail.ridePayTime | dv }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="押金抵扣" v-if="detail.suitDepositDeduction"> <el-descriptions-item label="押金抵扣" v-if="detail.depositDeductionAmount">
{{ detail.suitDepositDeduction | fix2 | dv }} 元 {{ detail.depositDeductionAmount | fix2 | dv }} 元
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</collapse-panel> </collapse-panel>