feat(ticket): 新增优惠券详情页面并优化代金券功能

- 新增优惠券详情页面 (couponDetail.vue)，支持展示优惠券完整信息
- 优化代金券和优惠券的详情展示，使用 v-html 渲染规则内容
- 完善 ticketManagement 页面的操作按钮权限控制和状态管理
- 重构表单字段命名，统一使用英文字段名并优化校验规则
- 调整列表页操作按钮显示逻辑，区分代金券和优惠券的不同权限
- 优化库存修改和上下架操作的处理流程
- 更新详情页跳转逻辑，支持代金券和优惠券分别跳转
- 移除冗余的审核状态字段，简化状态管理
- 添加领取规则和是否收藏店铺选项配置
- 完善表单验证规则和日期范围校验逻辑

src/views/groupPackageManagement/detail.vue

@@ -128,16 +128,12 @@
           <!-- 预约规则 -->
           <div class="detail-item">
             <div class="detail-label">预约规则</div>
-            <div class="detail-value">
-              {{ storeInfoModel.reservationRules || "详情请咨询商家" }}
-            </div>
+            <div class="detail-value" v-html="storeInfoModel.reservationRules || '详情请咨询商家'" />
           </div>
           <!-- 使用规则 -->
           <div class="detail-item">
             <div class="detail-label">使用规则</div>
-            <div class="detail-value">
-              {{ storeInfoModel.useRules || "详情请咨询商家" }}
-            </div>
+            <div class="detail-value" v-html="storeInfoModel.useRules || '详情请咨询商家'" />
           </div>
           <!-- 适用人数 -->
           <div class="detail-item">
@@ -149,9 +145,7 @@
           <!-- 其他规则 -->
           <div class="detail-item">
             <div class="detail-label">其他规则</div>
-            <div class="detail-value">
-              {{ storeInfoModel.otherRules || "详情请咨询商家" }}
-            </div>
+            <div class="detail-value" v-html="storeInfoModel.otherRules || '详情请咨询商家'" />
           </div>
           <!-- 发票信息 -->
           <div class="detail-item">

src/views/ticketManagement/couponDetail.vue

