From 0bb6a90c9a2105244a4e41173a8be4fd6e384e59 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sun, 30 Mar 2025 19:52:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wallet/wallet-rule-join.ts | 55 ++++++ src/components/Select/SelectWalletType.vue | 3 + src/views/mch/components/mch-rule-desc.vue | 34 ++++ .../mch/mch-manage/mch-rule-config-form.vue | 11 +- src/views/mch/mch-manage/mch-rule-config.vue | 9 +- src/views/mch/rule-price-config/form.vue | 6 +- .../wallet/components/wallet-rule-desc.vue | 30 ++++ .../components/wallet-rule-form-dialog.vue | 123 ++++++++++++++ .../components/wallet-rule-table-dialog.vue | 156 ++++++++++++++++++ src/views/wallet/wallet-type/index.vue | 24 ++- 10 files changed, 425 insertions(+), 26 deletions(-) create mode 100644 src/api/wallet/wallet-rule-join.ts create mode 100644 src/views/mch/components/mch-rule-desc.vue create mode 100644 src/views/wallet/components/wallet-rule-desc.vue create mode 100644 src/views/wallet/wallet-type/components/wallet-rule-form-dialog.vue create mode 100644 src/views/wallet/wallet-type/components/wallet-rule-table-dialog.vue diff --git a/src/api/wallet/wallet-rule-join.ts b/src/api/wallet/wallet-rule-join.ts new file mode 100644 index 0000000..0be6acf --- /dev/null +++ b/src/api/wallet/wallet-rule-join.ts @@ -0,0 +1,55 @@ +import request from "/@/utils/request" + +export function pageJoin(query?: Object) { + return request({ + url: "/wallet/wallet-rule-join/page-join", + method: "get", + params: query, + }) +} + +export function fetchList(query?: Object) { + return request({ + url: "/wallet/wallet-rule-join/page", + method: "get", + params: query, + }) +} + +export function addObj(obj?: Object) { + return request({ + url: "/wallet/wallet-rule-join", + method: "post", + data: obj, + }) +} + +export function getObj(id?: string) { + return request({ + url: "/wallet/wallet-rule-join/" + id, + method: "get", + }) +} + +export function getJoinDetail(id?: string) { + return request({ + url: "/wallet/wallet-rule-join/join-detail/" + id, + method: "get", + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: "/wallet/wallet-rule-join", + method: "delete", + data: ids, + }) +} + +export function putObj(obj?: Object) { + return request({ + url: "/wallet/wallet-rule-join", + method: "put", + data: obj, + }) +} diff --git a/src/components/Select/SelectWalletType.vue b/src/components/Select/SelectWalletType.vue index d4cf70f..7aefdba 100644 --- a/src/components/Select/SelectWalletType.vue +++ b/src/components/Select/SelectWalletType.vue @@ -7,6 +7,7 @@ remote-show-suffix filterable remote + :disabled="props.disabled" :remote-method="remoteSearch" :loading="state.loading" @visible-change="(e: boolean) => e && getOptions()" @@ -34,9 +35,11 @@ const selectId = defineModel() const props = withDefaults( defineProps<{ placeholder?: string + disabled?: boolean }>(), { placeholder: "请选择", + disabled: false, }, ) diff --git a/src/views/mch/components/mch-rule-desc.vue b/src/views/mch/components/mch-rule-desc.vue new file mode 100644 index 0000000..a03320e --- /dev/null +++ b/src/views/mch/components/mch-rule-desc.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/views/mch/mch-manage/mch-rule-config-form.vue b/src/views/mch/mch-manage/mch-rule-config-form.vue index 0fc2896..867b4aa 100644 --- a/src/views/mch/mch-manage/mch-rule-config-form.vue +++ b/src/views/mch/mch-manage/mch-rule-config-form.vue @@ -19,13 +19,7 @@ - {{ form.sourceMchName ? form.sourceMchName : "???" }} - 到 - {{ form.targetMchName ? form.targetMchName : "???" }} - 消费,超过 - {{ form.basePrice ? displayPrice(form.basePrice) : "???" }} - 额外支付 - {{ form.multiple ? form.multiple : "???" }}% + @@ -42,7 +36,8 @@ diff --git a/src/views/wallet/wallet-type/components/wallet-rule-form-dialog.vue b/src/views/wallet/wallet-type/components/wallet-rule-form-dialog.vue new file mode 100644 index 0000000..afbd00e --- /dev/null +++ b/src/views/wallet/wallet-type/components/wallet-rule-form-dialog.vue @@ -0,0 +1,123 @@ + + + diff --git a/src/views/wallet/wallet-type/components/wallet-rule-table-dialog.vue b/src/views/wallet/wallet-type/components/wallet-rule-table-dialog.vue new file mode 100644 index 0000000..aa343c9 --- /dev/null +++ b/src/views/wallet/wallet-type/components/wallet-rule-table-dialog.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/views/wallet/wallet-type/index.vue b/src/views/wallet/wallet-type/index.vue index e6e4807..0a998fe 100644 --- a/src/views/wallet/wallet-type/index.vue +++ b/src/views/wallet/wallet-type/index.vue @@ -49,14 +49,21 @@ - - @@ -76,10 +84,12 @@ import { useDict } from "/@/hooks/dict" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const WalletRuleTableDialog = defineAsyncComponent(() => import("./components/wallet-rule-table-dialog.vue")) // 定义查询字典 const { wallet_type } = useDict("wallet_type") // 定义变量内容 const formDialogRef = ref() +const WalletRuleTableDialogRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true)