diff --git a/src/views/order/index1/index.vue b/src/views/order/index1/index.vue index 419c09e..1d28c54 100644 --- a/src/views/order/index1/index.vue +++ b/src/views/order/index1/index.vue @@ -242,10 +242,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: '支付方式', diff --git a/src/views/settlement/jf_list/index.vue b/src/views/settlement/jf_list/index.vue index e69b179..1aea7af 100644 --- a/src/views/settlement/jf_list/index.vue +++ b/src/views/settlement/jf_list/index.vue @@ -4,12 +4,12 @@
- + - + @@ -139,13 +139,13 @@ const getList = async () => { key: 'oid', align: 'center', }, + // { + // title: '用户名称', + // key: 'user_name', + // align: 'center', + // }, { - title: '用户名称', - key: 'user_name', - align: 'center', - }, - { - title: '上次留存积分', + title: '上次留存余额', key: 'balance', align: 'center', }, @@ -155,13 +155,13 @@ const getList = async () => { align: 'center', }, { - title: '获取积分', + title: '获取余额', key: 'number', align: 'center', }, { title: '时间', - key: 'record_time', + key: 'add_time', align: 'center', }, ] @@ -174,18 +174,18 @@ const getList = async () => { align: 'center', }, { - title: '上次留存积分', + title: '上次留存余额', key: 'balance', align: 'center', }, { - title: '扣除积分', + title: '扣除余额', key: 'record_number', align: 'center', }, { title: '时间', - key: 'record_time', + key: 'add_time', align: 'center', }, ] @@ -198,18 +198,18 @@ const getList = async () => { align: 'center', }, { - title: '上次留存积分', + title: '上次留存余额', key: 'balance', align: 'center', }, { - title: '获取积分', + title: '获取余额', key: 'record_number', align: 'center', }, { title: '时间', - key: 'record_time', + key: 'add_time', align: 'center', }, ] diff --git a/src/views/settlement/route.js b/src/views/settlement/route.js index 011e6b0..d9763a1 100644 --- a/src/views/settlement/route.js +++ b/src/views/settlement/route.js @@ -1,12 +1,12 @@ const Layout = () => import('@/layout/index.vue') export default { - name: '积分管理', + name: '余额管理', path: '/settlement', component: Layout, redirect: 'jf_list', meta: { - title: '积分管理', + title: '余额管理', icon: 'mdi:account-multiple', order: 10, }, @@ -16,7 +16,7 @@ export default { path: 'jf_list', component: () => import('./jf_list/index.vue'), meta: { - title: '积分明细', + title: '余额明细', icon: 'mdi:account-multiple', order: 10, },