@@ -0,0 +1,333 @@
+<template>
+  <!-- 优惠券管理 - 详情页面 -->
+  <div class="table-box" style="width: 100%; min-height: 100%; background-color: white">
+    <div class="header">
+      <el-button @click="goBack"> 返回 </el-button>
+      <h2 class="title">优惠券详情</h2>
+    </div>
+    <div class="content">
+      <!-- 左侧内容区域 -->
+      <div class="contentLeft">
+        <!-- 基础信息模块 -->
+        <div class="model">
+          <h3 style="font-weight: bold">基础信息：</h3>
+          <!-- 优惠券名称 -->
+          <div class="detail-item">
+            <div class="detail-label">优惠券名称</div>
+            <div class="detail-value">
+              {{ couponModel.name || "--" }}
+            </div>
+          </div>
+          <!-- 面值 -->
+          <div class="detail-item">
+            <div class="detail-label">面值(元)</div>
+            <div class="detail-value">
+              {{ couponModel.nominalValue ? `¥${couponModel.nominalValue}` : "--" }}
+            </div>
+          </div>
+          <!-- 开始领取时间 -->
+          <div class="detail-item">
+            <div class="detail-label">开始领取时间</div>
+            <div class="detail-value">
+              {{ couponModel.beginGetDate ? formatDate(couponModel.beginGetDate) : "--" }}
+            </div>
+          </div>
+          <!-- 结束领取时间 -->
+          <div class="detail-item">
+            <div class="detail-label">结束领取时间</div>
+            <div class="detail-value">
+              {{ couponModel.endGetDate ? formatDate(couponModel.endGetDate) : "--" }}
+            </div>
+          </div>
+          <!-- 有效期 -->
+          <div class="detail-item">
+            <div class="detail-label">有效期</div>
+            <div class="detail-value">
+              {{ couponModel.specifiedDay ? `购买后${couponModel.specifiedDay}天` : "--" }}
+            </div>
+          </div>
+          <!-- 库存 -->
+          <div class="detail-item">
+            <div class="detail-label">库存</div>
+            <div class="detail-value">
+              {{ couponModel.singleQty || "--" }}
+            </div>
+          </div>
+        </div>
+        <!-- 领取规则模块 -->
+        <div class="model">
+          <h3 style="font-weight: bold">领取规则：</h3>
+          <!-- 用户领取规则 -->
+          <div class="detail-item">
+            <div class="detail-label">用户领取规则</div>
+            <div class="detail-value">
+              {{ getClaimRuleText() }}
+            </div>
+          </div>
+          <!-- 用户是否需要收藏店铺领取 -->
+          <div class="detail-item">
+            <div class="detail-label">用户是否需要收藏店铺领取</div>
+            <div class="detail-value">
+              {{ couponModel.attentionCanReceived === 1 ? "是" : couponModel.attentionCanReceived === 0 ? "否" : "--" }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 右侧内容区域 -->
+      <div class="contentRight">
+        <!-- 使用规则模块 -->
+        <div class="model">
+          <h3 style="font-weight: bold">使用规则：</h3>
+          <!-- 是否有低消 -->
+          <div class="detail-item">
+            <div class="detail-label">是否有低消</div>
+            <div class="detail-value">
+              {{ couponModel.hasMinimumSpend === 1 ? "是" : couponModel.hasMinimumSpend === 0 ? "否" : "--" }}
+            </div>
+          </div>
+          <!-- 最低消费金额 -->
+          <div class="detail-item" v-if="couponModel.hasMinimumSpend === 1">
+            <div class="detail-label">最低消费金额</div>
+            <div class="detail-value">
+              {{ couponModel.minimumSpendingAmount ? `¥${couponModel.minimumSpendingAmount}` : "--" }}
+            </div>
+          </div>
+          <!-- 补充说明 -->
+          <div class="detail-item">
+            <div class="detail-label">补充说明</div>
+            <div class="detail-value" v-html="couponModel.supplementaryInstruction || '--'" />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="tsx" name="couponManagementDetail">
+/**
+ * 优惠券管理 - 详情页面
+ * 功能：显示优惠券的详细信息
+ */
+import { ref, onMounted } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { ElMessage } from "element-plus";
+import { getCouponDetail } from "@/api/modules/couponManagement";
+
+// ==================== 响应式数据定义 ====================
+
+// 路由相关
+const router = useRouter();
+const route = useRoute();
+
+// 页面ID参数
+const id = ref<string>("");
+
+// ==================== 优惠券信息数据模型 ====================
+const couponModel = ref<any>({
+  // 优惠券名称
+  name: "",
+  // 面值(元)
+  nominalValue: "",
+  // 开始领取时间
+  beginGetDate: "",
+  // 结束领取时间
+  endGetDate: "",
+  // 有效期
+  specifiedDay: "",
+  // 库存
+  singleQty: "",
+  // 用户领取规则：day-每日一领，week-每周一领，month-每月一领
+  claimRule: "day",
+  // 用户是否需要收藏店铺领取：1-是，0-否
+  attentionCanReceived: 0,
+  // 是否有低消：1-是，0-否
+  hasMinimumSpend: 0,
+  // 最低消费金额
+  minimumSpendingAmount: "",
+  // 补充说明
+  supplementaryInstruction: ""
+});
+
+// ==================== 生命周期钩子 ====================
+
+/**
+ * 组件挂载时初始化
+ * 从路由参数中获取ID并加载详情数据
+ */
+onMounted(async () => {
+  id.value = (route.query.id as string) || "";
+  if (id.value) {
+    await loadDetailData();
+  } else {
+    // 如果没有ID，使用假数据展示
+    loadMockData();
+  }
+});
+
+// ==================== 事件处理函数 ====================
+
+/**
+ * 返回上一页
+ */
+const goBack = () => {
+  router.go(-1);
+};
+
+// ==================== 数据加载函数 ====================
+
+/**
+ * 加载详情数据
+ */
+const loadDetailData = async () => {
+  try {
+    const params: any = {
+      id: id.value
+    };
+    const res: any = await getCouponDetail(params);
+    if (res && res.code == 200) {
+      // 合并主数据
+      couponModel.value = { ...couponModel.value, ...res.data };
+    } else {
+      ElMessage.error("加载详情数据失败");
+      // 加载失败时使用假数据
+      loadMockData();
+    }
+  } catch (error) {
+    console.error("加载详情数据出错:", error);
+    ElMessage.error("加载详情数据出错");
+    // 加载失败时使用假数据
+    loadMockData();
+  }
+};
+
+/**
+ * 加载假数据（用于展示）
+ */
+const loadMockData = () => {
+  couponModel.value = {
+    name: "5元通用优惠券",
+    nominalValue: "5",
+    beginGetDate: "2025-01-01",
+    endGetDate: "2025-04-20",
+    specifiedDay: "30",
+    singleQty: "2000",
+    claimRule: "day",
+    attentionCanReceived: 0,
+    hasMinimumSpend: 1,
+    minimumSpendingAmount: "100",
+    supplementaryInstruction: "本优惠券适用于全场商品，不可与其他优惠叠加使用。"
+  };
+};
+
+// ==================== 工具函数 ====================
+
+/**
+ * 格式化日期
+ * @param date 日期字符串 (YYYY-MM-DD)
+ * @returns 格式化后的日期字符串 (YYYY.MM.DD)
+ */
+const formatDate = (date: string) => {
+  if (!date) return "--";
+  return date.replace(/-/g, ".");
+};
+
+/**
+ * 获取用户领取规则文本
+ */
+const getClaimRuleText = () => {
+  const ruleMap: Record<string, string> = {
+    day: "每日一领",
+    week: "每周一领",
+    month: "每月一领"
+  };
+  return ruleMap[couponModel.value.claimRule] || "--";
+};
+</script>
+
+<style scoped lang="scss">
+/* 页面容器 */
+.table-box {
+  display: flex;
+  flex-direction: column;
+  height: auto !important;
+  min-height: 100%;
+}
+
+/* 头部区域 */
+.header {
+  display: flex;
+  align-items: center;
+  padding: 20px 24px;
+  background-color: #ffffff;
+  border-bottom: 1px solid #e4e7ed;
+  box-shadow: 0 2px 4px rgb(0 0 0 / 2%);
+}
+.title {
+  flex: 1;
+  margin: 0;
+  font-size: 18px;
+  font-weight: 600;
+  color: #303133;
+  text-align: center;
+}
+
+/* 内容区域布局 */
+.content {
+  display: flex;
+  flex: 1;
+  column-gap: 24px;
+  width: 98%;
+  padding: 0 12px;
+  margin: 24px auto;
+
+  /* 左侧内容区域 */
+  .contentLeft {
+    width: 50%;
+    padding-right: 12px;
+  }
+
+  /* 右侧内容区域 */
+  .contentRight {
+    width: 50%;
+    padding-left: 12px;
+  }
+}
+
+/* 模块容器 */
+.model {
+  margin-bottom: 50px;
+  h3 {
+    padding-bottom: 12px;
+    margin: 0 0 20px;
+    font-size: 16px;
+    color: #303133;
+    border-bottom: 2px solid #e4e7ed;
+  }
+}
+
+/* 详情项样式 */
+.detail-item {
+  display: flex;
+  align-items: flex-start;
+  min-height: 32px;
+  margin-bottom: 24px;
+}
+.detail-label {
+  flex-shrink: 0;
+  min-width: 120px;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 32px;
+  color: #606266;
+}
+.detail-value {
+  flex: 1;
+  font-size: 14px;
+  line-height: 32px;
+  color: #303133;
+  word-break: break-word;
+}
+.empty-text {
+  color: #909399;
+}
+</style>

src/views/ticketManagement/detail.vue

@@ -109,9 +109,7 @@
           <!-- 补充说明 -->
           <div class="detail-item">
             <div class="detail-label">补充说明</div>
-            <div class="detail-value">
-              {{ voucherModel.supplement || "--" }}
-            </div>
+            <div class="detail-value" v-html="voucherModel.supplement || '--'" />
           </div>
         </div>
       </div>

src/views/ticketManagement/index.vue

@@ -35,59 +35,66 @@
       </template>
       <!-- 表格操作 -->
       <template #operation="scope">
+        <!-- 上架按钮 -->
         <el-button
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.上架)"
           link
           type="primary"
