Merge branch 'dev' into test

2024-07-19 11:01:23 +08:00
parent b47bc1b35b 2f7b80f418
commit 0ea8754321
1 changed files with 1 additions and 1 deletions
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -251,7 +251,7 @@ const columns = ref([
    title: '支付方式',
    align: 'center',
    slot: 'pay_type',
-    render: (row) => h('span', row.pay_type === 1 ? '微信' : '积分'),
+    render: (row) => h('span', row.PayInfo.name),
  },
  {
    title: '商家名称',