From 36cccf30efa12ea613d8e3a5b4a23901aa0387f0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 7 Jul 2026 17:06:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thirdparty/third-push-conf.ts         |  44 +++
 .../mch-manage/components/app-push-form.vue   | 182 +++++++++++
 .../components/app-push-setting.vue           | 300 ++++++++++++++++++
 src/views/mch/mch-manage/detail.vue           |   4 +
 4 files changed, 530 insertions(+)
 create mode 100644 src/api/thirdparty/third-push-conf.ts
 create mode 100644 src/views/mch/mch-manage/components/app-push-form.vue
 create mode 100644 src/views/mch/mch-manage/components/app-push-setting.vue

diff --git a/src/api/thirdparty/third-push-conf.ts b/src/api/thirdparty/third-push-conf.ts
new file mode 100644
index 00000000..bc7b6453
--- /dev/null
+++ b/src/api/thirdparty/third-push-conf.ts
@@ -0,0 +1,44 @@
+import request from "/@/utils/request"
+
+// 新增推送配置
+export function create(data: any) {
+	return request({
+		url: "/third/push-conf/create",
+		method: "post",
+		data,
+	})
+}
+
+// 修改推送配置
+export function update(data: any) {
+	return request({
+		url: "/third/push-conf/edit",
+		method: "post",
+		data,
+	})
+}
+
+// 查询详情
+export function detail(id: any) {
+	return request({
+		url: `/third/push-conf/detail/${id}`,
+		method: "get",
+	})
+}
+
+// 删除推送配置
+export function delById(id: any) {
+	return request({
+		url: `/third/push-conf/remove/${id}`,
+		method: "post",
+	})
+}
+
+// 查询推送配置列表
+export function list(data: any) {
+	return request({
+		url: "/third/push-conf/list",
+		method: "post",
+		data,
+	})
+}
diff --git a/src/views/mch/mch-manage/components/app-push-form.vue b/src/views/mch/mch-manage/components/app-push-form.vue
new file mode 100644
index 00000000..25fc3a82
--- /dev/null
+++ b/src/views/mch/mch-manage/components/app-push-form.vue
@@ -0,0 +1,182 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+        <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+            <el-row :gutter="24">
+                <el-col :span="24" class="mb20">
+                    <el-form-item label="通知标题" prop="title">
+                        <el-input v-model="form.title" placeholder="请输入通知标题" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="24" class="mb20">
+                    <el-form-item label="通知内容" prop="content">
+                        <el-input v-model="form.content" type="textarea" :rows="4" placeholder="请输入通知内容" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24" class="mb20">
+                    <el-form-item label="通知时间" prop="informTime">
+                        <div class="flex gap-2 w-full">
+                            <dict-select style="width: 100px" v-model="form.informType"
+                                dict-code="third_push_inform_type" />
+                            <el-time-picker v-model="form.informTime" class="flex-1" value-format="HH:mm" format="HH:mm"
+                                :disabled="!form.informType" placeholder="通知时间" />
+                        </div>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="24" class="mb20">
+                    <el-form-item label="是否开启" prop="enable">
+                        <el-radio-group v-model="form.enable">
+                            <el-radio v-for="v in yes_no_type" :key="v.value" :label="v.value" border>
+                                {{ v.label }}
+                            </el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="visible = false">取消</el-button>
+                <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="AppPushFormDialog">
+import * as thirdPushConfApi from "/@/api/thirdparty/third-push-conf"
+import { useMessage } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+const emit = defineEmits(["refresh"])
+
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+
+const { yes_no_type } = useDict("yes_no_type")
+
+const defaultForm = {
+    id: "",
+    bizType: "DAY",
+    bizId: "",
+    title: "",
+    content: "",
+    enable: "1",
+    informType: "",
+    informTime: "",
+}
+
+const form = reactive({ ...defaultForm })
+
+const informTimeValidator = (_rule: any, value: string, callback: (error?: Error) => void) => {
+    if (!form.informType) {
+        callback(new Error("请选择通知类型"))
+        return
+    }
+    if (!value) {
+        callback(new Error("请选择通知时间"))
+        return
+    }
+    callback()
+}
+
+const dataRules = ref({
+    title: [{ required: true, message: "通知标题不能为空", trigger: "blur" }],
+    content: [{ required: true, message: "通知内容不能为空", trigger: "blur" }],
+    enable: [{ required: true, message: "请选择是否开启", trigger: "change" }],
+    informTime: [{ validator: informTimeValidator, trigger: "change" }],
+})
+
+watch(
+    () => form.informType,
+    (val, oldVal) => {
+        if (val !== oldVal) {
+            if (!val) {
+                form.informTime = ""
+            }
+            nextTick(() => {
+                dataFormRef.value?.validateField?.("informTime").catch(() => { })
+            })
+        }
+    }
+)
+
+const openDialog = async (id?: string, mchId?: string) => {
+    visible.value = true
+    Object.assign(form, defaultForm)
+    await nextTick()
+    dataFormRef.value?.resetFields()
+    form.bizType = "1"
+    form.bizId = mchId ?? ""
+    if (!id) {
+        return
+    }
+    try {
+        loading.value = true
+        const { data } = await thirdPushConfApi.detail(id)
+        Object.assign(form, {
+            ...data,
+            informTime: toHHmm(data?.informTime),
+        })
+    } catch (err: any) {
+        useMessage().error(err.msg || "查询详情失败")
+    } finally {
+        loading.value = false
+    }
+}
+
+const onSubmit = async () => {
+    const valid = await dataFormRef.value.validate().catch(() => { })
+    if (!valid) return
+
+    try {
+        loading.value = true
+        const _pa = {
+            ...form,
+            informTime: toHHmmss(form.informTime),
+        }
+        form.id ? await thirdPushConfApi.update(_pa) : await thirdPushConfApi.create(_pa)
+        useMessage().success(form.id ? "修改成功" : "添加成功")
+        visible.value = false
+        emit("refresh")
+    } catch (err: any) {
+        useMessage().error(err.msg)
+    } finally {
+        loading.value = false
+    }
+}
+
+function toHHmmss(value?: string) {
+    const raw = (value ?? "").trim()
+    if (!raw) return ""
+    const parts = raw.split(":")
+    if (parts.length === 2) {
+        const hh = (parts[0] ?? "").padStart(2, "0")
+        const mm = (parts[1] ?? "").padStart(2, "0")
+        return `${hh}:${mm}:00`
+    }
+    if (parts.length >= 3) {
+        const hh = (parts[0] ?? "").padStart(2, "0")
+        const mm = (parts[1] ?? "").padStart(2, "0")
+        const ss = (parts[2] ?? "").padStart(2, "0")
+        return `${hh}:${mm}:${ss}`
+    }
+    return raw
+}
+
+function toHHmm(value?: string) {
+    const raw = (value ?? "").trim()
+    if (!raw) return ""
+    const parts = raw.split(":")
+    if (parts.length >= 2) {
+        const hh = (parts[0] ?? "").padStart(2, "0")
+        const mm = (parts[1] ?? "").padStart(2, "0")
+        return `${hh}:${mm}`
+    }
+    return raw
+}
+
+defineExpose({ openDialog })
+</script>
diff --git a/src/views/mch/mch-manage/components/app-push-setting.vue b/src/views/mch/mch-manage/components/app-push-setting.vue
new file mode 100644
index 00000000..2a56b42b
--- /dev/null
+++ b/src/views/mch/mch-manage/components/app-push-setting.vue
@@ -0,0 +1,300 @@
+<template>
+    <div class="take-setting-list">
+        <!-- start App定时推送配置 start -->
+        <div class="take-card take-card--placeholder">
+            <div class="take-card__header">
+                <div class="take-card__intro">
+                    <div class="take-card__title">App定时推送配置</div>
+                </div>
+                <div class="take-card__toolbar">
+                    <right-toolbar :search="false" v-model:showSearch="showSearch" @queryTable="refreshAll" />
+                </div>
+            </div>
+            <div class="take-card__placeholder">
+                <el-row>
+                    <div class="mb8" style="width: 100%">
+                        <el-button icon="folder-add" type="primary" class="ml10"
+                            @click="formDialogRef.openDialog(null, mchId)">
+                            新 增
+                        </el-button>
+                    </div>
+                </el-row>
+                <el-table :data="state.dataList" v-loading="walletAliasState.loading" border
+                    :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+                    :row-class-name="tableRowClassName" @selection-change="selectionChangHandle"
+                    @sort-change="sortChangeHandle" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+                    :default-expand-all="false" :indent="30" row-key="id">
+                    <el-table-column type="index" label="#" width="50" align="center" />
+                    <el-table-column prop="bizType" label="推送类型" align="center" min-width="160">
+                        <template #default="{ row }">
+                            <dict-tag :options="third_push_inform_type" :value="row.bizType" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="visible" label="推送时间" align="center" min-width="160">
+                        <template #default="{ row }">
+                            <div class="flex items-center gap-2">
+                                <dict-tag :options="third_push_inform_type" :value="row.informType" />
+                                <span>{{ row.informTime }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="title" label="推送标题" align="center" min-width="160" />
+                    <el-table-column prop="content" label="推送内容" align="center" min-width="160"
+                        tooltip-overflow-tooltip />
+                    <el-table-column label="操作" fixed="right" min-width="180" align="center">
+                        <template #default="{ row }">
+                            <el-button icon="edit-pen" text type="primary" @click="formDialogRef.openDialog(row.id)">
+                                编辑
+                            </el-button>
+                            <el-button icon="delete" text type="primary" @click="deletePush(row)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
+        <AppPushForm ref="formDialogRef" @refresh="getDataList" />
+        <!-- end App定时推送配置 end -->
+    </div>
+</template>
+
+<script setup lang="ts" name="AppPushSetting">
+import * as thirdPushConfApi from "/@/api/thirdparty/third-push-conf"
+import * as mchManageApi from "/@/api/wallet/mch-manage";
+
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { useDict } from "/@/hooks/dict"
+import { useMessage, useMessageBox } from "/@/hooks/message.js";
+
+const AppPushForm = defineAsyncComponent(() => import("./app-push-form.vue"))
+
+// 搜索变量
+const showSearch = ref(false)
+const formDialogRef = ref()
+const props = withDefaults(defineProps<{
+    mchId: string
+}>(), {
+    mchId: ""
+})
+// 钱包别名配置
+const walletAliasState = reactive<any>({
+    tableList: [],
+    loading: false
+})
+
+// 定义查询字典
+const { third_push_inform_type } = useDict("third_push_inform_type")
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+const state: BasicTableProps = reactive<BasicTableProps>({
+    isPage: false,
+    createdIsNeed: false,
+    queryForm: {
+        bizType: '1',
+        bizId: props.mchId,
+    },
+    pageList: thirdPushConfApi.list,
+})
+
+const { getDataList, sortChangeHandle, tableStyle } = useTable(state)
+
+const tableRowClassName = ({ row }: { row: any }) => {
+    if (row.parentId && row.parentId != "-1") {
+        return "success-row"
+    }
+}
+
+// 删除
+const deletePush = async (row: any) => {
+    try {
+        await useMessageBox().confirm(`此操作将永久删除推送配置${row.title}`)
+    } catch {
+        return
+    }
+    try {
+        await thirdPushConfApi.delById(row.id)
+        useMessage().success("删除成功")
+        getDataList()
+    } catch (error) {
+        console.log("删除失败", error);
+    }
+}
+
+const refreshAll = () => {
+    getMchInfoDetail()
+    getDataList()
+}
+
+// 获取商户详情
+const getMchInfoDetail = async () => {
+    if (!state.queryForm.bizId) {
+        return
+    }
+    try {
+        const { data, code } = await mchManageApi.getObj(state.queryForm.bizId)
+        if (code != 0) {
+            throw new Error()
+        }
+        walletAliasState.tableList = data.walletAliasList ?? []
+    } catch (error) {
+        console.log("获取商户详情失败", error);
+    }
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id)
+    multiple.value = !objs.length
+}
+
+watch(
+    () => props.mchId,
+    (newVal, oldVal) => {
+        if (newVal !== oldVal) {
+            state.queryForm.bizId = newVal
+            refreshAll()
+        }
+    }, { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped>
+.take-setting-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+}
+
+.take-card {
+    width: 100%;
+    padding: 18px 20px 20px;
+    border: 1px solid #ebeef5;
+    border-radius: 16px;
+    box-shadow: 0 8px 24px rgba(31, 35, 41, 0.06);
+
+    &__header {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        gap: 20px;
+        padding-bottom: 16px;
+        margin-bottom: 16px;
+        border-bottom: 1px solid rgba(235, 238, 245, 0.9);
+    }
+
+    &__intro {
+        min-width: 220px;
+        padding-top: 6px;
+    }
+
+    &__title {
+        color: #1f2329;
+        font-size: 18px;
+        font-weight: 600;
+        line-height: 26px;
+    }
+
+    &__subtitle {
+        margin-top: 4px;
+        color: #86909c;
+        font-size: 13px;
+        line-height: 20px;
+    }
+
+    &__toolbar {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        gap: 12px;
+    }
+
+    &__switch-panel {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 12px;
+        min-height: 72px;
+        min-width: 320px;
+        padding: 14px 16px;
+        border: 1px solid rgba(64, 158, 255, 0.14);
+        border-radius: 14px;
+
+        &--disabled {
+            border-color: rgba(201, 205, 212, 0.68);
+        }
+    }
+
+    &__switch-copy {
+        min-width: 0;
+    }
+
+    &__switch-title {
+        color: #1f2329;
+        font-size: 14px;
+        font-weight: 600;
+        line-height: 22px;
+    }
+
+    &__switch-desc {
+        margin-top: 4px;
+        color: #86909c;
+        font-size: 12px;
+        line-height: 18px;
+    }
+
+    &__actions {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        flex-shrink: 0;
+        padding-left: 4px;
+    }
+
+    &__placeholder {
+        padding: 20px 18px;
+        border: 1px dashed rgba(201, 205, 212, 0.9);
+        border-radius: 14px;
+        color: #86909c;
+        font-size: 13px;
+        line-height: 22px;
+    }
+}
+
+.pay-info {
+    padding: 10px 10px;
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+    gap: 10px;
+
+    &-item {
+        display: flex;
+        align-items: center;
+        width: 100%;
+
+        >span:first-child {
+            width: 28%;
+            color: #333;
+            font-size: 13px;
+            font-weight: 500;
+        }
+
+        >span:last-child {
+            flex: 1;
+            color: #666;
+            font-size: 13px;
+        }
+    }
+}
+
+.pay-info-item--full {
+    grid-column: 1 / -1;
+}
+
+.pay-setting-json {
+    white-space: pre-wrap;
+    word-break: break-all;
+}
+</style>
diff --git a/src/views/mch/mch-manage/detail.vue b/src/views/mch/mch-manage/detail.vue
index 09c91cfb..95b84029 100644
--- a/src/views/mch/mch-manage/detail.vue
+++ b/src/views/mch/mch-manage/detail.vue
@@ -95,12 +95,14 @@
                 <el-tabs v-model="activeTab" class="demo-tabs">
                     <el-tab-pane label="支付相关" name="PAY_SETTING" />
                     <el-tab-pane label="商户功能" name="TAKE_OUT_SETTING" />
+                    <el-tab-pane label="App推送" name="APP_PUSH_SETTING" />
                     <el-tab-pane label="分店" name="FD_SETTING" />
                 </el-tabs>
             </div>
             <div class="main-content">
                 <take-out-setting ref="takeOutSettingRef" :mchId="state.mchId" v-if="activeTab == 'TAKE_OUT_SETTING'" />
                 <pay-setting ref="paySettingRef" :mchId="state.mchId" v-if="activeTab == 'PAY_SETTING'" />
+                <app-push-setting ref="appPushSettingRef" :mchId="state.mchId" v-if="activeTab == 'APP_PUSH_SETTING'" />
             </div>
         </div>
     </div>
@@ -112,6 +114,7 @@ import { useDict } from "/@/hooks/dict"
 
 const TakeOutSetting = defineAsyncComponent(() => import("./components/take-out-setting.vue"));
 const PaySetting = defineAsyncComponent(() => import("./components/pay-setting.vue"));
+const AppPushSetting = defineAsyncComponent(() => import("./components/app-push-setting.vue"));
 
 const { merchant_type } = useDict("merchant_type")
 
@@ -119,6 +122,7 @@ const activeTab = ref("PAY_SETTING")
 
 const takeOutSettingRef = ref()
 const paySettingRef = ref()
+const appPushSettingRef = ref()
 
 const state = reactive<any>({
     mchId: null,