From 6cc879f06631c53ed59c2c3ead3539271d779da6 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 12 Sep 2025 17:09:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E8=B6=85=E7=BA=A7=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=EF=BC=8C=E8=B6=85=E7=BA=A7=E4=BC=9A=E5=91=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/market/coupon.ts                      |  14 ++
 src/views/marketing_center/list.vue           | 139 ++++++++++++------
 .../super_vip/components/coup-lists.vue       |  54 +++++--
 .../super_vip/components/dialog-plans.vue     |  20 +--
 .../marketing_center/super_vip/index.vue      |  31 ++--
 5 files changed, 179 insertions(+), 79 deletions(-)
 create mode 100644 src/api/market/coupon.ts

diff --git a/src/api/market/coupon.ts b/src/api/market/coupon.ts
new file mode 100644
index 0000000..b8b3ba1
--- /dev/null
+++ b/src/api/market/coupon.ts
@@ -0,0 +1,14 @@
+import request from "@/utils/request";
+import { Market_BaseUrl } from "@/api/config";
+const baseURL = Market_BaseUrl + "/admin/coupon";
+const API = {
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params
+    });
+  },
+}
+export default API;
+
diff --git a/src/views/marketing_center/list.vue b/src/views/marketing_center/list.vue
index 1ffac30..9dca1cd 100644
--- a/src/views/marketing_center/list.vue
+++ b/src/views/marketing_center/list.vue
@@ -22,74 +22,121 @@
 </template>
 
 <script setup>
