Merge branch 'dev' into test

feat(custom): \!
2024-09-05 20:30:25 +08:00 · 2024-09-05 20:29:20 +08:00
1 changed files with 7 additions and 3 deletions
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -251,10 +251,14 @@ const columns = ref([
    render: (row) => h('span', `${row.price}元`),
  },
  {
-    title: '积分抵扣',
+    title: '抵扣后价格(元)',
    key: 'discount_price',
    align: 'center',
  },
  {
    title: '积分抵扣',
    key: 'exchange',
    align: 'center',
    slot: 'discount_price',
    render: (row) => h('span', `${row.discount_price}`),
  },
  {
    title: '支付方式',
Author	SHA1	Message	Date
Huakk	b2ff663fa8	Merge branch 'dev' into test All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-05 20:30:25 +08:00
Huakk	50d10c1d53	feat(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-09-05 20:29:20 +08:00