From 52ea4d341084938430c53c780a4532fdf8450df9 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 26 Mar 2025 18:40:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/hard/hard-order/index.vue | 7 +++++--
src/views/wallet/mch-manage/form.vue | 2 +-
src/views/wallet/rule-price-config/form.vue | 16 ++++++++++------
src/views/wallet/rule-price-config/index.vue | 13 +++++++++++--
src/views/wallet/wallet-cz/index.vue | 2 +-
.../components/extra-price/index.vue | 11 ++---------
6 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 1e021f0..0399ef1 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -6,12 +6,15 @@
-
-
+
+
+
+
+
diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
index 1062a17..736cab6 100644
--- a/src/views/wallet/mch-manage/form.vue
+++ b/src/views/wallet/mch-manage/form.vue
@@ -150,7 +150,7 @@ const dataRules = ref({
swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "blur" }],
rangeDate: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
- // merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+ merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
// jobTime: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
})
diff --git a/src/views/wallet/rule-price-config/form.vue b/src/views/wallet/rule-price-config/form.vue
index 01cee86..43c3d45 100644
--- a/src/views/wallet/rule-price-config/form.vue
+++ b/src/views/wallet/rule-price-config/form.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -34,7 +34,7 @@
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from "/@/api/wallet/wallet-rule-price-config"
-import { rule } from "/@/utils/validate"
+import { storePrice, displayPrice } from "/@/utils/formatMoney"
const emit = defineEmits(["refresh"])
// 定义变量内容
@@ -49,7 +49,7 @@ const form = reactive({
id: "",
rulePriceType: "",
basePrice: 20,
- multiple: 0.5,
+ multiple: 50,
})
// 定义校验规则
@@ -83,7 +83,11 @@ const onSubmit = async () => {
try {
loading.value = true
- form.id ? await putObj(form) : await addObj(form)
+ const _pa = {
+ ...form,
+ basePrice: storePrice(form.basePrice),
+ }
+ form.id ? await putObj(_pa) : await addObj(_pa)
useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false
emit("refresh")
@@ -100,7 +104,7 @@ const getwalletRulePriceConfigData = (id: string) => {
loading.value = true
getObj(id)
.then((res: any) => {
- Object.assign(form, res.data)
+ Object.assign(form, res.data, { basePrice: displayPrice(res.data.basePrice, "", 0) })
})
.finally(() => {
loading.value = false
diff --git a/src/views/wallet/rule-price-config/index.vue b/src/views/wallet/rule-price-config/index.vue
index 20a9de3..3fa7561 100644
--- a/src/views/wallet/rule-price-config/index.vue
+++ b/src/views/wallet/rule-price-config/index.vue
@@ -49,8 +49,16 @@
-
-
+
+
+ {{ displayPrice(row.basePrice) }}
+
+
+
+
+ {{ row.multiple }}%
+
+
import { BasicTableProps, useTable } from "/@/hooks/table"
-import { pageCz } from "/@/api/wallet/wallet-transaction"
+import { pageCz, delObjs } from "/@/api/wallet/wallet-transaction"
import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
import { displayPrice } from "/@/utils/formatMoney"
diff --git a/src/views/wallet/wallet-setting/components/extra-price/index.vue b/src/views/wallet/wallet-setting/components/extra-price/index.vue
index 2c5ff65..25c9069 100644
--- a/src/views/wallet/wallet-setting/components/extra-price/index.vue
+++ b/src/views/wallet/wallet-setting/components/extra-price/index.vue
@@ -3,14 +3,7 @@
-
+
@@ -113,7 +106,7 @@ const onSubmit = async () => {
const getwalletRechargePackageData = (id: string) => {
// 获取数据
loading.value = true
- getObj(id)
+ getObj()
.then((res: any) => {
Object.assign(form, res.data, { payAmountMealLimit: displayPrice(res.data.payAmountMealLimit, "", 0) })
})
From 29eb383e2ce8ad37c7a76af3fb269d0e5c2c8882 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Mar 2025 14:53:06 +0800
Subject: [PATCH 2/2] 11
---
src/views/wallet/mch-manage/setting.vue | 38 +++++++++++++++++------
src/views/wallet/wallet-setting/index.vue | 4 +--
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/views/wallet/mch-manage/setting.vue b/src/views/wallet/mch-manage/setting.vue
index 8405bc1..7931d70 100644
--- a/src/views/wallet/mch-manage/setting.vue
+++ b/src/views/wallet/mch-manage/setting.vue
@@ -1,14 +1,22 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -40,6 +40,4 @@ const data = {
}
const activeName = ref(data.tabList[0].id)
-
-const handleClick = (e: any) => {}