-          @click="changeTypes(scope.row, 1)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.上架)"
+          @click="changeTypes(scope.row, isVoucher ? 1 : 5)"
         >
           上架
         </el-button>
+        <!-- 下架按钮 -->
         <el-button
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.下架)"
           link
           type="primary"
           @click="changeTypes(scope.row, 6)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.下架)"
         >
           下架
         </el-button>
+        <!-- 修改库存按钮 -->
         <el-button
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.修改库存)"
           link
           type="primary"
           @click="changeInventory(scope.row)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.修改库存)"
         >
           修改库存
         </el-button>
+        <!-- 查看拒绝原因按钮（仅代金券） -->
         <el-button
+          v-if="isVoucher && canShowButton(scope.row.status, VOUCHER_OPERATION_PERMISSIONS.查看拒绝原因)"
           link
           type="primary"
           @click="viewRejectReason(scope.row)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.查看拒绝原因)"
         >
           查看拒绝原因
         </el-button>
+        <!-- 查看详情按钮 -->
         <el-button
-          type="primary"
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.查看详情) && (isCoupon || scope.row.dataType != 1)"
           link
+          type="primary"
           @click="toDetail(scope.row)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.查看详情) && scope.row.dataType != 1"
         >
           查看详情
         </el-button>
+        <!-- 编辑按钮 -->
         <el-button
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.编辑) || (isVoucher && scope.row.dataType == 1)"
           link
           type="primary"
           @click="editRow(scope.row)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.编辑) || scope.row.dataType == 1"
         >
           编辑
         </el-button>
