From 9fa1a81b8afd92566815026d833bfe00f0b6f905 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Thu, 5 Sep 2024 16:38:10 +0800
Subject: [PATCH] feat(custom): \!
---
.idea/codeStyles/Project.xml | 62 ------------
.idea/codeStyles/codeStyleConfig.xml | 5 -
.idea/git_toolbox_blame.xml | 6 --
.idea/modules.xml | 8 --
.idea/vcs.xml | 6 --
.idea/workspace.xml | 127 -------------------------
src/views/commodity/hot_list/index.vue | 37 +++----
src/views/finance/index.vue | 10 +-
8 files changed, 15 insertions(+), 246 deletions(-)
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/modules.xml
delete mode 100644 .idea/vcs.xml
delete mode 100644 .idea/workspace.xml
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/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 737be84..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/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 08d9f9f..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- "associatedIndex": 2
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1723220985918
-
-
- 1723220985918
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/commodity/hot_list/index.vue b/src/views/commodity/hot_list/index.vue
index 426bcbc..c1226b6 100644
--- a/src/views/commodity/hot_list/index.vue
+++ b/src/views/commodity/hot_list/index.vue
@@ -173,11 +173,11 @@
:min="0"
/>
-
+
@@ -337,7 +337,7 @@ const rules = {
discount: {
required: true,
type: 'number',
- message: '请输入折扣比例',
+ message: '请输入抵扣比例',
trigger: 'blur',
},
}
@@ -444,32 +444,19 @@ const columns = ref([
align: 'center',
},
{
- title: '积分抵扣',
- slot: 'exchange',
+ title: '抵扣后价格(元)',
+ key: 'discount_price',
align: 'center',
- render: (row) => {
- return h(
- 'span',
- {},
- {
- default: () => (row.exchange ? `${(row.exchange / 100).toFixed(2)}元` : '无'),
- }
- )
- },
},
{
- title: '折扣比例(%)',
- slot: 'discount',
+ title: '积分抵扣（元）',
+ key: 'exchange',
+ align: 'center',
+ },
+ {
+ title: '折扣比例（%）',
+ key: 'discount',
align: 'center',
- render: (row) => {
- return h(
- 'span',
- {},
- {
- default: () => `${row.discount}%`,
- }
- )
- },
},
{
title: '商品库存',
diff --git a/src/views/finance/index.vue b/src/views/finance/index.vue
index 6de0ee0..e799815 100644
--- a/src/views/finance/index.vue
+++ b/src/views/finance/index.vue
@@ -8,7 +8,7 @@
@@ -28,18 +28,14 @@
-
+