-import defaultIcon from '@/assets/logo.png';
-import { ElMessage } from 'element-plus'
+import defaultIcon from "@/assets/logo.png";
+import { ElMessage } from "element-plus";
 
 const router = useRouter();
 const to = (item) => {
   if (!item.pathName) {
-    ElMessage.warning('暂未开放')
+    ElMessage.warning("暂未开放");
     return;
   }
   router.push({
-    name: item.pathName
+    name: item.pathName,
   });
 };
 const menus = ref([
   {
-    label: '营销',
+    label: "营销",
     list: [
-      { name: "霸王餐", icon: 'bwc', pathName: "bwc", intro: '设置充值消费的N倍，当前订单立即免单' },
-      { name: "邀请列表", icon: 'yqlb', pathName: "invite", intro: '邀请好友领券' },
-      { name: "积分锁客", icon: 'jfsk', pathName: "points", intro: '设置充值消费的N倍，当前订单立即免单' },
-      { name: "充值活动", icon: 'czhd', pathName: "", intro: '允许客户充值并使用余额支付' },
-      { name: "弹窗广告", icon: 'tcgg', pathName: "", intro: '设置弹窗广告' },
-      { name: "超级会员", icon: 'cjhy', pathName: "", intro: '用户会员管理设置' },
-      { name: "新客立减", icon: 'xklj', pathName: "", intro: '首单下单减免金额' },
-      { name: "智慧充值", icon: 'zhcz', pathName: "", intro: '允许客户充值并使用余额支付' },
-      { name: "分销", icon: 'zhcz', pathName: "", intro: '允许客户充值并使用余额支付' },
-      { name: "消费返现", icon: 'xffx', pathName: "", intro: '用户下单后返现一定的金额到余额，可促进复购' },
-      { name: "私域引流", icon: 'syyl', pathName: "", intro: '可设置用户下单成功后的群二维码' },
-      { name: "满减活动", icon: 'mjhd', pathName: "", intro: '达到指定支付金额享受减价' },
-      { name: "生日有礼", icon: 'sryl', pathName: "", intro: '用户生日管理设置' },
-      { name: "点餐智能推荐", icon: 'dczntj', pathName: "", intro: '进入点单页X秒未点自动推荐商品，此推荐设置启用即生效' },
-      { name: "超值券包", icon: 'czqb', pathName: "", intro: '下单加购' },
-      { name: "套餐推广", icon: 'tctg', pathName: "", intro: '下单通过用户邀请好友减免金额的方式裂变宣传套餐加购' },
-      { name: "充值兑换码", icon: 'czdhm', pathName: "", intro: '兑换码直充余额，可当作礼品赠送' },
-      { name: "券兑换码", icon: 'qdhm', pathName: "", intro: '可添加多券组合兑换' },
-      { name: "限时折扣", icon: 'xszk', pathName: "", intro: '批量设置商品折扣' },
-      { name: "商品拼团", icon: 'sppt', pathName: "", intro: '拼团' },
-    ]
+      {
+        name: "霸王餐",
+        icon: "bwc",
+        pathName: "bwc",
+        intro: "设置充值消费的N倍，当前订单立即免单",
+      },
+      { name: "邀请列表", icon: "yqlb", pathName: "invite", intro: "邀请好友领券" },
+      {
+        name: "积分锁客",
+        icon: "jfsk",
+        pathName: "points",
+        intro: "设置充值消费的N倍，当前订单立即免单",
+      },
+      { name: "充值活动", icon: "czhd", pathName: "", intro: "允许客户充值并使用余额支付" },
+      { name: "弹窗广告", icon: "tcgg", pathName: "", intro: "设置弹窗广告" },
+      { name: "超级会员", icon: "cjhy", pathName: "superVip", intro: "用户会员管理设置" },
+      { name: "新客立减", icon: "xklj", pathName: "", intro: "首单下单减免金额" },
+      { name: "智慧充值", icon: "zhcz", pathName: "", intro: "允许客户充值并使用余额支付" },
+      { name: "分销", icon: "zhcz", pathName: "", intro: "允许客户充值并使用余额支付" },
+      {
+        name: "消费返现",
+        icon: "xffx",
+        pathName: "",
+        intro: "用户下单后返现一定的金额到余额，可促进复购",
+      },
+      { name: "私域引流", icon: "syyl", pathName: "", intro: "可设置用户下单成功后的群二维码" },
+      { name: "满减活动", icon: "mjhd", pathName: "", intro: "达到指定支付金额享受减价" },
+      { name: "生日有礼", icon: "sryl", pathName: "", intro: "用户生日管理设置" },
+      {
+        name: "点餐智能推荐",
+        icon: "dczntj",
+        pathName: "",
+        intro: "进入点单页X秒未点自动推荐商品，此推荐设置启用即生效",
+      },
+      { name: "超值券包", icon: "czqb", pathName: "", intro: "下单加购" },
+      {
+        name: "套餐推广",
+        icon: "tctg",
+        pathName: "",
+        intro: "下单通过用户邀请好友减免金额的方式裂变宣传套餐加购",
+      },
+      { name: "充值兑换码", icon: "czdhm", pathName: "", intro: "兑换码直充余额，可当作礼品赠送" },
+      { name: "券兑换码", icon: "qdhm", pathName: "", intro: "可添加多券组合兑换" },
+      { name: "限时折扣", icon: "xszk", pathName: "", intro: "批量设置商品折扣" },
+      { name: "商品拼团", icon: "sppt", pathName: "", intro: "拼团" },
+    ],
   },
   {
-    label: '优惠券',
+    label: "优惠券",
     list: [
-      { name: "满减券", icon: 'mjq', pathName: "coupon", intro: '用户满足指定金额后，可使用优惠券立减相应金额，如：设置满100-50券，符合要求的订单满100元后，立减50元。' },
-      { name: "商品兑换券", icon: 'spdhq', pathName: "bwc", intro: '设置可兑换成商品的券' },
-      { name: "折扣券", icon: 'zkq', pathName: "", intro: '下单享折扣但折扣的金额将在券中抵扣。' },
-      { name: "第二件半价券", icon: 'dejbjq', pathName: "", intro: '设置第二件半价券' },
-      { name: "消费赠券", icon: 'xfzq', pathName: "consume_ticket", intro: '达到指定消费金额赠送优惠券' },
-      { name: "买一送一券", icon: 'myzy', pathName: "", intro: '针对营销活动买一送一设置券品' },
-      { name: "固定价格券", icon: 'gdjkq', pathName: "", intro: '设置该券后，允许用户以固定价格兑换指定商品，如：设置一个固定价格9.9的券，商品20元，用户使用券后只需要9.9元兑换该商品。' },
-      { name: "免配送费券", icon: 'mfpsq', pathName: "", intro: '可设置一张免除订单配送费的券' },
-    ]
+      {
+        name: "满减券",
+        icon: "mjq",
+        pathName: "coupon",
+        intro:
+          "用户满足指定金额后，可使用优惠券立减相应金额，如：设置满100-50券，符合要求的订单满100元后，立减50元。",
+      },
+      { name: "商品兑换券", icon: "spdhq", pathName: "bwc", intro: "设置可兑换成商品的券" },
+      { name: "折扣券", icon: "zkq", pathName: "", intro: "下单享折扣但折扣的金额将在券中抵扣。" },
+      { name: "第二件半价券", icon: "dejbjq", pathName: "", intro: "设置第二件半价券" },
+      {
+        name: "消费赠券",
+        icon: "xfzq",
+        pathName: "consume_ticket",
+        intro: "达到指定消费金额赠送优惠券",
+      },
+      { name: "买一送一券", icon: "myzy", pathName: "", intro: "针对营销活动买一送一设置券品" },
+      {
+        name: "固定价格券",
+        icon: "gdjkq",
+        pathName: "",
+        intro:
+          "设置该券后，允许用户以固定价格兑换指定商品，如：设置一个固定价格9.9的券，商品20元，用户使用券后只需要9.9元兑换该商品。",
+      },
+      { name: "免配送费券", icon: "mfpsq", pathName: "", intro: "可设置一张免除订单配送费的券" },
+    ],
   },
   {
-    label: '推送功能',
+    label: "推送功能",
     list: [
-      { name: "推送活动消息", icon: 'tshdxx', pathName: "", intro: '给用户推送服务通知' },
-      { name: "短信推送", icon: 'dxts', pathName: "", intro: '给用户推送服务通知' },
-    ]
+      { name: "推送活动消息", icon: "tshdxx", pathName: "", intro: "给用户推送服务通知" },
+      { name: "短信推送", icon: "dxts", pathName: "", intro: "给用户推送服务通知" },
+    ],
   },
   {
-    label: '扩展功能',
+    label: "扩展功能",
     list: [
-      { name: "微信公众号", icon: 'wxgzh', pathName: "", intro: '授权微信公众号后，让你能够在后台查看和维护公众号的粉丝；同时你的店铺也有出现关注公众号的入口。' },
-    ]
-  }
+      {
+        name: "微信公众号",
+        icon: "wxgzh",
+        pathName: "",
+        intro:
+          "授权微信公众号后，让你能够在后台查看和维护公众号的粉丝；同时你的店铺也有出现关注公众号的入口。",
+      },
+    ],
+  },
 ]);
 
