Compare commits

...

2 Commits

Author SHA1 Message Date
air
5585ace367 【类 型】:fix
【原  因】:订单列表 总额统计 没有计算 运费打包费
【过  程】:
【影  响】:
2025-01-21 20:14:58 +08:00
air
344e1d79d7 【类 型】:fix
【原  因】:订单统计中 后加的打包费 运费 没有算在总额里面
【过  程】:
【影  响】:
2025-01-21 20:02:29 +08:00
5 changed files with 100 additions and 4 deletions

View File

@ -388,6 +388,39 @@ const routes = [
} }
] ]
}, },
{
path: '/broadcast',
component: Layout,
redirect: '/broadcast/banner',
meta: {
title: '广告管理',
icon: 'iconfont icon-guanliyuan',
roles: ['admin', 'editor'],
tapName: 'admin'
},
children: [
{
path: '/broadcast/banner',
component: () => import('@/views/layout/components/main/broadcast/banner'),
meta: {
title: 'banner设置',
icon: 'iconfont icon-yonghuguanli',
roles: ['admin', 'editor'],
tapName: 'admin'
}
},
{
path: '/broadcast/notice',
component: () => import('@/views/layout/components/main/broadcast/notice'),
meta: {
title: '滚动通知设置',
icon: 'iconfont icon-yonghuguanli',
roles: ['admin', 'editor'],
tapName: 'admin'
}
}
]
},
{ {
path: '/order', path: '/order',
component: Layout, component: Layout,

View File

@ -0,0 +1,31 @@
<template>
<div class="app-container">
banner
</div>
</template>
<script>
export default {
name: 'Banner',
data () {
return {
}
},
components: {
},
computed: {
},
methods: {
},
watch: {
},
created () {
}
}
</script>
<style lang="scss" scoped>
@import "@/styles/theme.scss";
</style>

View File

@ -0,0 +1,31 @@
<template>
<div class="app-container">
notice
</div>
</template>
<script>
export default {
name: 'Notice',
data () {
return {
}
},
components: {
},
computed: {
},
methods: {
},
watch: {
},
created () {
}
}
</script>
<style lang="scss" scoped>
@import "@/styles/theme.scss";
</style>

View File

@ -103,6 +103,7 @@ export default {
const res = await getOrderList(orderSerch) const res = await getOrderList(orderSerch)
if (res.data.status === 1) { if (res.data.status === 1) {
this.orderList = res.data.orderList this.orderList = res.data.orderList
console.log(this.orderList)
this.loading = false this.loading = false
} else { } else {
this.$message.error('获取订单列表失败') this.$message.error('获取订单列表失败')
@ -119,7 +120,7 @@ export default {
*/ */
getSummaries () { getSummaries () {
const sum = this.orderList.reduce((acc, order) => { const sum = this.orderList.reduce((acc, order) => {
return acc + (order.total_price - order.refund_price) return acc + (Number(order.total_price) + Number(order.transport_price) + Number(order.pack_price) - Number(order.refund_price))
}, 0) }, 0)
const total = this.orderList.length const total = this.orderList.length
return ['合计', '', '', '', '', `${total}${formatPrice(sum)}`] return ['合计', '', '', '', '', `${total}${formatPrice(sum)}`]

View File

@ -286,7 +286,7 @@ export default {
}, },
// //
dayPaidTotal () { dayPaidTotal () {
return formatPrice(this.dayPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0)) return formatPrice(this.dayPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
}, },
// 退 // 退
dayRefund () { dayRefund () {
@ -331,7 +331,7 @@ export default {
}, },
// //
monthPaidTotal () { monthPaidTotal () {
return formatPrice(this.monthPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0)) return formatPrice(this.monthPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
}, },
// 退 // 退
monthRefund () { monthRefund () {
@ -377,7 +377,7 @@ export default {
}, },
// //
yearPaidTotal () { yearPaidTotal () {
return formatPrice(this.yearPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0)) return formatPrice(this.yearPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
}, },
// 退 // 退
yearRefund () { yearRefund () {