diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..f021dc9 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,62 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 0000000..7dc1249 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..737be84 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..08d9f9f --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 2 +} + + + + + + + + + + + + diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue index e67f1ac..71f23f7 100644 --- a/src/views/order/index/index.vue +++ b/src/views/order/index/index.vue @@ -45,11 +45,11 @@ @@ -245,10 +245,16 @@ const columns = ref([ key: 'count', }, { - title: '订单总价', + title: '订单金额', align: 'center', slot: 'number', - render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`), + render: (row) => h('span', `${row.price}元`), + }, + { + title: '积分抵扣', + align: 'center', + slot: 'discount_price', + render: (row) => h('span', `${row.discount_price}`), }, { title: '支付方式',