front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
pull from: dev2
merge into: front:main
Conversation 0 Commits 174 Files Changed 776 +23 -13
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30fa538c93 - Show all commits

36
src/views/order/onlineOrder/components/OnlineOrderItem.vue
View File

@ -121,6 +121,14 @@
{{ detail.voucher_price }}
</el-col>
</el-row>
<el-row>
<el-col :offset="18" :span="3" style="text-align: right">
<span>{{ __('打包费：￥') }}</span>
</el-col>
<el-col :span="3">
{{ detail.packing_fee }}
</el-col>
</el-row>
<el-row>
<el-col :offset="18" :span="3" style="text-align: right">
<span>
@ -901,22 +909,24 @@
if (!data) return sums
columns.forEach((column, index) => {
if (index === 1) {
if (index === 0) {
sums[index] = '合计'
return
}
if (index === 6 || index === 5) {
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
}
if (index === 7) {
// const values = data.map((item) => Number(item[column.property]))
// if (!values.every((value) => isNaN(value))) {
// sums[index] = values.reduce((prev, curr) => {
// const value = Number(curr)
// if (!isNaN(value)) {
// return prev + curr
// } else {
// return prev
// }
// }, 0)
// }
sums[index] = this.detail.order_item_amount || 0;
return;
}
})
return sums