+        <!-- 删除按钮 -->
         <el-button
+          v-if="canShowButton(scope.row.status, currentOperationPermissions.删除) || (isVoucher && scope.row.dataType == 1)"
           link
           type="primary"
           @click="deleteRow(scope.row)"
-          v-if="canShowButton(scope.row.status, OPERATION_PERMISSIONS.删除) || scope.row.dataType == 1"
         >
           删除
         </el-button>
@@ -138,14 +145,20 @@
 </template>
 
 <script setup lang="tsx" name="voucherManagement">
-import { computed, onActivated, onMounted, reactive, ref, watch } from "vue";
+import { computed, onActivated, onMounted, reactive, ref } from "vue";
 import { useRouter } from "vue-router";
 import type { FormInstance, FormRules } from "element-plus";
 import { ElMessage } from "element-plus";
 import ProTable from "@/components/ProTable/index.vue";
 import { ColumnProps, ProTableInstance } from "@/components/ProTable/interface";
 import { Plus } from "@element-plus/icons-vue";
-import { delThaliById, getThaliList, updateNum, updateStatus } from "@/api/modules/voucherManagement";
+import {
+  delThaliById as delVoucherById,
+  getThaliList,
+  updateNum,
+  updateStatus as updateVoucherStatus
+} from "@/api/modules/voucherManagement";
+import { delThaliById as delCouponById, updateStatus as updateCouponStatus } from "@/api/modules/couponManagement";
 import { ElMessageBox } from "element-plus/es";
 import { localGet, usePermission } from "@/utils";
 
@@ -157,7 +170,6 @@ const formInventory: any = ref({
   singleQty: "",
   newInventory: ""
 });
-const rowData = ref<any>();
 const activeName = ref("1");
 // 查看拒绝原因弹窗相关
 const rejectReasonDialogVisible = ref(false);