-
 // 动态获取PNG图标路径
 const getIconPath = (iconName) => {
   try {
@@ -132,7 +179,7 @@ const handleImageError = (item) => {
           display: flex;
           align-items: center;
           padding: 10px;
-          background-color: #F8F8F8;
+          background-color: #f8f8f8;
           border-radius: 4px;
           transition: all 0.1s ease-in-out;
 
diff --git a/src/views/marketing_center/super_vip/components/coup-lists.vue b/src/views/marketing_center/super_vip/components/coup-lists.vue
index cf1dbea..1a6e156 100644
--- a/src/views/marketing_center/super_vip/components/coup-lists.vue
+++ b/src/views/marketing_center/super_vip/components/coup-lists.vue
@@ -1,11 +1,15 @@
 <template>
   <div>
     <div v-for="(item, index) in modelValue" :key="index" class="flex gap-4 mb-2">
-      <el-select v-model="item.coupon.id" placeholder="请选择优惠券">
+      <el-select
+        v-model="item.coupon.id"
+        placeholder="请选择优惠券"
+        @change="changeCoupon($event, index)"
+      >
         <el-option
           v-for="coupon in couponList"
           :key="coupon.id"
-          :label="coupon.name"
+          :label="coupon.title"
           :value="coupon.id"
         />
       </el-select>
@@ -23,27 +27,39 @@
         </el-link>
       </div>
     </div>
-    <div class="flex gap-1 cursor-pointer" @click="addCoupon()">
-      <el-icon color="#3F9EFF">
-        <CirclePlus />
-      </el-icon>
-      <el-link :underline="false" type="primary" class="no-wrap">新增券</el-link>
+    <div class="flex">
+      <div class="flex gap-1 cursor-pointer" @click="addCoupon()">
+        <el-icon color="#3F9EFF">
+          <CirclePlus />
+        </el-icon>
+        <el-link :underline="false" type="primary" class="no-wrap">新增券</el-link>
+      </div>
     </div>
   </div>
 </template>
 <script setup>
-import { ref, reactive } from "vue";
+import couponApi from "@/api/market/coupon";
+
+import { ref, reactive, onMounted } from "vue";
 const modelValue = defineModel({
   type: Array,
   default: () => [],
 });
 
 // 优惠券列表
-const couponList = ref([
-  { id: 1, name: "满100减10" },
-  { id: 2, name: "满200减30" },
-]);
+const couponList = ref([]);
 function addCoupon() {
+  if (!modelValue.value) {
+    modelValue.value = [
+      {
+        num: 1,
+        coupon: {
+          id: null,
+        },
+      },
+    ];
+    return;
+  }
   modelValue.value.push({
     num: 1,
     coupon: {
@@ -52,4 +68,18 @@ function addCoupon() {
   });
   console.log(modelValue.value);
 }
+
+onMounted(() => {
+  couponApi.getList({ size: 999 }).then((res) => {
+    if (res) {
+      couponList.value = res.records || [];
+    }
+  });
+});
+
+function changeCoupon(e, index) {
+  const coupon = couponList.value.find((item) => item.id === e);
+  console.log(coupon);
+  modelValue.value[index].coupon = coupon;
+}
 </script>
\ No newline at end of file
diff --git a/src/views/marketing_center/super_vip/components/dialog-plans.vue b/src/views/marketing_center/super_vip/components/dialog-plans.vue
index 4e54948..3a1cd0f 100644
--- a/src/views/marketing_center/super_vip/components/dialog-plans.vue
+++ b/src/views/marketing_center/super_vip/components/dialog-plans.vue
@@ -12,15 +12,7 @@
           <el-input v-model="form.reward" placeholder="开通后立刻获得经验" type="number" />
         </el-form-item>
         <el-form-item label="赠送优惠券">
-          <div>
-            <div></div>
-            <div class="flex gap-1">
-              <el-icon color="#3F9EFF">
-                <CirclePlus />
-              </el-icon>
-              <el-text type="primary">新增券</el-text>
-            </div>
-          </div>
+          <CouponLists v-model="form.couponList" />
         </el-form-item>
         <el-form-item label="周期时间" required>
           <div class="flex">
@@ -48,7 +40,9 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import CouponLists from "./coup-lists.vue";
+
+import { ref, toRaw } from "vue";
 import { ElMessage } from "element-plus";
 // 控制主弹窗显示
 const show = ref(false);
@@ -123,6 +117,11 @@ function submit() {
     ElMessage.error("请选择会员周期");
     return;
   }
+  const ispass = form.value.couponList.every((item) => item.num && item.coupon.id);
+  if (!ispass) {
+    ElMessage.error("请选择优惠券并输入数量");
+    return;
+  }
   console.log("提交表单数据：", form.value);
   emits("submitSuccess", form.value, dataIndex);
   // 在此处可以添加表单提交逻辑，例如调用 API
@@ -132,6 +131,7 @@ function submit() {
 let isedit = ref(false);
 let dataIndex = null;
 function open(data, index) {
+  data = toRaw(data);
   console.log("data", data);
   console.log("index", index);
   if (data) {
diff --git a/src/views/marketing_center/super_vip/index.vue b/src/views/marketing_center/super_vip/index.vue
index 923e605..ae6b15d 100644
--- a/src/views/marketing_center/super_vip/index.vue
+++ b/src/views/marketing_center/super_vip/index.vue
@@ -213,8 +213,9 @@
                 <el-form-item label="等级说明">
                   <el-input
                     v-model="level.remark"
+                    style="width: 400px"
+                    :autosize="{ minRows: 4, maxRows: 5 }"
                     type="textarea"
-                    maxlength="250"
                     placeholder="请输入等级说明，最多 250 字"
                   />
                 </el-form-item>
@@ -352,7 +353,7 @@ function submitSuccess(plans, index) {
   if (!basicForm.configList) {
     basicForm.configList = [];
   }
-  if (index) {
+  if (index !== null && index !== undefined) {
     basicForm.configList[index] = plans;
     return;
   }
@@ -398,7 +399,6 @@ function addLevel() {
   }
 
   const newLevel = {
-    id: 0,
     name,
     experienceValue: 0,
     discount: 1,
@@ -425,18 +425,22 @@ function editLevel(level) {
 async function removeLevel(index) {
   const item = levels.value[index];
   const { id } = item;
+  if (!id) {
+    // 本地删除
+    levels.value.splice(index, 1);
+    const newLevel = levels.value[index - 1];
+    selectedLevel.value = newLevel;
+    activeLevelId.value = index - 1;
+    ElMessage.success("删除成功");
+    return;
+  }
   ElMessageBox.confirm("确定要删除吗？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   }).then(async () => {
-    if (id) {
-      const res = await memberApi.levelDel({ id: id });
-      if (res) {
-        levels.value.splice(index, 1);
-        ElMessage.success("删除成功");
-      }
-    } else {
+    const res = await memberApi.levelDel({ id: id });
+    if (res) {
       levels.value.splice(index, 1);
       ElMessage.success("删除成功");
     }
@@ -448,6 +452,11 @@ async function removeLevel(index) {
 }
 // 保存会员等级
 async function saveLevel(level) {
+  const isPass = level.cycleRewardCouponList.every((item) => item.num && item.coupon.id);
+  if (!isPass) {
+    ElMessage.error("请选择优惠券并输入数量");
+    return;
+  }
   const res = level.id ? await memberApi.levelEdit(level) : await memberApi.levelAdd(level);
   if (res) {
     ElMessage.success("保存成功");
@@ -502,7 +511,7 @@ onMounted(() => {
 //计算总优惠券数量
 function totalCount(arr) {
   return arr.reduce((total, item) => {
-    return total + item.num;
+    return total + item.num * 1;
   }, 0);
 }
 //返回