-
-
-
-
-
-
/
-
-
-
-
-
-
=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
立即提现
@@ -66,7 +71,7 @@ const columns = ref([
align: 'center',
},
{
- title: '上次留存积分',
+ title: '上次留存余额',
key: 'balance',
align: 'center',
},
From 25c836c008a42fc21fe16e43f414b887a20171a0 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Thu, 5 Sep 2024 16:38:54 +0800
Subject: [PATCH 2/4] feat(custom): \!
---
.idea/.gitignore | 5 ---
.idea/codeStyles/Project.xml | 62 --------------------------
.idea/codeStyles/codeStyleConfig.xml | 5 ---
.idea/git_toolbox_blame.xml | 6 ---
.idea/jdt-mer.iml | 12 -----
.idea/modules.xml | 8 ----
.idea/vcs.xml | 6 ---
src/views/settlement/tx_list/index.vue | 2 +-
8 files changed, 1 insertion(+), 105 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/codeStyles/Project.xml
delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
delete mode 100644 .idea/git_toolbox_blame.xml
delete mode 100644 .idea/jdt-mer.iml
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 10b731c..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index f021dc9..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
deleted file mode 100644
index 7dc1249..0000000
--- a/.idea/git_toolbox_blame.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jdt-mer.iml b/.idea/jdt-mer.iml
deleted file mode 100644
index 24643cc..0000000
--- a/.idea/jdt-mer.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 0731372..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/settlement/tx_list/index.vue b/src/views/settlement/tx_list/index.vue
index 52f546c..587e33e 100644
--- a/src/views/settlement/tx_list/index.vue
+++ b/src/views/settlement/tx_list/index.vue
@@ -25,7 +25,7 @@
ref="numberAnimationInstRef"
:precision="2"
:from="0"
- :to="userInfo.integral / 100"
+ :to="userInfo.integral"
/>
From 57ff4e3cb1f2fd34dfb91556514075b3796f7b50 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Thu, 5 Sep 2024 20:29:06 +0800
Subject: [PATCH 3/4] feat(custom): \!
---
src/views/order/index1/index.vue | 10 +++++---
src/views/settlement/jf_list/index.vue | 32 +++++++++++++-------------
src/views/settlement/route.js | 6 ++---
3 files changed, 26 insertions(+), 22 deletions(-)
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,
},
From fe15b87b42777180d7698efd04e508c7a6f22be3 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Fri, 6 Sep 2024 21:10:22 +0800
Subject: [PATCH 4/4] feat(custom):
---
src/views/user/index1/index.vue | 124 ++++++++++++++++----------------
1 file changed, 60 insertions(+), 64 deletions(-)
diff --git a/src/views/user/index1/index.vue b/src/views/user/index1/index.vue
index ed8c89f..549319e 100644
--- a/src/views/user/index1/index.vue
+++ b/src/views/user/index1/index.vue
@@ -9,12 +9,12 @@
-->
-
+
-
+
@@ -162,12 +162,8 @@