@@ -241,12 +253,7 @@ const voucherColumns = reactive<ColumnProps<any>[]>([
   },
   {
     prop: "status",
-    label: "状态"
-  },
-  {
-    prop: "reviewType",
-    label: "审核状态",
-    isShow: false,
+    label: "状态",
     search: {
       el: "select",
       props: { placeholder: "请选择" }
@@ -286,18 +293,13 @@ const couponColumns = reactive<ColumnProps<any>[]>([
   },
   {
     prop: "status",
-    label: "状态"
-  },
-  {
-    prop: "reviewType",
-    label: "审核状态",
-    isShow: false,
+    label: "状态",
     search: {
       el: "select",
       props: { placeholder: "请选择" }
     },
     enum: statusEnum,
-    fieldNames: { label: "label", value: "name" }
+    fieldNames: { label: "label", value: "value" }
   },
   { prop: "operation", label: "操作", fixed: "right", width: 330 }
 ]);
@@ -324,8 +326,8 @@ const STATUS = {
   已结束: 7
 } as const;
 
-// 操作按钮权限配置：定义每个操作按钮在哪些状态下显示
-const OPERATION_PERMISSIONS = {
+// 代金券操作按钮权限配置：定义每个操作按钮在哪些状态下显示
+const VOUCHER_OPERATION_PERMISSIONS = {
   // 查看详情：待审核、未开始、审核拒绝、进行中、已售罄、已下架
   查看详情: [STATUS.待审核, STATUS.未开始, STATUS.审核拒绝, STATUS.进行中, STATUS.已售罄, STATUS.已下架],
   // 上架：未开始、已下架
@@ -342,11 +344,38 @@ const OPERATION_PERMISSIONS = {
   查看拒绝原因: [STATUS.审核拒绝]
 } as const;
 
+// 优惠券操作按钮权限配置
+const COUPON_OPERATION_PERMISSIONS = {
+  // 查看详情：草稿、未开始、进行中、已下架、已结束、已售罄
+  查看详情: [STATUS.草稿, STATUS.未开始, STATUS.进行中, STATUS.已下架, STATUS.已结束, STATUS.已售罄],
+  // 上架：未开始、已下架
+  上架: [STATUS.未开始, STATUS.已下架],
+  // 下架：进行中
+  下架: [STATUS.进行中],
+  // 修改库存：未开始、进行中、已售罄
+  修改库存: [STATUS.未开始, STATUS.进行中, STATUS.已售罄],
+  // 编辑：草稿、未开始、进行中、已下架、已结束、已售罄
+  编辑: [STATUS.草稿, STATUS.未开始, STATUS.进行中, STATUS.已下架, STATUS.已结束, STATUS.已售罄],
+  // 删除：草稿、已结束、已售罄
+  删除: [STATUS.草稿, STATUS.已结束, STATUS.已售罄]
+} as const;
+
 // 判断按钮是否显示的工具函数
 const canShowButton = (status: number, allowedStatuses: readonly number[]) => {
   return allowedStatuses.includes(status);
 };
 
+// 根据当前tab获取操作权限配置
+const currentOperationPermissions = computed(() => {
+  return activeName.value === "1" ? VOUCHER_OPERATION_PERMISSIONS : COUPON_OPERATION_PERMISSIONS;
+});
+
+// 判断是否为代金券
+const isVoucher = computed(() => activeName.value === "1");
+
+// 判断是否为优惠券
+const isCoupon = computed(() => activeName.value === "2");
+
 // 获取状态标签
 const getStatusLabel = (status: number) => {
   const statusMap: Record<number, string> = {
@@ -375,24 +404,7 @@ const getReviewStatusLabel = (reviewType: string | number) => {
   return reviewStatusMap[String(reviewType)] || "";
 };
 
-// 获取当前审核状态
-const currentAuditStatus = computed(() => {
-  if (!proTable.value?.searchParam) return "";
-  return proTable.value.searchParam.reviewType || "";
-});
-
-// 根据审核状态过滤 tabOptions：如果审核状态为空，只显示草稿；审核通过时，显示除草稿外的所有标签页
-const filteredTabOptions = computed(() => {
-  const status = currentAuditStatus.value;
-  if (!status) {
-    return allTabOptions;
-  } else if (status == "1") {
-    // 审核通过时，显示除草稿外的所有标签页
-    return allTabOptions.filter(tab => tab.name != "0");
-  }
-  return [];
-});
-
+// 数据类型：1-草稿，0-已发布，2-全部
 const dataType = computed(() => {
   if (!activeName.value) return 2;
   return activeName.value === "0" ? 1 : 0;
@@ -441,74 +453,102 @@ const newCoupon = () => {
   router.push(`/ticketManagement/newCoupon?type=add`);
 };
 // 跳转详情页 - 根据类型跳转不同页面
-const toDetail = row => {
-  if (activeName.value === "1") {
-    // 代金券跳转到代金券详情页
-    router.push(`/ticketManagement/detail?id=${row.id}`);
-  } else {
-    // 优惠券跳转到优惠券详情页
-    router.push(`/couponManagement/detail?id=${row.id}`);
-  }
+const toDetail = (row: any) => {
+  const path = isVoucher.value ? `/ticketManagement/detail?id=${row.id}` : `/ticketManagement/couponDetail?id=${row.id}`;
+  router.push(path);
 };
-const editRow = row => {
-  if (activeName.value === "1") {
-    // 代金券编辑
-    router.push(`/ticketManagement/newVoucher?id=${row.id}&type=edit`);
-  } else {
-    // 优惠券编辑
-    router.push(`/ticketManagement/newCoupon?id=${row.id}&type=edit`);
-  }
+// 编辑行数据
+const editRow = (row: any) => {
+  const path = isVoucher.value
+    ? `/ticketManagement/newVoucher?id=${row.id}&type=edit`
+    : `/ticketManagement/newCoupon?id=${row.id}&type=edit`;
+  router.push(path);
 };
-const deleteRow = row => {
+// 删除行数据
+const deleteRow = (row: any) => {
   ElMessageBox.confirm("确定要删除吗？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning"
-  }).then(() => {
-    const params = {
-      id: row.id,
-      groupType: localGet("businessSection")
-    };
-    delThaliById(params).then(() => {
+  })
+    .then(() => {
+      if (isVoucher.value) {
+        // 代金券删除逻辑
+        const params = {
+          id: row.id,
+          groupType: localGet("businessSection")
+        };
+        return delVoucherById(params);
+      } else {
+        // 优惠券删除逻辑
+        const params = {
+          id: row.id,
+          groupType: localGet("businessSection")
+        };
+        return delCouponById(params);
+      }
+    })
+    .then(() => {
       ElMessage.success("删除成功");
       proTable.value?.getTableList();
+    })
+    .catch(() => {
+      // 用户取消删除，不做任何操作
     });
-  });
 };
+// Tab切换处理
 const handleClick = () => {
-  // tab切换时刷新表格
   proTable.value?.getTableList();
 };
-const changeTypes = async (row, status) => {
-  rowData.value = row;
-  let res = await updateStatus({ id: row.id, status: status, approvalComments: "" });
-  if (res && res.code == 200) {
-    ElMessage.success("操作成功");
-    proTable.value?.getTableList();
+
+// 修改状态（上架/下架）
+const changeTypes = async (row: any, status: number) => {
+  if (isVoucher.value) {
+    // 代金券上架/下架逻辑
+    const res = await updateVoucherStatus({ id: row.id, status: status, approvalComments: "" });
+    if (res && res.code == 200) {
+      ElMessage.success("操作成功");
+      proTable.value?.getTableList();
+    }
+  } else {
+    // 优惠券上架/下架逻辑
+    const res = await updateCouponStatus({ id: row.id, status: status, approvalComments: "" });
+    if (res && res.code == 200) {
+      ElMessage.success("操作成功");
+      proTable.value?.getTableList();
+    }
   }
 };
+// 修改库存
 const changeInventory = (row: any) => {
-  formInventory.value.id = row.id;
-  formInventory.value.name = row.name;
-  formInventory.value.singleQty = row.singleQty;
-  formInventory.value.newInventory = "";
+  formInventory.value = {
+    id: row.id,
+    name: row.name,
+    singleQty: row.singleQty,
+    newInventory: ""
+  };
   dialogFormVisible.value = true;
 };
-// 弹窗提交
+
+// 提交修改库存
 const handleSubmit = async () => {
   if (!ruleFormRef.value) return;
-  await ruleFormRef.value.validate(async (valid, fields) => {
+  await ruleFormRef.value.validate(async valid => {
     if (valid) {
-      let res = await updateNum({ id: formInventory.value.id, singleQty: formInventory.value.newInventory });
+      const res = await updateNum({
+        id: formInventory.value.id,
+        singleQty: formInventory.value.newInventory
+      });
       if (res && res.code == 200) {
         ElMessage.success("修改成功");
-        dialogFormVisible.value = false;
+        closeDialog();
         proTable.value?.getTableList();
       }
     }
   });
 };
-// 关闭弹窗;
+
+// 关闭弹窗
 const closeDialog = () => {
   dialogFormVisible.value = false;
   formInventory.value = {

src/views/ticketManagement/newCoupon.vue

@@ -10,17 +10,17 @@
         <!-- 左侧内容区域 -->
         <div class="contentLeft">
           <!-- 优惠券名称 -->
-          <el-form-item label="优惠券名称" prop="couponName">
-            <el-input maxlength="50" v-model="couponModel.couponName" placeholder="请输入" clearable />
+          <el-form-item label="优惠券名称" prop="name">
+            <el-input maxlength="50" v-model="couponModel.name" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 面值 -->
-          <el-form-item label="面值(元)" prop="faceValue">
-            <el-input v-model="couponModel.faceValue" maxlength="15" placeholder="请输入" clearable />
+          <el-form-item label="面值(元)" prop="nominalValue">
+            <el-input v-model="couponModel.nominalValue" maxlength="15" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 开始领取时间 -->
-          <el-form-item label="开始领取时间" prop="startCollectionTime">
+          <el-form-item label="开始领取时间" prop="beginGetDate">
             <el-date-picker
-              v-model="couponModel.startCollectionTime"
+              v-model="couponModel.beginGetDate"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
               placeholder="请选择开始领取时间"
@@ -28,9 +28,9 @@
             />
           </el-form-item>
           <!-- 结束领取时间 -->
-          <el-form-item label="结束领取时间" prop="endCollectionTime">
+          <el-form-item label="结束领取时间" prop="endGetDate">
             <el-date-picker
-              v-model="couponModel.endCollectionTime"
+              v-model="couponModel.endGetDate"
               format="YYYY/MM/DD"
               value-format="YYYY-MM-DD"
               placeholder="请选择结束领取时间"
@@ -38,26 +38,27 @@
             />
           </el-form-item>
           <!-- 有效期 -->
-          <el-form-item label="有效期" prop="validityPeriod">
-            <el-input v-model="couponModel.validityPeriod" maxlength="15" placeholder="请输入" clearable />
+          <el-form-item label="有效期" prop="specifiedDay">
+            <el-input v-model="couponModel.specifiedDay" maxlength="15" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 库存 -->
-          <el-form-item label="库存" prop="inventory">
-            <el-input v-model="couponModel.inventory" maxlength="15" placeholder="请输入" clearable />
+          <el-form-item label="库存" prop="singleQty">
+            <el-input v-model="couponModel.singleQty" maxlength="15" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 用户领取规则 -->
-          <el-form-item label="用户领取规则" prop="collectionRule">
-            <el-radio-group v-model="couponModel.collectionRule" class="ml-4">
-              <el-radio :value="1"> 每日一领 </el-radio>
-              <el-radio :value="2"> 每周一领 </el-radio>
-              <el-radio :value="3"> 每月一领 </el-radio>
+          <el-form-item label="用户领取规则" prop="claimRule">
+            <el-radio-group v-model="couponModel.claimRule" class="ml-4">
+              <el-radio v-for="item in claimRuleOptions" :key="item.value" :value="item.value">
+                {{ item.label }}
+              </el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- 用户是否需要收藏店铺领取 -->
-          <el-form-item label="用户是否需要收藏店铺领取" prop="needFavoriteStore">
-            <el-radio-group v-model="couponModel.needFavoriteStore" class="ml-4">
-              <el-radio :value="1"> 是 </el-radio>
-              <el-radio :value="0"> 否 </el-radio>
+          <el-form-item label="用户是否需要收藏店铺领取" prop="attentionCanReceived">
+            <el-radio-group v-model="couponModel.attentionCanReceived" class="ml-4">
+              <el-radio v-for="item in yesNoOptions" :key="item.value" :value="item.value">
+                {{ item.label }}
+              </el-radio>
             </el-radio-group>
           </el-form-item>
         </div>
@@ -66,19 +67,20 @@
           <!-- 是否有低消 -->
           <el-form-item label="是否有低消" prop="hasMinimumSpend">
             <el-radio-group v-model="couponModel.hasMinimumSpend" class="ml-4">
-              <el-radio :value="1"> 是 </el-radio>
-              <el-radio :value="0"> 否 </el-radio>
+              <el-radio v-for="item in yesNoOptions" :key="item.value" :value="item.value">
+                {{ item.label }}
+              </el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- 最低消费金额 -->
-          <el-form-item label="最低消费金额" prop="minimumSpendAmount" v-if="couponModel.hasMinimumSpend === 1">
-            <el-input v-model="couponModel.minimumSpendAmount" maxlength="15" placeholder="请输入" clearable />
+          <el-form-item label="最低消费金额" prop="minimumSpendingAmount" v-if="couponModel.hasMinimumSpend === 1">
+            <el-input v-model="couponModel.minimumSpendingAmount" maxlength="15" placeholder="请输入" clearable />
           </el-form-item>
           <!-- 补充说明 -->
-          <el-form-item label="补充说明" prop="additionalNotes">
+          <el-form-item label="补充说明" prop="supplementaryInstruction">
             <el-input
               maxlength="300"
-              v-model="couponModel.additionalNotes"
+              v-model="couponModel.supplementaryInstruction"
               :rows="4"
               type="textarea"
               placeholder="请输入"
@@ -107,6 +109,7 @@ import { useRoute, useRouter } from "vue-router";
 import type { FormInstance } from "element-plus";
 import { getCouponDetail } from "@/api/modules/couponManagement";
 import { validatePositiveNumber, validatePositiveInteger, validateDateRange } from "@/utils/eleValidate";
+import { localGet } from "@/utils";
 // ==================== 响应式数据定义 ====================
 
 // 路由相关
@@ -118,20 +121,20 @@ const type = ref<string>(""); // 页面类型：add-新增, edit-编辑
 const id = ref<string>(""); // 页面ID参数
 // ==================== 表单验证规则 ====================
 const rules = reactive({
-  couponName: [{ required: true, message: "请输入优惠券名称" }],
-  faceValue: [
+  name: [{ required: true, message: "请输入优惠券名称" }],
+  nominalValue: [
     { required: true, message: "请输入面值" },
     {
       validator: validatePositiveNumber("面值必须为正数"),
       trigger: "blur"
     }
   ],
-  startCollectionTime: [
+  beginGetDate: [
     { required: true, message: "请选择开始领取时间" },
     {
       validator: validateDateRange(
-        () => couponModel.value.startCollectionTime,
-        () => couponModel.value.endCollectionTime,
+        () => couponModel.value.beginGetDate,
+        () => couponModel.value.endGetDate,
         "开始领取时间不能早于当前时间",
         "结束领取时间不能早于当前时间",
         "开始领取时间必须早于结束领取时间",
@@ -140,12 +143,12 @@ const rules = reactive({
       trigger: "change"
     }
   ],
-  endCollectionTime: [
+  endGetDate: [
     { required: true, message: "请选择结束领取时间" },
     {
       validator: validateDateRange(
-        () => couponModel.value.startCollectionTime,
-        () => couponModel.value.endCollectionTime,
+        () => couponModel.value.beginGetDate,
+        () => couponModel.value.endGetDate,
         "开始领取时间不能早于当前时间",
         "结束领取时间不能早于当前时间",
         "开始领取时间必须早于结束领取时间",
@@ -154,21 +157,21 @@ const rules = reactive({
       trigger: "change"
     }
   ],
-  validityPeriod: [
+  specifiedDay: [
     { required: true, message: "请输入有效期" },
     {
       validator: validatePositiveInteger("有效期必须为正整数", { required: false }),
       trigger: "blur"
     }
   ],
-  inventory: [
+  singleQty: [
     { required: true, message: "请输入库存" },
     {
       validator: validatePositiveInteger("库存必须为正整数", { required: false }),
       trigger: "blur"
     }
   ],
-  minimumSpendAmount: [
+  minimumSpendingAmount: [
     {
       validator: (rule: any, value: any, callback: any) => {
         if (couponModel.value.hasMinimumSpend === 1) {
@@ -186,30 +189,44 @@ const rules = reactive({
   ]
 });
 
+// ==================== 选项配置 ====================
+// 用户领取规则选项
+const claimRuleOptions = [
+  { label: "每日一领", value: "day" },
+  { label: "每周一领", value: "week" },
+  { label: "每月一领", value: "month" }
+];
+
+// 是/否选项
+const yesNoOptions = [
+  { label: "是", value: 1 },
+  { label: "否", value: 0 }
+];
+
 // ==================== 优惠券信息数据模型 ====================
 const couponModel = ref<any>({
   // 优惠券名称
-  couponName: "",
+  name: "",
   // 面值(元)
-  faceValue: "",
+  nominalValue: "",
   // 开始领取时间
-  startCollectionTime: "",
+  beginGetDate: "",
   // 结束领取时间
-  endCollectionTime: "",
+  endGetDate: "",
   // 有效期
-  validityPeriod: "",
+  specifiedDay: "",
   // 库存
-  inventory: "",
-  // 用户领取规则：1-每日一领，2-每周一领，3-每月一领
-  collectionRule: 1,
+  singleQty: "",
+  // 用户领取规则：day-每日一领，week-每周一领，month-每月一领
+  claimRule: "day",
   // 用户是否需要收藏店铺领取：1-是，0-否
-  needFavoriteStore: 1,
+  attentionCanReceived: 1,
   // 是否有低消：1-是，0-否
   hasMinimumSpend: 1,
   // 最低消费金额
-  minimumSpendAmount: "",
+  minimumSpendingAmount: "",
   // 补充说明
-  additionalNotes: ""
+  supplementaryInstruction: ""
 });
 
 // ==================== 监听器 ====================
@@ -219,11 +236,11 @@ const couponModel = ref<any>({
  * 当开始时间改变时，重新验证结束时间
  */
 watch(
-  () => couponModel.value.startCollectionTime,
+  () => couponModel.value.beginGetDate,
   () => {
-    if (couponModel.value.endCollectionTime) {
+    if (couponModel.value.endGetDate) {
       nextTick(() => {
-        ruleFormRef.value?.validateField("endCollectionTime");
+        ruleFormRef.value?.validateField("endGetDate");
       });
     }
   }
@@ -234,11 +251,11 @@ watch(
  * 当结束时间改变时，重新验证开始时间
  */
 watch(
-  () => couponModel.value.endCollectionTime,
+  () => couponModel.value.endGetDate,
   () => {
-    if (couponModel.value.startCollectionTime) {
+    if (couponModel.value.beginGetDate) {
       nextTick(() => {
-        ruleFormRef.value?.validateField("startCollectionTime");
+        ruleFormRef.value?.validateField("beginGetDate");
       });
     }
   }
@@ -252,9 +269,9 @@ watch(
   () => couponModel.value.hasMinimumSpend,
   newVal => {
     if (newVal === 0) {
-      couponModel.value.minimumSpendAmount = "";
+      couponModel.value.minimumSpendingAmount = "";
       nextTick(() => {
-        ruleFormRef.value?.clearValidate("minimumSpendAmount");
+        ruleFormRef.value?.clearValidate("minimumSpendingAmount");
       });
     }
   }
@@ -294,7 +311,9 @@ const handleSubmit = (submitType?: string) => {
 
     // 组装提交参数
     let params: any = { ...couponModel.value };
-
+    params.storeId = localGet("createdId");
+    params.status = 3;
+    params.couponId = "couponId";
     console.log("提交参数:", params);
 
     // TODO: 调用API保存数据
@@ -335,8 +354,8 @@ const disabledEndDate = (time: Date) => {
   if (time.getTime() < today.getTime()) {
     return true;
   }
-  if (couponModel.value.startCollectionTime) {
-    const startDate = new Date(couponModel.value.startCollectionTime);
+  if (couponModel.value.beginGetDate) {
+    const startDate = new Date(couponModel.value.beginGetDate);
     startDate.setHours(0, 0, 0, 0);
     return time.getTime() <= startDate.getTime();
   }