From eb017244d3b158e71470ee5d543d978d23990687 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Tue, 10 Nov 2026 15:55:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(promotion):=20=E6=96=B0=E5=A2=9E=E6=BB=A1?=
 =?UTF-8?q?=E6=8A=98=E6=BB=A1=E8=B5=A0=E6=B4=BB=E5=8A=A8=E5=8F=8A=E9=98=B6?=
 =?UTF-8?q?=E6=A2=AF=E4=BC=98=E6=83=A0=E8=A7=84=E5=88=99=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 满额活动列表页支持满减、满折、满赠三种类型筛选与标签展示
- 新增阶梯优惠规则列，按活动类型格式化展示各级优惠详情
- 活动详情页支持1至3级阶梯优惠配置及满赠赠品选择
- 页面装修组件增加满折、满赠活动类型标签展示
- 隐藏"添加活动优惠券"按钮入口
- 优化活动类型、状态、时间等表格列宽与样式
---
 im/MIGRATION-VUE3.md                          |  42 -
 .../lili-dialog/template/marketing.vue        |  34 +-
 manager/src/libs/util.js                      |   9 +
 .../shrinkable-menu/shrinkable-menu.vue       |  18 +
 .../views/page-decoration/wap/decorate.vue    |   8 +-
 .../full-discount/full-discount-detail.vue    | 175 ++--
 .../full-discount/full-discount.vue           | 132 ++-
 .../promotions/full-discount/full-gift.vue    |  14 +
 .../promotions/full-discount/full-rate.vue    |  14 +
 manager/src/views/statistics/marketing.vue    |   6 +-
 seller/scripts/test-seller-navigation.mjs     |  13 +
 seller/src/libs/seller-navigation.js          |  27 +-
 seller/src/libs/util.js                       |   9 +
 seller/src/views/Main.vue                     |  13 +-
 .../shrinkable-menu/shrinkable-menu.vue       |   2 +-
 seller/src/views/promotion/coupon/coupon.vue  |   2 +-
 .../full-discount/full-discount-add.vue       | 971 +++++++++++-------
 .../promotion/full-discount/full-discount.vue | 150 ++-
 .../promotion/full-discount/full-gift.vue     |  14 +
 .../promotion/full-discount/full-rate.vue     |  14 +
 seller/src/views/shop/wap/decorate.vue        |   8 +-
 21 files changed, 1135 insertions(+), 540 deletions(-)
 delete mode 100644 im/MIGRATION-VUE3.md
 create mode 100644 manager/src/views/promotions/full-discount/full-gift.vue
 create mode 100644 manager/src/views/promotions/full-discount/full-rate.vue
 create mode 100644 seller/src/views/promotion/full-discount/full-gift.vue
 create mode 100644 seller/src/views/promotion/full-discount/full-rate.vue

diff --git a/im/MIGRATION-VUE3.md b/im/MIGRATION-VUE3.md
deleted file mode 100644
index 665233812..000000000
--- a/im/MIGRATION-VUE3.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# IM 客服端 Vue 3 迁移说明
-
-## 技术栈
-
-- Vue 3.5 + Vue Router 4 + Pinia 4
-- Element Plus（替代 element-ui）
-- 自研右键菜单 `src/plugins/contextmenu.js`（替代 vue-contextmenujs）
-- `vue-virtual-scroller@3`、`vue-cropper@1.x`、`vue-prism-editor@2.0.0-alpha.2`
-
-## 组合式 API 迁移（2026-10 完成）
-
-全部 53 个 `.vue` 组件已从 Options API 转换为 `<script setup>`，并完成 vuex → pinia：
-
-- **状态管理**：`src/stores/` 下 8 个 store（app/user/talk/notify/settings/emoticon/dialogue/note），对应原 vuex 根 state + 7 个模块；mutation 全部转为同名 SCREAMING_CASE action。原 `src/store/` 已删除。
-- **全局 mixin 保留**：`main.js` 的 `app.mixin(MainMixin)` 依然生效（对 `<script setup>` 组件同样注入），mixin 内部已改用 pinia。**注意**：mixin 经 `this` 回调组件成员时，`<script setup>` 的绑定不会出现在公共实例上——`views/message/index.vue` 采用了 ctx 桥接（`Object.defineProperties(instance.ctx, ...)`）方案，后续若有组件被全局 mixin 回调需用同样方案。
-- **socket 事件层**（`im-server/event/*`、`plugins/ws-socket.js`、`utils/talk.js` 等纯 JS）：vuex 引用全部改为函数内部 `useXxxStore()`。
-- **$user() 名片弹层**（`components/user/user-card/index.js`）：独立子 app 改用独立 `createPinia()`。
-- **app-bridge.js**：保留了 `$store.state.talks.items` 兼容门面（惰性 getter），供旧调用形态使用。
-
-## 启动
-
-```bash
-cd im
-yarn install
-yarn dev    # 端口 8000
-yarn build
-```
-
-## 迁移要点
-
-1. **入口** `src/main.js` — `createApp`，全局过滤器 `$filters`
-2. **路由** `createRouter` + `createWebHistory`，404 路由 `/:pathMatch(.*)*`
-3. **通知** `im-server/event/talk.js` 通过 `app-bridge` 发 `ElNotification`，避免循环引用
-4. **用户卡片** `$user()` 插件用 `createApp` 挂载
-5. **指令** `v-focus` / `v-paste` / `v-drag` / `v-outside` 已改为 Vue 3 钩子
-6. **SVG** `svg-sprite-loader` + `svg-icon` 全局组件
-7. **生命周期** `destroyed` → `beforeUnmount`；`$set` / `$delete` 已移除
-
-## 上线前检查
-
-统一清单见仓库根目录：[../MIGRATION-VUE3.md](../MIGRATION-VUE3.md)  
-IM 专项见该文档 **「IM 客服端」** 一节。
diff --git a/manager/src/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue
index 27456ee7e..285977238 100644
--- a/manager/src/components/lili-dialog/template/marketing.vue
+++ b/manager/src/components/lili-dialog/template/marketing.vue
@@ -1,8 +1,13 @@
+<!--
+  楼层装修链接选择器-营销活动选择面板（满额活动拆分为满减、满折、满赠三项）
+  @author Bulbasaur
+  @since 2026-11-09
+-->
 <template>
   <div class="wrapper">
     <div class="list">
       <div
-        v-for="(item, index) in Object.keys(promotionList)"
+        v-for="(item, index) in promotionKeys"
         :key="index"
         class="list-item"
         :class="{ active: selectedIndex == index }"
@@ -76,7 +81,7 @@ const emit = defineEmits(["selected"]);
 
 const totals = ref("");
 const loading = ref(true);
-const promotionList = ref("");
+const promotionList = ref({});
 const selectedIndex = ref(0);
 const promotions = ref("");
 const index = ref(999);
@@ -86,6 +91,12 @@ const params = ref({
 });
 const showPromotionList = ref([]);
 
+const promotionKeys = computed(() => {
+  return Object.keys(promotionList.value || {}).filter(
+    (k) => k !== "FULL_DISCOUNT" && Boolean(typeOption(k).title)
+  );
+});
+
 const isSeckillMode = computed(() => {
   return promotions.value === "SECKILL";
 });
@@ -106,12 +117,18 @@ function seckillStatusText(v) {
 }
 function sortGoods(type) {
   loading.value = false;
-  showPromotionList.value = promotionList.value[type];
+  showPromotionList.value = promotionList.value[type] || [];
 }
 function typeOption(type) {
   switch (type) {
+    case "FULL_MINUS":
+      return { title: "满减活动", methodsed: () => { showPromotionList.value = []; sortGoods("FULL_MINUS"); } };
+    case "FULL_RATE":
+      return { title: "满折活动", methodsed: () => { showPromotionList.value = []; sortGoods("FULL_RATE"); } };
+    case "FULL_GIFT":
+      return { title: "满赠活动", methodsed: () => { showPromotionList.value = []; sortGoods("FULL_GIFT"); } };
     case "FULL_DISCOUNT":
-      return { title: "满减", methodsed: () => { showPromotionList.value = []; sortGoods("FULL_DISCOUNT"); } };
+      return { title: "满减活动", methodsed: () => { showPromotionList.value = []; sortGoods("FULL_DISCOUNT"); } };
     case "PINTUAN":
       return { title: "拼团", methodsed: () => { showPromotionList.value = []; sortGoods("PINTUAN"); } };
     case "KANJIA":
@@ -143,15 +160,18 @@ function getPromotion(res) {
   if (res.result) {
     promotionList.value = res.result;
     delete promotionList.value.COUPON;
-    Object.keys(res.result)[0] && typeOption(Object.keys(res.result)[0]).methodsed();
-    promotions.value = Object.keys(res.result)[0];
+    const keys = promotionKeys.value;
+    if (keys.length) {
+      promotions.value = keys[0];
+      typeOption(keys[0]) && typeOption(keys[0]).methodsed();
+    }
   }
 }
 function clickPromotion(val, i) {
   promotions.value = val;
   selectedIndex.value = i;
   params.value.pageNumber = 1;
-  typeOption(val) && typeOption(val).methodsed(promotionList.value[val].id);
+  typeOption(val) && typeOption(val).methodsed(promotionList.value[val]?.id);
 }
 
 onMounted(() => {
diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index e8794b5a6..074bf694f 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -408,6 +408,15 @@ util.initRouterNode = function(routers, data) {
     }
     const menu = Object.assign({}, item);
     const hasChildren = item.children && item.children.length > 0;
+    if (
+      !hasChildren &&
+      (menu.frontRoute === "promotions/full-discount/full-discount" ||
+        menu.name === "full-discount" ||
+        menu.name === "full-cut-activity") &&
+      menu.title === "满额活动"
+    ) {
+      menu.title = "满减活动";
+    }
 
     if (hasChildren) {
       menu.children = [];
diff --git a/manager/src/views/main-parts/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-parts/shrinkable-menu/shrinkable-menu.vue
index cfdf260ed..d2c63913e 100644
--- a/manager/src/views/main-parts/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-parts/shrinkable-menu/shrinkable-menu.vue
@@ -49,6 +49,24 @@ const menuList = computed(() => appStore.menuList);
 const navList = computed(() => appStore.navList);
 const currNav = computed(() => appStore.currNav);
 const activeMenuName = computed(() => {
+  if (route.name === "full-discount-detail") {
+    const type = route.query?.activityType;
+    const candidates =
+      type === "FULL_GIFT"
+        ? ["manager-full-gift", "full-gift", "full-discount", "full-cut-activity"]
+        : type === "FULL_RATE"
+        ? ["manager-full-rate", "full-rate", "full-discount", "full-cut-activity"]
+        : ["full-discount", "full-cut-activity"];
+    for (const candidate of candidates) {
+      for (const item of menuList.value) {
+        for (const menu of item.children || []) {
+          if (menu.name === candidate || menu.path === candidate) {
+            return menu.name;
+          }
+        }
+      }
+    }
+  }
   const routePath = util.normalizeRoutePath(route.path);
   for (const item of menuList.value) {
     for (const menu of item.children || []) {
diff --git a/manager/src/views/page-decoration/wap/decorate.vue b/manager/src/views/page-decoration/wap/decorate.vue
index b1049d1c1..b56e1c3fb 100644
--- a/manager/src/views/page-decoration/wap/decorate.vue
+++ b/manager/src/views/page-decoration/wap/decorate.vue
@@ -433,9 +433,15 @@
                 <!-- 当选择完活动之后的其他回调 -->
                 <span v-if="item.url.___type == 'marketing'">
                   <span v-if="item.url.___promotion == 'SECKILL'"> 秒杀 </span>
-                  <span v-if="item.url.___promotion == 'FULL_DISCOUNT'">
+                  <span v-if="item.url.___promotion == 'FULL_DISCOUNT' || item.url.___promotion == 'FULL_MINUS'">
                     满减
                   </span>
+                  <span v-if="item.url.___promotion == 'FULL_RATE'">
+                    满折
+                  </span>
+                  <span v-if="item.url.___promotion == 'FULL_GIFT'">
+                    满赠
+                  </span>
                   <span v-if="item.url.___promotion == 'PINTUAN'"> 拼团 </span>
                   {{ item.url.title || item.url.goodsName }}</span>
                 <!-- 当选择完活动之后的其他回调 -->
diff --git a/manager/src/views/promotions/full-discount/full-discount-detail.vue b/manager/src/views/promotions/full-discount/full-discount-detail.vue
index f912f9003..ac4b6d48f 100644
--- a/manager/src/views/promotions/full-discount/full-discount-detail.vue
+++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue
@@ -1,3 +1,8 @@
+<!--
+  管理端-满减/满折/满赠活动详情只读视图（适配 1~3 级阶梯及满赠多赠品展示）
+  @author Bulbasaur
+  @since 2026-11-09
+-->
 <template>
   <div class="full-discount-detail-page">
     <!-- 顶部标题与返回栏 -->
@@ -5,7 +10,7 @@
       <div class="page-header-row">
         <div class="header-left">
           <div class="header-title">
-            <span>满优惠活动详情</span>
+            <span>{{ activityTypeTitle }}详情</span>
             <el-tag type="info" size="small" effect="plain" class="mode-tag">
               只读模式
             </el-tag>
@@ -30,13 +35,17 @@
           <span class="font-semibold text-dark">{{ form.promotionName || "-" }}</span>
         </el-descriptions-item>
 
+        <el-descriptions-item label="活动类型">
+          <el-tag size="small" :type="activityTagType">{{ activityTypeTitle }}</el-tag>
+        </el-descriptions-item>
+
         <el-descriptions-item label="活动范围">
           <el-tag size="small" effect="light" :type="form.scopeType === 'ALL' ? 'success' : 'primary'">
             {{ form.scopeType === "ALL" ? "全品类通用" : "指定商品适用" }}
           </el-tag>
         </el-descriptions-item>
 
-        <el-descriptions-item label="活动时间" :span="2">
+        <el-descriptions-item label="活动时间">
           <span class="font-mono text-dark">
             {{ form.startTime || "-" }} 至 {{ form.endTime || "-" }}
           </span>
@@ -48,67 +57,50 @@
       </el-descriptions>
     </el-card>
 
-    <!-- 优惠规则与赠品权益卡片 -->
+    <!-- 阶梯优惠规则卡片 -->
     <el-card shadow="never" class="info-card mt_10">
       <div class="section-header">
         <span class="section-indicator"></span>
-        <span class="section-title">优惠规则与权益</span>
+        <span class="section-title">阶梯优惠规则</span>
+        <span class="section-badge">共 {{ (form.ruleList || []).length }} 级阶梯（仅生效满足的最高一级）</span>
       </div>
 
-      <el-descriptions :column="2" border class="custom-descriptions">
-        <el-descriptions-item label="优惠门槛">
+      <el-descriptions :column="1" border class="custom-descriptions">
+        <el-descriptions-item
+          v-for="(tier, idx) in form.ruleList || []"
+          :key="idx"
+          :label="`第 ${idx + 1} 级阶梯`"
+        >
           <span class="money-highlight font-mono font-semibold">
-            满 ¥ {{ Number(form.fullMoney || 0).toFixed(2) }}
+            满 ¥ {{ Number(tier.fullMoney || 0).toFixed(2) }}
           </span>
-          <span class="text-secondary ml_10" style="font-size: 12px">（达到当前金额可享优惠）</span>
-        </el-descriptions-item>
-
-        <el-descriptions-item label="优惠形式">
-          <template v-if="form.discountType === 'fullMinusFlag'">
-            <el-tag size="small" effect="light" type="danger">减现金</el-tag>
+          <template v-if="form.activityType === 'FULL_MINUS'">
+            <el-tag size="small" effect="light" type="danger" class="ml_10">减现金</el-tag>
             <span class="money-highlight font-mono font-semibold ml_10">
-              减 ¥ {{ Number(form.fullMinus || 0).toFixed(2) }}
+              立减 ¥ {{ Number(tier.fullMinus || 0).toFixed(2) }}
             </span>
           </template>
-          <template v-else-if="form.discountType === 'fullRateFlag'">
-            <el-tag size="small" effect="light" type="warning">打折</el-tag>
+          <template v-else-if="form.activityType === 'FULL_RATE'">
+            <el-tag size="small" effect="light" type="warning" class="ml_10">打折</el-tag>
             <span class="money-highlight font-mono font-semibold ml_10">
-              打 {{ form.fullRate }} 折
+              打 {{ tier.fullRate }} 折
             </span>
           </template>
-          <template v-else>
-            <span class="text-secondary">无直接立减/打折</span>
+          <template v-else-if="form.activityType === 'FULL_GIFT'">
+            <el-tag size="small" effect="light" type="success" class="ml_10">满赠</el-tag>
+            <div class="tier-gift-tags">
+              <el-tag
+                v-for="(gift, gIdx) in tier.giftItems || []"
+                :key="gIdx"
+                size="small"
+                type="success"
+                effect="plain"
+              >
+                {{ formatGiftName(gift) }} × {{ gift.num || 1 }}件
+              </el-tag>
+            </div>
           </template>
         </el-descriptions-item>
-
-        <el-descriptions-item label="附加赠送权益" :span="2">
-          <div class="extra-rights-row">
-            <el-tag :type="form.freeFreightFlag ? 'success' : 'info'" effect="plain" size="small">
-              {{ form.freeFreightFlag ? "✓ 包邮（免运费）" : "不包邮" }}
-            </el-tag>
-            <el-tag :type="form.couponFlag ? 'success' : 'info'" effect="plain" size="small">
-              {{ form.couponFlag ? "✓ 赠送优惠券" : "不送券" }}
-            </el-tag>
-            <el-tag :type="form.giftFlag ? 'success' : 'info'" effect="plain" size="small">
-              {{ form.giftFlag ? "✓ 赠送赠品" : "不送赠品" }}
-            </el-tag>
-            <el-tag :type="form.pointFlag ? 'success' : 'info'" effect="plain" size="small">
-              {{ form.pointFlag ? "✓ 赠送积分" : "不送积分" }}
-            </el-tag>
-          </div>
-        </el-descriptions-item>
-
-        <el-descriptions-item v-if="form.couponFlag" label="赠送优惠券" :span="2">
-          <span class="font-semibold text-dark">{{ couponNameText }}</span>
-        </el-descriptions-item>
-
-        <el-descriptions-item v-if="form.giftFlag" label="赠品信息" :span="2">
-          <span class="font-semibold text-dark">{{ giftNameText }}</span>
-        </el-descriptions-item>
-
-        <el-descriptions-item v-if="form.pointFlag" label="赠送积分数" :span="2">
-          <span class="font-mono font-semibold text-dark">{{ form.point ?? 0 }} 积分</span>
-        </el-descriptions-item>
       </el-descriptions>
     </el-card>
 
@@ -186,7 +178,7 @@
 <script setup>
 import { computed, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { getPlatformCouponList, getFullDiscountById } from "@/api/promotion";
+import { getFullDiscountById } from "@/api/promotion";
 import { getGoodsSkuData } from "@/api/goods";
 import { useAppStore } from "@/stores/app";
 
@@ -198,64 +190,83 @@ const appStore = useAppStore();
 
 const id = ref(route.query.id);
 const form = ref({
-  discountType: "fullMinusFlag",
+  activityType: "FULL_MINUS",
   scopeType: "ALL",
   promotionGoodsList: [],
+  ruleList: [],
 });
-const couponList = ref([]);
 const giftList = ref([]);
 
-const couponNameText = computed(() => {
-  if (!form.value.couponId) return "未指定优惠券";
-  const found = couponList.value.find((c) => String(c.id) === String(form.value.couponId));
-  return found ? found.couponName : `优惠券 ID: ${form.value.couponId}`;
+const activityTypeTitle = computed(() => {
+  if (form.value.activityType === "FULL_RATE") return "满折活动";
+  if (form.value.activityType === "FULL_GIFT") return "满赠活动";
+  return "满减活动";
 });
 
-const giftNameText = computed(() => {
-  if (!form.value.giftId) return "未指定赠品";
-  const found = giftList.value.find((g) => String(g.id) === String(form.value.giftId));
-  return found ? found.goodsName : `赠品 ID: ${form.value.giftId}`;
+const activityTagType = computed(() => {
+  if (form.value.activityType === "FULL_RATE") return "warning";
+  if (form.value.activityType === "FULL_GIFT") return "success";
+  return "danger";
 });
 
 onMounted(() => {
   if (id.value) {
     getDetail();
   }
-  getCouponList();
   getGiftList();
 });
 
+function formatGiftName(gift) {
+  if (gift?.goodsName) return gift.goodsName;
+  const found = giftList.value.find((g) => String(g.id) === String(gift?.skuId));
+  return found ? found.goodsName : `赠品 ID: ${gift?.skuId || "-"}`;
+}
+
 function getDetail() {
   getFullDiscountById(id.value).then((res) => {
     if (res && res.success && res.result) {
-      let data = res.result;
+      const data = res.result;
       if (data.scopeType !== "PORTION_GOODS") {
         data.promotionGoodsList = [];
       }
-      if (data.fullRateFlag) {
-        data.discountType = "fullRateFlag";
-      } else {
-        data.discountType = "fullMinusFlag";
+      if (!data.activityType) {
+        if (data.fullRateFlag) {
+          data.activityType = "FULL_RATE";
+        } else if (!data.fullMinusFlag && data.giftFlag) {
+          data.activityType = "FULL_GIFT";
+        } else {
+          data.activityType = "FULL_MINUS";
+        }
+      }
+      if (!Array.isArray(data.ruleList) || !data.ruleList.length) {
+        if (data.rulesJson) {
+          try {
+            data.ruleList = JSON.parse(data.rulesJson);
+          } catch (e) {
+            data.ruleList = [];
+          }
+        }
+        if (!data.ruleList || !data.ruleList.length) {
+          data.ruleList = [
+            {
+              fullMoney: data.fullMoney,
+              fullMinus: data.fullMinus,
+              fullRate: data.fullRate,
+              giftItems: data.giftId
+                ? String(data.giftId)
+                    .split(",")
+                    .filter(Boolean)
+                    .map((skuId) => ({ skuId, goodsName: data.giftSkuName, num: 1 }))
+                : [],
+            },
+          ];
+        }
       }
       form.value = data;
     }
   });
 }
 
-function getCouponList() {
-  const params = {
-    pageSize: 50,
-    pageNumber: 1,
-    getType: "ACTIVITY",
-    promotionStatus: "START",
-  };
-  getPlatformCouponList(params).then((res) => {
-    if (res && res.success && res.result) {
-      couponList.value = res.result.records || [];
-    }
-  });
-}
-
 function getGiftList() {
   const params = {
     pageSize: 50,
@@ -357,11 +368,11 @@ function back() {
       font-size: 14px;
     }
 
-    .extra-rights-row {
+    .tier-gift-tags {
+      margin-top: 8px;
       display: flex;
-      align-items: center;
       flex-wrap: wrap;
-      gap: 10px;
+      gap: 8px;
     }
 
     .custom-table {
diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index d3a9fa1d7..de27fdfad 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -1,3 +1,8 @@
+<!--
+  管理端-满额活动列表页（支持满减活动 FULL_MINUS、满折活动 FULL_RATE、满赠活动 FULL_GIFT）
+  @author Bulbasaur
+  @since 2026-11-09
+-->
 <template>
   <div class="search full-cut">
     <el-card>
@@ -55,16 +60,23 @@
         class="mt_10"
         style="width: 100%"
       >
-        <el-table-column prop="promotionName" label="活动名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="startTime" label="开始时间" width="170" />
-        <el-table-column prop="endTime" label="结束时间" width="170" />
-        <el-table-column prop="storeName" label="店铺名称" min-width="100" show-overflow-tooltip />
-        <el-table-column label="活动类型" min-width="80">
+        <el-table-column prop="promotionName" label="活动名称" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="storeName" label="店铺名称" min-width="120" show-overflow-tooltip />
+        <el-table-column label="阶梯优惠规则" min-width="240" show-overflow-tooltip>
           <template #default="{ row }">
-            <span v-if="row">{{ row.fullMinusFlag ? "满减" : "满折" }}</span>
+            <span v-if="row">{{ formatRowRules(row) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="活动状态" min-width="100">
+        <el-table-column prop="startTime" label="开始时间" width="170" />
+        <el-table-column prop="endTime" label="结束时间" width="170" />
+        <el-table-column label="活动类型" width="90">
+          <template #default="{ row }">
+            <el-tag v-if="row" size="small" effect="plain" :type="activityTagType(row)">
+              {{ activityTypeText(row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" width="100">
           <template #default="{ row }">
             <el-tag v-if="row" :type="promotionStatusTagType(row.promotionStatus)">
               {{ promotionStatusText(row.promotionStatus) }}
@@ -101,14 +113,39 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
+import { computed, onMounted, reactive, ref, watch } from "vue";
+import { useRoute, useRouter } from "vue-router";
 import { getFullDiscountList, updateFullDiscount } from "@/api/promotion.js";
 import { Message, Modal } from "@/utils/message";
 
+const props = defineProps({
+  /**
+   * 固定活动子类型（FULL_MINUS-满减，FULL_RATE-满折，FULL_GIFT-满赠）
+   */
+  defaultActivityType: {
+    type: String,
+    default: "",
+  },
+});
+
+const route = useRoute();
 const router = useRouter();
 
-// 模板 ref（script 未使用，仅避免与 data 同名互相覆盖）
+const currentActivityType = computed(() => {
+  if (props.defaultActivityType) {
+    return props.defaultActivityType;
+  }
+  const routePath = String(route.path || "");
+  const routeName = String(route.name || "");
+  if (routePath.includes("full-rate") || routeName.includes("full-rate")) {
+    return "FULL_RATE";
+  }
+  if (routePath.includes("full-gift") || routeName.includes("full-gift")) {
+    return "FULL_GIFT";
+  }
+  return "FULL_MINUS";
+});
+
 const searchFormRef = ref(null);
 const tableRef = ref(null);
 
@@ -120,9 +157,67 @@ const searchForm = reactive({
   pageSize: 20,
   sort: "createTime",
   order: "desc",
+  promotionName: "",
+  promotionStatus: "",
 });
 const data = ref([]);
 
+watch(currentActivityType, () => {
+  searchForm.pageNumber = 1;
+  getDataList();
+});
+
+function resolveRowType(row) {
+  if (row?.activityType) return row.activityType;
+  if (row?.fullRateFlag) return "FULL_RATE";
+  if (!row?.fullMinusFlag && row?.giftFlag) return "FULL_GIFT";
+  return "FULL_MINUS";
+}
+
+function activityTypeText(row) {
+  const type = resolveRowType(row);
+  if (type === "FULL_RATE") return "满折";
+  if (type === "FULL_GIFT") return "满赠";
+  return "满减";
+}
+
+function activityTagType(row) {
+  const type = resolveRowType(row);
+  if (type === "FULL_RATE") return "warning";
+  if (type === "FULL_GIFT") return "success";
+  return "danger";
+}
+
+function formatRowRules(row) {
+  if (row?.title) return row.title;
+  if (row?.rulesJson) {
+    try {
+      const rules = JSON.parse(row.rulesJson);
+      if (Array.isArray(rules) && rules.length) {
+        const type = resolveRowType(row);
+        return rules
+          .map((r) => {
+            if (type === "FULL_RATE") return `满${r.fullMoney}元打${r.fullRate}折`;
+            if (type === "FULL_GIFT") {
+              const count = Array.isArray(r.giftItems) ? r.giftItems.length : 1;
+              return `满${r.fullMoney}元赠${count}种商品`;
+            }
+            return `满${r.fullMoney}元减${r.fullMinus}元`;
+          })
+          .join("；");
+      }
+    } catch (e) {
+      // ignore
+    }
+  }
+  if (row?.fullMoney != null) {
+    if (row.fullRateFlag) return `满${row.fullMoney}元打${row.fullRate}折`;
+    if (row.giftFlag) return `满${row.fullMoney}元享赠品`;
+    return `满${row.fullMoney}元减${row.fullMinus}元`;
+  }
+  return "-";
+}
+
 function promotionStatusText(status) {
   const map = {
     NEW: "未开始",
@@ -145,18 +240,16 @@ function init() {
   getDataList();
 }
 function openOrClose(row) {
-  let name = "开启";
   if (row.promotionStatus === "NEW" || row.promotionStatus === "START") {
-    name = "关闭";
     Modal.confirm({
       title: "提示",
-      content: `确认${name}此活动吗?需要一定时间才能生效，请耐心等待`,
+      content: "确认关闭此活动吗？需要一定时间才能生效，请耐心等待",
       loading: true,
       onOk: () => {
         updateFullDiscount(row.id).then((res) => {
           Modal.remove();
           if (res.success) {
-            Message.success(`${name}成功`);
+            Message.success("关闭成功");
             getDataList();
           }
         });
@@ -185,7 +278,11 @@ function getDataList() {
     searchForm.startTime = null;
     searchForm.endTime = null;
   }
-  getFullDiscountList(searchForm).then((res) => {
+  const query = {
+    ...searchForm,
+    activityType: currentActivityType.value,
+  };
+  getFullDiscountList(query).then((res) => {
     loading.value = false;
     if (res.success) {
       data.value = res.result.records;
@@ -194,7 +291,10 @@ function getDataList() {
   });
 }
 function view(row) {
-  router.push({ name: "full-discount-detail", query: { id: row.id } });
+  router.push({
+    name: "full-discount-detail",
+    query: { id: row.id, activityType: resolveRowType(row) },
+  });
 }
 
 onMounted(() => {
diff --git a/manager/src/views/promotions/full-discount/full-gift.vue b/manager/src/views/promotions/full-discount/full-gift.vue
new file mode 100644
index 000000000..cfc74330b
--- /dev/null
+++ b/manager/src/views/promotions/full-discount/full-gift.vue
@@ -0,0 +1,14 @@
+<!--
+  管理端-满赠活动列表页
+  @author Bulbasaur
+  @since 2026-11-09
+-->
+<template>
+  <FullDiscountList default-activity-type="FULL_GIFT" />
+</template>
+
+<script setup>
+import FullDiscountList from "./full-discount.vue";
+
+defineOptions({ name: "manager-full-gift" });
+</script>
diff --git a/manager/src/views/promotions/full-discount/full-rate.vue b/manager/src/views/promotions/full-discount/full-rate.vue
new file mode 100644
index 000000000..ae446ed74
--- /dev/null
+++ b/manager/src/views/promotions/full-discount/full-rate.vue
@@ -0,0 +1,14 @@
+<!--
+  管理端-满折活动列表页
+  @author Bulbasaur
+  @since 2026-11-09
+-->
+<template>
+  <FullDiscountList default-activity-type="FULL_RATE" />
+</template>
+
+<script setup>
+import FullDiscountList from "./full-discount.vue";
+
+defineOptions({ name: "manager-full-rate" });
+</script>
diff --git a/manager/src/views/statistics/marketing.vue b/manager/src/views/statistics/marketing.vue
index c7d497f45..94347e8e0 100644
--- a/manager/src/views/statistics/marketing.vue
+++ b/manager/src/views/statistics/marketing.vue
@@ -57,7 +57,9 @@ const activityMetrics = ref([
   { key: "couponActiveNum", label: "进行中优惠券" },
   { key: "seckillActiveNum", label: "进行中秒杀" },
   { key: "pintuanActiveNum", label: "进行中拼团" },
-  { key: "fullDiscountActiveNum", label: "进行中满减" },
+  { key: "fullMinusActiveNum", label: "进行中满减" },
+  { key: "fullRateActiveNum", label: "进行中满折" },
+  { key: "fullGiftActiveNum", label: "进行中满赠" },
   { key: "kanjiaActiveNum", label: "进行中砍价商品" },
   { key: "pointsGoodsActiveNum", label: "进行中积分商品" },
 ]);
@@ -128,7 +130,7 @@ h4 {
 }
 .metric-grid {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(4, 1fr);
   gap: 16px;
 }
 .metric-item {
diff --git a/seller/scripts/test-seller-navigation.mjs b/seller/scripts/test-seller-navigation.mjs
index 52f6b0ec8..a7c13ae58 100644
--- a/seller/scripts/test-seller-navigation.mjs
+++ b/seller/scripts/test-seller-navigation.mjs
@@ -45,3 +45,16 @@ test('搜索清空与空权限账号正确处理', () => {
   assert.deepEqual(searchNavigation(flattenNavigation([]), ''), []);
   assert.equal(findNavigationItem(items, 'unknown-detail'), null);
 });
+test('满减/满折/满赠详情页按 activityType 定位对应左侧菜单', () => {
+  const promoMenus = [
+    { name: 'promotion', title: '营销', children: [{ title: '店铺活动', children: [
+      { name: 'full-discount', path: 'full-discount', title: '满减活动', component },
+      { name: 'store-full-rate', path: 'full-rate', title: '满折活动', component },
+      { name: 'store-full-gift', path: 'full-gift', title: '满赠活动', component },
+    ] }] },
+  ];
+  const promoItems = flattenNavigation(promoMenus);
+  assert.equal(findNavigationItem(promoItems, 'full-discount-detail', { activityType: 'FULL_GIFT' })?.name, 'store-full-gift');
+  assert.equal(findNavigationItem(promoItems, 'full-discount-detail', { activityType: 'FULL_RATE' })?.name, 'store-full-rate');
+  assert.equal(findNavigationItem(promoItems, 'full-discount-detail', { activityType: 'FULL_MINUS' })?.name, 'full-discount');
+});
diff --git a/seller/src/libs/seller-navigation.js b/seller/src/libs/seller-navigation.js
index bd229792b..bb0b1881e 100644
--- a/seller/src/libs/seller-navigation.js
+++ b/seller/src/libs/seller-navigation.js
@@ -39,10 +39,31 @@ export function flattenNavigation(menus) {
   ));
 }
 
+const FULL_DISCOUNT_DETAIL_MENUS = {
+  FULL_GIFT: ["store-full-gift", "full-gift", "full-discount", "full-cut"],
+  FULL_RATE: ["store-full-rate", "full-rate", "full-discount", "full-cut"],
+  FULL_MINUS: ["full-discount", "full-cut"],
+};
+
+function resolveDetailMenuCandidates(routeName, routeQuery = {}) {
+  if (routeName === "full-discount-detail") {
+    const type = routeQuery?.activityType;
+    if (type && FULL_DISCOUNT_DETAIL_MENUS[type]) {
+      return FULL_DISCOUNT_DETAIL_MENUS[type];
+    }
+  }
+  return DETAIL_MENUS[routeName] || [];
+}
+
 /** 优先精确匹配菜单，再匹配详情页业务入口；无授权入口时返回空，不沿用旧账号栏目。 */
-export function findNavigationItem(items, routeName) {
-  return items.find((item) => item.name === routeName) ||
-    (DETAIL_MENUS[routeName] || []).map((name) => items.find((item) => item.name === name)).find(Boolean) || null;
+export function findNavigationItem(items, routeName, routeQuery = {}) {
+  return (
+    items.find((item) => item.name === routeName) ||
+    resolveDetailMenuCandidates(routeName, routeQuery)
+      .map((name) => items.find((item) => item.name === name || item.path === name))
+      .find(Boolean) ||
+    null
+  );
 }
 
 /** 按菜单、分组和栏目检索，空格分隔的关键词须全部匹配。 */
diff --git a/seller/src/libs/util.js b/seller/src/libs/util.js
index dc47b0bb8..0fd099f13 100644
--- a/seller/src/libs/util.js
+++ b/seller/src/libs/util.js
@@ -503,6 +503,15 @@ util.initRouterNode = function (routers, data) {
     }
     const menu = Object.assign({}, item);
     const hasChildren = item.children && item.children.length > 0;
+    if (
+      !hasChildren &&
+      (menu.frontRoute === "promotion/full-discount/full-discount" ||
+        menu.name === "full-discount" ||
+        menu.name === "full-cut") &&
+      menu.title === "满额活动"
+    ) {
+      menu.title = "满减活动";
+    }
 
     if (hasChildren) {
       menu.children = [];
diff --git a/seller/src/views/Main.vue b/seller/src/views/Main.vue
index fd67dad83..2af63aaa1 100644
--- a/seller/src/views/Main.vue
+++ b/seller/src/views/Main.vue
@@ -128,10 +128,19 @@ const load = ref(false);
 const loading = computed(() => appStore.loading);
 const unreadMessageCount = computed(() => appStore.unreadMessageCount);
 const pageTagsList = computed(() => appStore.storeOpenedList);
-const currentPageTitle = computed(() => route.meta.title || pageTagsList.value.find((item) => item.name === route.name)?.title || '工作台');
+const currentPageTitle = computed(() => {
+  if (route.name === "full-discount-detail") {
+    const type = route.query?.activityType;
+    const isDetail = Boolean(route.query?.id);
+    if (type === "FULL_GIFT") return isDetail ? "满赠活动详情" : "添加满赠活动";
+    if (type === "FULL_RATE") return isDetail ? "满折活动详情" : "添加满折活动";
+    return isDetail ? "满减活动详情" : "添加满减活动";
+  }
+  return route.meta.title || pageTagsList.value.find((item) => item.name === route.name)?.title || '工作台';
+});
 const navigationItems = computed(() => flattenNavigation(appStore.navigationMenus || []));
 const currentPathParts = computed(() => {
-  const matched = findNavigationItem(navigationItems.value, route.name);
+  const matched = findNavigationItem(navigationItems.value, route.name, route.query);
   const rawParts = matched
     ? [
         matched.topTitle,
diff --git a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 3121ba8d3..edce49c58 100644
--- a/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/seller/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -44,7 +44,7 @@ const route = useRoute();
 const router = useRouter();
 const closedSections = ref([]);
 const allItems = computed(() => flattenNavigation(appStore.navigationMenus).filter((item) => router.hasRoute(item.name)));
-const activeItem = computed(() => findNavigationItem(allItems.value, route.name));
+const activeItem = computed(() => findNavigationItem(allItems.value, route.name, route.query));
 const sections = computed(() => appStore.navigationMenus.map((top) => ({
   ...top, items: allItems.value.filter((item) => item.topName === top.name),
 })).filter((top) => top.items.length));
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 3c122800f..6282f264e 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -55,7 +55,7 @@
     <el-card>
       <div class="operation padding-row" v-if="getType !== 'ACTIVITY'">
         <el-button type="primary" @click="add">添加优惠券</el-button>
-        <el-button class="activity-coupon-button" @click="addActivityCoupon">添加活动优惠券</el-button>
+        <el-button v-if="false" class="activity-coupon-button" @click="addActivityCoupon">添加活动优惠券</el-button>
         <el-button @click="delAll">批量关闭</el-button>
         <el-button type="warning" @click="receivePage()">优惠券领取记录</el-button>
       </div>
diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue
index 6f10407ca..4cea9ec45 100644
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@@ -1,46 +1,71 @@
+<!--
+  商家端-满减/满折/满赠活动新增、编辑与详情页（支持 1~3 级阶梯，满赠每阶梯最多 3 个赠品 × 1~10 件）
+  @author Bulbasaur
+  @since 2026-11-09
+-->
 <template>
   <div class="full-discount-add">
     <template v-if="fieldDisabled">
       <el-card class="section-card" shadow="never">
         <template #header>
-          <span class="section-title">基本信息</span>
+          <span class="section-title">基本信息（{{ activityTypeLabel }}）</span>
         </template>
         <el-descriptions border :column="2">
           <el-descriptions-item label="活动名称">{{ form.promotionName }}</el-descriptions-item>
-          <el-descriptions-item label="活动时间">
+          <el-descriptions-item label="活动类型">
+            <el-tag size="small" :type="activityTagType">{{ activityTypeLabel }}</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="活动时间" :span="2">
             {{ form.startTime }} ~ {{ form.endTime }}
           </el-descriptions-item>
+          <el-descriptions-item label="活动说明" :span="2">
+            {{ form.description || "-" }}
+          </el-descriptions-item>
         </el-descriptions>
       </el-card>
 
       <el-card class="section-card" shadow="never">
         <template #header>
-          <span class="section-title">优惠设置</span>
+          <span class="section-title">阶梯优惠设置（共 {{ form.ruleList.length }} 级阶梯）</span>
         </template>
-        <el-descriptions border :column="2">
-          <el-descriptions-item label="优惠门槛">满 {{ form.fullMoney }} 元</el-descriptions-item>
-          <el-descriptions-item label="优惠方式">
-            {{ form.discountType === "fullMinusFlag" ? "减现金" : "打折" }}
-          </el-descriptions-item>
-          <el-descriptions-item v-if="form.discountType === 'fullMinusFlag'" label="优惠金额">
-            减 {{ form.fullMinus }} 元
-          </el-descriptions-item>
-          <el-descriptions-item v-else label="优惠折扣">{{ form.fullRate }} 折</el-descriptions-item>
-          <el-descriptions-item label="使用范围">
-            {{ form.scopeType === "ALL" ? "全品类" : "指定商品" }}
-          </el-descriptions-item>
-          <el-descriptions-item label="额外赠送" :span="2">
-            <template v-if="extraGifts.length">
-              <el-tag v-for="gift in extraGifts" :key="gift" class="gift-tag" size="small">
-                {{ gift }}
-              </el-tag>
+        <el-descriptions border :column="1">
+          <el-descriptions-item
+            v-for="(tier, idx) in form.ruleList"
+            :key="idx"
+            :label="`第 ${idx + 1} 级阶梯`"
+          >
+            <template v-if="form.activityType === 'FULL_MINUS'">
+              满 <strong>{{ tier.fullMoney }}</strong> 元，立减现金
+              <strong style="color: #f56c6c">{{ tier.fullMinus }}</strong> 元
             </template>
-            <span v-else>无</span>
+            <template v-else-if="form.activityType === 'FULL_RATE'">
+              满 <strong>{{ tier.fullMoney }}</strong> 元，立享
+              <strong style="color: #e6a23c">{{ tier.fullRate }}</strong> 折
+            </template>
+            <template v-else-if="form.activityType === 'FULL_GIFT'">
+              <div>
+                满 <strong>{{ tier.fullMoney }}</strong> 元，赠送以下商品：
+              </div>
+              <div class="readonly-gift-list">
+                <el-tag
+                  v-for="(g, gIdx) in tier.giftItems || []"
+                  :key="gIdx"
+                  size="small"
+                  type="success"
+                  class="gift-tag"
+                >
+                  {{ formatGiftDisplayName(g) }} × {{ g.num || 1 }}件
+                </el-tag>
+              </div>
+            </template>
+          </el-descriptions-item>
+          <el-descriptions-item label="适用商品范围">
+            {{ form.scopeType === "ALL" ? "全品类" : "指定商品" }}
           </el-descriptions-item>
         </el-descriptions>
 
         <el-table
-          v-if="form.scopeType == 'PORTION_GOODS'"
+          v-if="form.scopeType === 'PORTION_GOODS'"
           border
           :data="form.promotionGoodsList"
           style="width: 100%; margin-top: 16px"
@@ -49,45 +74,23 @@
             <template #default="{ row }">
               <div v-if="row" class="goods-cell">
                 <img v-if="row.thumbnail" :src="row.thumbnail" class="goods-thumb" alt="" />
-                <a class="link-text mr_10 goods-name" @click="linkTo(row.goodsId, row.skuId)">{{
-                  row.goodsName
-                }}</a>
-                <el-popover trigger="hover" title="扫码在手机中查看" placement="top" width="180">
-                  <template #reference>
-                    <img
-                      src="../../../assets/qrcode.svg"
-                      style="vertical-align: middle"
-                      class="hover-pointer"
-                      width="20"
-                      height="20"
-                      alt=""
-                    />
-                  </template>
-                  <vue-qr
-                    :text="wapLinkTo(row.goodsId, row.skuId)"
-                    :margin="0"
-                    color-dark="#000"
-                    color-light="#fff"
-                    :size="150"
-                  />
-                </el-popover>
+                <a class="link-text mr_10 goods-name" @click="linkTo(row.goodsId, row.skuId)">
+                  {{ row.goodsName }}
+                </a>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="SKU编码" min-width="140" show-overflow-tooltip>
-            <template #default="{ row }">
-              {{ row?.sn || "-" }}
-            </template>
+            <template #default="{ row }">{{ row?.sn || "-" }}</template>
           </el-table-column>
           <el-table-column label="规格" min-width="140" show-overflow-tooltip>
-            <template #default="{ row }">
-              {{ row?.simpleSpecs || "-" }}
-            </template>
+            <template #default="{ row }">{{ row?.simpleSpecs || "-" }}</template>
           </el-table-column>
           <el-table-column label="商品价格" width="110" align="right">
             <template #default="{ row }">
               <span v-if="row" :style="{ color: $mainColor }">
-                {{ $filters.unitPrice(row.price, "￥") }}</span>
+                {{ $filters.unitPrice(row.price, "￥") }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="库存" width="90" align="right">
@@ -106,20 +109,23 @@
     <el-form v-else ref="formRef" :model="form" label-width="120px" :rules="formRule">
       <el-card class="section-card" shadow="never">
         <template #header>
-          <span class="section-title">基本信息</span>
+          <span class="section-title">基本信息（{{ activityTypeLabel }}）</span>
         </template>
+        <el-form-item label="活动类型">
+          <el-tag :type="activityTagType">{{ activityTypeLabel }}</el-tag>
+        </el-form-item>
         <el-form-item label="活动名称" prop="promotionName">
           <el-input
             v-model="form.promotionName"
             :disabled="fieldDisabled"
-            placeholder="活动名称"
+            placeholder="请输入活动名称"
             clearable
-            style="width: 260px"
+            class="basic-form-control"
           />
         </el-form-item>
         <el-form-item label="活动时间" prop="rangeTime">
           <el-date-picker
-            class="full-discount-range-picker"
+            class="full-discount-range-picker basic-form-control"
             type="datetimerange"
             v-model="form.rangeTime"
             :disabled="fieldDisabled"
@@ -130,199 +136,224 @@
             :disabled-date="options.disabledDate"
           />
         </el-form-item>
+        <el-form-item label="活动说明">
+          <el-input
+            v-model="form.description"
+            type="textarea"
+            :rows="2"
+            placeholder="选填，活动补充说明"
+            class="basic-form-control"
+          />
+        </el-form-item>
       </el-card>
 
       <el-card class="section-card" shadow="never">
         <template #header>
-          <span class="section-title">优惠设置</span>
+          <div class="tier-card-header">
+            <span class="section-title">阶梯优惠设置（最多支持 3 级阶梯）</span>
+            <el-button
+              v-if="form.ruleList.length < 3"
+              type="primary"
+              @click="addTier"
+            >
+              添加阶梯（{{ form.ruleList.length }}/3）
+            </el-button>
+          </div>
         </template>
-        <div>
-            <el-form-item label="优惠门槛" prop="fullMoney">
-              <el-input
-                v-model="form.fullMoney"
-                :disabled="fieldDisabled"
-                placeholder="优惠门槛"
-                clearable
-                style="width: 260px"
-              />
-              <span class="describe">消费达到当前金额可以参与优惠</span>
-            </el-form-item>
-            <el-form-item label="优惠方式">
-              <el-radio-group v-model="form.discountType" :disabled="fieldDisabled">
-                <el-radio-button value="fullMinusFlag">减现金</el-radio-button>
-                <el-radio-button value="fullRateFlag">打折</el-radio-button>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item
-              v-if="form.discountType == 'fullMinusFlag'"
-              label="优惠金额"
-              prop="fullMinus"
-            >
-              <el-input
-                :disabled="fieldDisabled"
-                v-model="form.fullMinus"
-                placeholder="优惠金额"
-                clearable
-                style="width: 260px"
-              />
-            </el-form-item>
-            <el-form-item
-              v-if="form.discountType == 'fullRateFlag'"
-              label="优惠折扣"
-              prop="fullRate"
-            >
-              <el-input-number
-                :disabled="fieldDisabled"
-                v-model="form.fullRate"
-                placeholder="优惠折扣"
-                :min="0.1"
-                :max="9.9"
-                :step="0.1"
-                :precision="1"
-                style="width: 260px"
-              />
-              <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
-            </el-form-item>
-            <el-form-item label="额外赠送">
-              <el-checkbox v-model="form.freeFreightFlag" :disabled="fieldDisabled">免邮费</el-checkbox>
-              <el-checkbox v-model="form.couponFlag" :disabled="fieldDisabled">送优惠券</el-checkbox>
-              <el-checkbox v-model="form.giftFlag" :disabled="fieldDisabled">送赠品</el-checkbox>
-              <el-checkbox v-model="form.pointFlag" :disabled="fieldDisabled">送积分</el-checkbox>
-            </el-form-item>
-            <el-form-item v-if="form.couponFlag" label="赠送优惠券" prop="couponId">
-              <el-select
-                v-model="form.couponId"
-                :disabled="fieldDisabled"
-                filterable
-                remote
-                :remote-method="getCouponList"
-                placeholder="输入优惠券名称搜索"
-                :loading="couponLoading"
-                style="width: 280px"
-              >
-                <el-option
-                  v-for="item in couponList"
-                  :value="item.id"
-                  :key="item.id"
-                  :label="item.couponName"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="form.giftFlag" label="赠品" prop="giftId">
-              <div class="gift-field">
-                <el-select
-                  v-model="form.giftId"
-                  filterable
-                  remote
-                  :remote-method="getGiftList"
-                  placeholder="输入赠品名称搜索"
-                  :disabled="fieldDisabled"
-                  :loading="giftLoading"
-                  style="width: 260px"
-                >
-                  <el-option
-                    v-for="item in giftList"
-                    :value="item.id"
-                    :key="item.id"
-                    :label="giftOptionLabel(item)"
-                  />
-                </el-select>
-                <p class="describe describe-block">电子卡券赠品支付后自动发卡；卡池不足时仅取消赠品子单，不影响主订单。</p>
-              </div>
-            </el-form-item>
-            <el-form-item v-if="form.pointFlag" label="赠积分" prop="point">
-              <el-input
-                v-model="form.point"
-                type="number"
-                :disabled="fieldDisabled"
-                style="width: 260px"
-              />
-            </el-form-item>
-            <el-form-item label="使用范围" prop="scopeType">
-              <el-radio-group v-model="form.scopeType" :disabled="fieldDisabled">
-                <el-radio-button value="ALL">全品类</el-radio-button>
-                <el-radio-button value="PORTION_GOODS">指定商品</el-radio-button>
-              </el-radio-group>
-            </el-form-item>
 
-            <el-form-item style="width: 100%" v-if="form.scopeType == 'PORTION_GOODS'">
-              <div v-if="!fieldDisabled" style="display: flex; margin-bottom: 10px">
-                <el-button type="primary" @click="openSkuList">选择商品</el-button>
-                <el-button type="danger" plain style="margin-left: 10px" @click="delSelectGoods">
-                  批量删除
+        <div
+          v-for="(tier, tierIdx) in form.ruleList"
+          :key="tierIdx"
+          class="tier-block"
+        >
+          <div class="tier-block-title">
+            <span>第 {{ tierIdx + 1 }} 级阶梯</span>
+            <el-button
+              v-if="form.ruleList.length > 1"
+              type="danger"
+              link
+              @click="removeTier(tierIdx)"
+            >
+              删除此阶梯
+            </el-button>
+          </div>
+
+          <el-form-item label="优惠门槛" required>
+            <span class="inline-prefix">满</span>
+            <el-input-number
+              v-model="tier.fullMoney"
+              :min="0.01"
+              :max="99999999"
+              :precision="2"
+              :step="10"
+              controls-position="right"
+              placeholder="门槛金额"
+              style="width: 180px"
+            />
+            <span class="inline-suffix">元</span>
+            <span class="describe">须大于上一级阶梯门槛金额</span>
+          </el-form-item>
+
+          <!-- 满减活动专属字段 -->
+          <el-form-item v-if="form.activityType === 'FULL_MINUS'" label="优惠金额" required>
+            <span class="inline-prefix">减</span>
+            <el-input-number
+              v-model="tier.fullMinus"
+              :min="0.01"
+              :max="99999999"
+              :precision="2"
+              :step="5"
+              controls-position="right"
+              placeholder="立减金额"
+              style="width: 180px"
+            />
+            <span class="inline-suffix">元</span>
+            <span class="describe">须小于当前阶梯门槛，且随阶梯递增</span>
+          </el-form-item>
+
+          <!-- 满折活动专属字段 -->
+          <el-form-item v-if="form.activityType === 'FULL_RATE'" label="优惠折扣" required>
+            <span class="inline-prefix">打</span>
+            <el-input-number
+              v-model="tier.fullRate"
+              :min="0.1"
+              :max="9.9"
+              :step="0.1"
+              :precision="1"
+              controls-position="right"
+              placeholder="优惠折扣"
+              style="width: 180px"
+            />
+            <span class="inline-suffix">折</span>
+            <span class="describe">0.1~9.9 折，阶梯越高折扣数值须越小（如 9折 → 8折 → 7折）</span>
+          </el-form-item>
+
+          <!-- 满赠活动专属字段：每阶梯最多3个赠品，每个最多10件 -->
+          <el-form-item v-if="form.activityType === 'FULL_GIFT'" label="赠送商品" required>
+            <div class="gift-tier-panel">
+              <div class="gift-tier-footer">
+                <el-button
+                  type="primary"
+                  @click="openGiftSkuPicker(tierIdx)"
+                >
+                  选择赠品（{{ (tier.giftItems || []).length }}/3）
                 </el-button>
+                <span class="describe">
+                  每级阶梯最多可选 3 个赠品，单品最多 10 件；支付时若赠品库存不足，将按实际可用库存部分赠送。
+                </span>
               </div>
               <el-table
+                v-if="tier.giftItems && tier.giftItems.length"
                 border
-                :data="form.promotionGoodsList"
+                :data="tier.giftItems"
                 style="width: 100%"
-                @selection-change="changeSelect"
               >
-                <el-table-column
-                  v-if="!fieldDisabled"
-                  type="selection"
-                  width="60"
-                  align="center"
-                />
-                <el-table-column label="商品名称" min-width="220">
+                <el-table-column label="赠品名称" min-width="220">
                   <template #default="{ row }">
                     <div v-if="row" class="goods-cell">
                       <img v-if="row.thumbnail" :src="row.thumbnail" class="goods-thumb" alt="" />
-                      <a class="link-text mr_10 goods-name" @click="linkTo(row.goodsId, row.skuId)">{{
-                        row.goodsName
-                      }}</a>
-                      <el-popover trigger="hover" title="扫码在手机中查看" placement="top" width="180">
-                        <template #reference>
-                          <img
-                            src="../../../assets/qrcode.svg"
-                            style="vertical-align: middle"
-                            class="hover-pointer"
-                            width="20"
-                            height="20"
-                            alt=""
-                          />
-                        </template>
-                        <vue-qr
-                          :text="wapLinkTo(row.goodsId, row.skuId)"
-                          :margin="0"
-                          color-dark="#000"
-                          color-light="#fff"
-                          :size="150"
-                        />
-                      </el-popover>
+                      <span class="goods-name">{{ formatGiftDisplayName(row) }}</span>
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="SKU编码" min-width="140" show-overflow-tooltip>
+                <el-table-column label="规格" min-width="120" show-overflow-tooltip>
+                  <template #default="{ row }">{{ row?.simpleSpecs || "-" }}</template>
+                </el-table-column>
+                <el-table-column label="单价" width="110" align="right">
                   <template #default="{ row }">
-                    {{ row?.sn || "-" }}
+                    <span v-if="row && row.price != null" :style="{ color: $mainColor }">
+                      {{ $filters.unitPrice(row.price, "￥") }}
+                    </span>
+                    <span v-else>-</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" min-width="140" show-overflow-tooltip>
+                <el-table-column label="赠送数量（件）" width="170" align="center">
                   <template #default="{ row }">
-                    {{ row?.simpleSpecs || "-" }}
+                    <el-input-number
+                      v-model="row.num"
+                      :min="1"
+                      :max="10"
+                      :step="1"
+                      :precision="0"
+                      controls-position="right"
+                      style="width: 130px"
+                    />
                   </template>
                 </el-table-column>
-                <el-table-column label="商品价格" width="110" align="right">
-                  <template #default="{ row }">
-                    <span v-if="row" :style="{ color: $mainColor }">
-                      {{ $filters.unitPrice(row.price, "￥") }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="库存" width="90" align="right">
-                  <template #default="{ row }">
-                    <span v-if="row">{{ row.quantity }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column v-if="!fieldDisabled" label="操作" width="100" align="right">
+                <el-table-column label="操作" width="90" align="right">
                   <template #default="{ $index }">
-                    <a class="link-text" @click="delGoods($index)">删除</a>
+                    <a class="link-text" @click="removeGiftFromTier(tier, $index)">删除</a>
                   </template>
                 </el-table-column>
               </el-table>
-            </el-form-item>
-
+            </div>
+          </el-form-item>
         </div>
+
+        <el-form-item label="适用范围" prop="scopeType" style="margin-top: 16px">
+          <el-radio-group v-model="form.scopeType" :disabled="fieldDisabled">
+            <el-radio-button value="ALL">全品类</el-radio-button>
+            <el-radio-button value="PORTION_GOODS">指定商品</el-radio-button>
+          </el-radio-group>
+          <span class="describe">
+            同一时段内全品类活动互斥；指定商品活动只要所选商品不重叠即可同时开启
+          </span>
+        </el-form-item>
+
+        <el-form-item style="width: 100%" v-if="form.scopeType === 'PORTION_GOODS'">
+          <div v-if="!fieldDisabled" style="display: flex; margin-bottom: 10px">
+            <el-button type="primary" @click="openSkuList">选择商品</el-button>
+            <el-button type="danger" plain style="margin-left: 10px" @click="delSelectGoods">
+              批量删除
+            </el-button>
+          </div>
+          <el-table
+            border
+            :data="form.promotionGoodsList"
+            style="width: 100%"
+            @selection-change="changeSelect"
+          >
+            <el-table-column
+              v-if="!fieldDisabled"
+              type="selection"
+              width="60"
+              align="center"
+            />
+            <el-table-column label="商品名称" min-width="220">
+              <template #default="{ row }">
+                <div v-if="row" class="goods-cell">
+                  <img v-if="row.thumbnail" :src="row.thumbnail" class="goods-thumb" alt="" />
+                  <a class="link-text mr_10 goods-name" @click="linkTo(row.goodsId, row.skuId)">
+                    {{ row.goodsName }}
+                  </a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="SKU编码" min-width="140" show-overflow-tooltip>
+              <template #default="{ row }">{{ row?.sn || "-" }}</template>
+            </el-table-column>
+            <el-table-column label="规格" min-width="140" show-overflow-tooltip>
+              <template #default="{ row }">{{ row?.simpleSpecs || "-" }}</template>
+            </el-table-column>
+            <el-table-column label="商品价格" width="110" align="right">
+              <template #default="{ row }">
+                <span v-if="row" :style="{ color: $mainColor }">
+                  {{ $filters.unitPrice(row.price, "￥") }}
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="库存" width="90" align="right">
+              <template #default="{ row }">
+                <span v-if="row">{{ row.quantity }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="!fieldDisabled" label="操作" width="100" align="right">
+              <template #default="{ $index }">
+                <a class="link-text" @click="delGoods($index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
       </el-card>
 
       <div class="foot-btn">
@@ -345,14 +376,10 @@
 import { computed, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import {
-  getShopCouponList,
   getFullDiscountById,
   newFullDiscount,
   editFullDiscount,
 } from "@/api/promotion";
-import { getGoodsSkuListDataSeller } from "@/api/goods";
-import { regular } from "@/utils";
-import { goodsTypeLabel } from "@/constants/goodsType";
 import { Message, Modal } from "@/utils/message";
 import { unixToDate } from "@/utils/filters";
 
@@ -361,57 +388,46 @@ defineOptions({ name: "add-full-discount" });
 const route = useRoute();
 const router = useRouter();
 
-const checkWeight = (rule, value, callback) => {
-  if (!value && typeof value !== "number") {
-    callback(new Error("优惠门槛不能为空"));
-  } else if (!regular.money.test(value)) {
-    callback(new Error("请输入正整数或者两位小数"));
-  } else if (parseFloat(value) > 99999999) {
-    callback(new Error("优惠门槛设置超过上限值"));
-  } else {
-    callback();
+const id = ref(route.query.id);
+const initialActivityType = String(route.query.activityType || "FULL_MINUS");
+
+function createEmptyTier(activityType) {
+  if (activityType === "FULL_RATE") {
+    return { fullMoney: 100, fullRate: 9.0 };
   }
-};
-const checkDiscount = (rule, value, callback) => {
-  if (value === null || value === undefined || value === "") {
-    callback(new Error("请填写优惠折扣"));
-  } else if (value < 0.1 || value > 9.9) {
-    callback(new Error("请输入0-10的数字,可有一位小数"));
-  } else {
-    callback();
+  if (activityType === "FULL_GIFT") {
+    return {
+      fullMoney: 100,
+      giftItems: [],
+    };
   }
-};
+  return { fullMoney: 100, fullMinus: 10 };
+}
 
 const form = ref({
-  discountType: "fullMinusFlag",
+  activityType: initialActivityType,
   scopeType: "ALL",
   promotionGoodsList: [],
   promotionStatus: "NEW",
+  description: "",
+  ruleList: [createEmptyTier(initialActivityType)],
 });
-const id = ref(route.query.id);
+
 const submitLoading = ref(false);
 const selectedGoods = ref([]);
-const couponList = ref([]);
-const giftList = ref([]);
-const giftLoading = ref(false);
-const couponLoading = ref(false);
+const pickerTargetTierIndex = ref(null);
+
 const formRule = {
   promotionName: [{ required: true, message: "活动名称不能为空" }],
   rangeTime: [{ required: true, message: "请选择活动时间" }],
-  fullMoney: [{ required: true, validator: checkWeight }],
-  fullMinus: [
-    { required: true, message: "请填写优惠金额" },
-    { pattern: regular.money, message: "请输入正确金额" },
-  ],
-  fullRate: [{ required: true, validator: checkDiscount }],
 };
+
 const options = {
   disabledDate(date) {
     return date && date.valueOf() < Date.now() - 86400000;
   },
 };
 
-// formRef：模板 ref 改名避免与顶层变量互相覆盖
 const formRef = ref(null);
 const liliDialogRef = ref(null);
 
@@ -419,23 +435,16 @@ const fieldDisabled = computed(() => {
   return !!id.value && form.value.promotionStatus !== "NEW";
 });
 
-const extraGifts = computed(() => {
-  const list = [];
-  if (form.value.freeFreightFlag) {
-    list.push("免邮费");
-  }
-  if (form.value.couponFlag) {
-    const coupon = couponList.value.find((item) => item.id === form.value.couponId);
-    list.push(`送优惠券${coupon ? `（${coupon.couponName}）` : ""}`);
-  }
-  if (form.value.giftFlag) {
-    const gift = giftList.value.find((item) => item.id === form.value.giftId);
-    list.push(`送赠品${gift ? `（${gift.goodsName}）` : ""}`);
-  }
-  if (form.value.pointFlag) {
-    list.push(`送积分（${form.value.point}）`);
-  }
-  return list;
+const activityTypeLabel = computed(() => {
+  if (form.value.activityType === "FULL_RATE") return "满折活动";
+  if (form.value.activityType === "FULL_GIFT") return "满赠活动";
+  return "满减活动";
+});
+
+const activityTagType = computed(() => {
+  if (form.value.activityType === "FULL_RATE") return "warning";
+  if (form.value.activityType === "FULL_GIFT") return "success";
+  return "danger";
 });
 
 onMounted(() => {
@@ -445,72 +454,225 @@ onMounted(() => {
     const now = new Date();
     form.value.rangeTime = [now, new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000)];
   }
-  getCouponList();
-  getGiftList();
 });
 
-function giftOptionLabel(item) {
-  if (!item) return "";
-  const typeLabel =
-    item.goodsType === "E_COUPON" ? ` [${goodsTypeLabel(item.goodsType)}]` : "";
-  const stock =
-    item.goodsType === "E_COUPON" && item.quantity != null
-      ? ` · 库存${item.quantity}`
-      : "";
-  return `${item.goodsName || ""}${typeLabel}${stock}`;
+function addTier() {
+  if (form.value.ruleList.length >= 3) return;
+  const lastTier = form.value.ruleList[form.value.ruleList.length - 1];
+  const nextMoney = lastTier && lastTier.fullMoney ? Number(lastTier.fullMoney) + 100 : 200;
+  if (form.value.activityType === "FULL_RATE") {
+    const prevRate = lastTier && lastTier.fullRate ? Number(lastTier.fullRate) : 9.0;
+    const nextRate = Math.max(0.1, Number((prevRate - 1.0).toFixed(1)));
+    form.value.ruleList.push({ fullMoney: nextMoney, fullRate: nextRate });
+  } else if (form.value.activityType === "FULL_GIFT") {
+    form.value.ruleList.push({
+      fullMoney: nextMoney,
+      giftItems: [],
+    });
+  } else {
+    const prevMinus = lastTier && lastTier.fullMinus ? Number(lastTier.fullMinus) : 10;
+    form.value.ruleList.push({ fullMoney: nextMoney, fullMinus: prevMinus + 10 });
+  }
 }
+
+function removeTier(index) {
+  if (form.value.ruleList.length <= 1) return;
+  form.value.ruleList.splice(index, 1);
+}
+
+function openGiftSkuPicker(tierIdx) {
+  pickerTargetTierIndex.value = tierIdx;
+  const tier = form.value.ruleList[tierIdx];
+  const currentGifts = ((tier && tier.giftItems) || [])
+    .filter((g) => g && g.skuId)
+    .map((g) => ({
+      ...g,
+      id: g.skuId,
+    }));
+  liliDialogRef.value.goodsData = JSON.parse(JSON.stringify(currentGifts));
+  liliDialogRef.value.open("goods");
+}
+
+function removeGiftFromTier(tier, index) {
+  if (!tier.giftItems) return;
+  tier.giftItems.splice(index, 1);
+}
+
+/**
+ * 赠品展示名称：优先使用商品选择器回填或后端快照的名称，缺失时回退显示 SKU ID。
+ * @param {object} giftItem 赠品项
+ * @returns {string} 展示名称
+ */
+function formatGiftDisplayName(giftItem) {
+  if (giftItem?.goodsName) return giftItem.goodsName;
+  return `SKU:${giftItem?.skuId || "-"}`;
+}
+
 function closeCurrentPage() {
   router.back();
 }
+
 function openSkuList() {
+  pickerTargetTierIndex.value = null;
   const data = JSON.parse(JSON.stringify(form.value.promotionGoodsList || []));
   data.forEach((e) => {
     e.id = e.skuId || e.id;
   });
-  // 先写入已选商品，再打开选择器，保证回显时 selectedWay 已就绪
   liliDialogRef.value.goodsData = data;
   liliDialogRef.value.open("goods");
 }
+
+function normalizeDetailRules(data) {
+  const type =
+    data.activityType ||
+    (data.fullRateFlag
+      ? "FULL_RATE"
+      : !data.fullMinusFlag && data.giftFlag
+        ? "FULL_GIFT"
+        : "FULL_MINUS");
+  data.activityType = type;
+
+  let rules = Array.isArray(data.ruleList) && data.ruleList.length ? data.ruleList : null;
+  if (!rules && data.rulesJson) {
+    try {
+      rules = JSON.parse(data.rulesJson);
+    } catch (e) {
+      rules = null;
+    }
+  }
+  if (!rules || !rules.length) {
+    if (type === "FULL_RATE") {
+      rules = [{ fullMoney: data.fullMoney || 100, fullRate: data.fullRate || 9.0 }];
+    } else if (type === "FULL_GIFT") {
+      const ids = String(data.giftId || "")
+        .split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
+      rules = [
+        {
+          fullMoney: data.fullMoney || 100,
+          giftItems: ids.map((skuId) => ({ skuId, goodsName: data.giftSkuName || "", num: 1 })),
+        },
+      ];
+    } else {
+      rules = [{ fullMoney: data.fullMoney || 100, fullMinus: data.fullMinus || 10 }];
+    }
+  }
+  rules.forEach((r) => {
+    if (type === "FULL_GIFT") {
+      // 赠品统一由商品选择器维护，过滤历史数据中的空 SKU 占位项
+      r.giftItems = (Array.isArray(r.giftItems) ? r.giftItems : []).filter((g) => g && g.skuId);
+    }
+  });
+  data.ruleList = rules;
+}
+
 function getDetail() {
   getFullDiscountById(id.value).then((res) => {
     const data = res.result;
     if (data.scopeType === "ALL") {
       data.promotionGoodsList = [];
     }
-    if (data.fullMinusFlag) {
-      data.discountType = "fullMinusFlag";
-      delete data.fullMinusFlag;
-    } else {
-      data.discountType = "fullRateFlag";
-      delete data.fullRateFlag;
-    }
+    normalizeDetailRules(data);
     data.rangeTime = [new Date(data.startTime), new Date(data.endTime)];
-    if (data.fullRate !== null && data.fullRate !== undefined && data.fullRate !== "") {
-      data.fullRate = parseFloat(Number(data.fullRate).toFixed(1));
-    }
     form.value = data;
+    if (data.activityType && route.query.activityType !== data.activityType) {
+      router.replace({
+        query: { ...route.query, activityType: data.activityType },
+      });
+    }
   });
 }
+
+function validateTiers(activityType, ruleList) {
+  if (!Array.isArray(ruleList) || ruleList.length < 1 || ruleList.length > 3) {
+    Message.warning("请配置 1 至 3 级阶梯优惠");
+    return false;
+  }
+  let prevMoney = 0;
+  let prevMinus = 0;
+  let prevRate = 10;
+
+  for (let i = 0; i < ruleList.length; i++) {
+    const tier = ruleList[i];
+    const label = `第 ${i + 1} 级阶梯`;
+    const money = Number(tier.fullMoney);
+    if (!money || money <= 0 || money > 99999999) {
+      Message.warning(`${label}：请填写有效的优惠门槛金额`);
+      return false;
+    }
+    if (i > 0 && money <= prevMoney) {
+      Message.warning(`${label}：优惠门槛金额必须大于上一级阶梯（>${prevMoney}元）`);
+      return false;
+    }
+    prevMoney = money;
+
+    if (activityType === "FULL_MINUS") {
+      const minus = Number(tier.fullMinus);
+      if (!minus || minus <= 0) {
+        Message.warning(`${label}：请填写有效的优惠金额`);
+        return false;
+      }
+      if (minus >= money) {
+        Message.warning(`${label}：优惠金额必须小于当前阶梯门槛金额`);
+        return false;
+      }
+      if (i > 0 && minus <= prevMinus) {
+        Message.warning(`${label}：优惠金额必须大于上一级阶梯（>${prevMinus}元）`);
+        return false;
+      }
+      prevMinus = minus;
+    } else if (activityType === "FULL_RATE") {
+      const rate = Number(tier.fullRate);
+      if (!rate || rate < 0.1 || rate > 9.9) {
+        Message.warning(`${label}：优惠折扣须在 0.1 至 9.9 折之间`);
+        return false;
+      }
+      if (i > 0 && rate >= prevRate) {
+        Message.warning(`${label}：折扣数值须小于上一级阶梯（<${prevRate}折），以保证折扣力度递增`);
+        return false;
+      }
+      prevRate = rate;
+    } else if (activityType === "FULL_GIFT") {
+      const gifts = tier.giftItems || [];
+      if (!gifts.length || gifts.length > 3) {
+        Message.warning(`${label}：请选择 1 至 3 个赠品`);
+        return false;
+      }
+      const seenSku = new Set();
+      for (let gIdx = 0; gIdx < gifts.length; gIdx++) {
+        const g = gifts[gIdx];
+        if (!g.skuId) {
+          Message.warning(`${label}：第 ${gIdx + 1} 个赠品尚未选择`);
+          return false;
+        }
+        if (seenSku.has(g.skuId)) {
+          Message.warning(`${label}：同一阶梯内不能重复选择相同的赠品 SKU`);
+          return false;
+        }
+        seenSku.add(g.skuId);
+        const num = Number(g.num);
+        if (!num || num < 1 || num > 10) {
+          Message.warning(`${label}：单个赠品赠送数量须在 1 至 10 件之间`);
+          return false;
+        }
+      }
+    }
+  }
+  return true;
+}
+
 function handleSubmit() {
   formRef.value.validate((valid) => {
     if (!valid) return;
+    if (!validateTiers(form.value.activityType, form.value.ruleList)) {
+      return;
+    }
+
     const params = JSON.parse(JSON.stringify(form.value));
     params.startTime = unixToDate(form.value.rangeTime[0] / 1000);
     params.endTime = unixToDate(form.value.rangeTime[1] / 1000);
 
-    if (params.couponFlag && !params.couponId) {
-      Message.warning("请选择优惠券");
-      return;
-    }
-    if (params.giftFlag && !params.giftId) {
-      Message.warning("请选择赠品");
-      return;
-    }
-    if (params.pointFlag && !params.point) {
-      Message.warning("请填写积分");
-      return;
-    }
-
     if (
       params.scopeType === "PORTION_GOODS" &&
       (!params.promotionGoodsList || params.promotionGoodsList.length === 0)
@@ -531,12 +693,28 @@ function handleSubmit() {
       });
       params.scopeId = scopeId.toString();
     }
-    if (params.discountType === "fullMinusFlag") {
+
+    // 同步首档冗余字段以保持接口兼容
+    const firstTier = params.ruleList[0];
+    params.fullMoney = firstTier.fullMoney;
+    if (params.activityType === "FULL_MINUS") {
       params.fullMinusFlag = true;
-    } else {
+      params.fullMinus = firstTier.fullMinus;
+      params.fullRateFlag = false;
+      params.giftFlag = false;
+    } else if (params.activityType === "FULL_RATE") {
+      params.fullMinusFlag = false;
       params.fullRateFlag = true;
+      params.fullRate = firstTier.fullRate;
+      params.giftFlag = false;
+    } else if (params.activityType === "FULL_GIFT") {
+      params.fullMinusFlag = false;
+      params.fullRateFlag = false;
+      params.giftFlag = true;
+      params.giftId = (firstTier.giftItems || []).map((g) => g.skuId).join(",");
     }
-    delete params.discountType;
+    params.rulesJson = JSON.stringify(params.ruleList);
+
     delete params.rangeTime;
     if (!id.value) {
       delete params.id;
@@ -546,18 +724,24 @@ function handleSubmit() {
 
     submitLoading.value = true;
     const request = id.value ? editFullDiscount(params) : newFullDiscount(params);
-    request.then((res) => {
-      submitLoading.value = false;
-      if (res.success) {
-        Message.success(id.value ? "编辑活动成功" : "添加活动成功");
-        closeCurrentPage();
-      }
-    });
+    request
+      .then((res) => {
+        submitLoading.value = false;
+        if (res.success) {
+          Message.success(id.value ? "编辑活动成功" : "添加活动成功");
+          closeCurrentPage();
+        }
+      })
+      .catch(() => {
+        submitLoading.value = false;
+      });
   });
 }
+
 function changeSelect(e) {
   selectedGoods.value = e;
 }
+
 function delSelectGoods() {
   if (selectedGoods.value.length <= 0) {
     Message.warning("您还未选择要删除的数据");
@@ -574,10 +758,43 @@ function delSelectGoods() {
     },
   });
 }
+
 function delGoods(index) {
   form.value.promotionGoodsList.splice(index, 1);
 }
+
 function selectedGoodsData(item) {
+  if (pickerTargetTierIndex.value !== null) {
+    const tier = form.value.ruleList[pickerTargetTierIndex.value];
+    pickerTargetTierIndex.value = null;
+    if (!tier) return;
+    let selectedList = Array.isArray(item) ? item : [];
+    if (selectedList.length > 3) {
+      Message.warning("每级阶梯最多只能选择 3 个赠品，已为您保留前 3 个");
+      selectedList = selectedList.slice(0, 3);
+    }
+    const prevNumMap = new Map(
+      (tier.giftItems || [])
+        .filter((g) => g && g.skuId)
+        .map((g) => [String(g.skuId), g.num || 1])
+    );
+    tier.giftItems = selectedList.map((e) => {
+      const skuId = e.id || e.skuId;
+      return {
+        skuId,
+        goodsId: e.goodsId,
+        goodsName: e.goodsName,
+        thumbnail: e.thumbnail || e.small,
+        simpleSpecs: e.simpleSpecs,
+        goodsType: e.goodsType,
+        price: e.price,
+        quantity: e.quantity,
+        num: prevNumMap.get(String(skuId)) || 1,
+      };
+    });
+    return;
+  }
+
   const list = [];
   item.forEach((e) => {
     list.push({
@@ -596,39 +813,6 @@ function selectedGoodsData(item) {
   });
   form.value.promotionGoodsList = list;
 }
-function getCouponList(query) {
-  const params = {
-    pageSize: 20,
-    pageNumber: 1,
-    getType: "ACTIVITY",
-    couponName: query,
-    promotionStatus: "START",
-  };
-  couponLoading.value = true;
-  getShopCouponList(params).then((res) => {
-    couponLoading.value = false;
-    if (res.success) {
-      couponList.value = res.result.records;
-    }
-  });
-}
-function getGiftList(query) {
-  const params = {
-    pageSize: 20,
-    pageNumber: 1,
-    id: query === form.value.giftId ? form.value.giftId : null,
-    goodsName: query === form.value.giftId ? null : query,
-    marketEnable: "UPPER",
-    authFlag: "PASS",
-  };
-  giftLoading.value = true;
-  getGoodsSkuListDataSeller(params).then((res) => {
-    giftLoading.value = false;
-    if (res.success) {
-      giftList.value = res.result.records;
-    }
-  });
-}
 </script>
 
 <style lang="scss" scoped>
@@ -642,6 +826,70 @@ function getGiftList(query) {
   font-size: 14px;
 }
 
+.tier-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.tier-block {
+  border: 1px dashed #dcdfe6;
+  border-radius: 6px;
+  padding: 16px 16px 4px;
+  margin-bottom: 14px;
+  background-color: #fafafa;
+
+  .tier-block-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 600;
+    font-size: 13px;
+    color: #303133;
+    margin-bottom: 12px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #ebeef5;
+  }
+}
+
+.inline-prefix {
+  margin-right: 8px;
+  color: #606266;
+}
+
+.inline-suffix {
+  margin-left: 8px;
+  color: #606266;
+}
+
+.gift-tier-panel {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  width: 100%;
+
+  .gift-item-row {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex-wrap: wrap;
+  }
+
+  .gift-tier-footer {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    flex-wrap: wrap;
+  }
+}
+
+.readonly-gift-list {
+  margin-top: 6px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+
 .goods-cell {
   display: flex;
   align-items: center;
@@ -668,17 +916,7 @@ function getGiftList(query) {
   margin-left: 10px;
   color: #999;
 }
-.describe-block {
-  margin-left: 0;
-  margin-top: 4px;
-  line-height: 1.5;
-  max-width: 260px;
-}
-.gift-field {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-}
+
 .link-text {
   color: #409eff;
   cursor: pointer;
@@ -694,10 +932,17 @@ function getGiftList(query) {
   margin-right: 8px;
 }
 
+.basic-form-control {
+  width: 420px;
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
 :deep(.full-discount-range-picker.el-date-editor--datetimerange) {
-  width: 380px;
-  max-width: 380px;
+  width: 420px;
+  max-width: 100%;
   flex-grow: 0;
-  --el-date-editor-width: 380px;
+  box-sizing: border-box;
+  --el-date-editor-width: 420px;
 }
 </style>
diff --git a/seller/src/views/promotion/full-discount/full-discount.vue b/seller/src/views/promotion/full-discount/full-discount.vue
index b15713eba..9896a560f 100644
--- a/seller/src/views/promotion/full-discount/full-discount.vue
+++ b/seller/src/views/promotion/full-discount/full-discount.vue
@@ -1,3 +1,8 @@
+<!--
+  满额活动列表页（支持满减活动 FULL_MINUS、满折活动 FULL_RATE、满赠活动 FULL_GIFT）
+  @author Bulbasaur
+  @since 2026-11-09
+-->
 <template>
   <div class="search full-cut">
     <el-card>
@@ -48,7 +53,7 @@
 
     <el-card>
       <div class="operation padding-row">
-        <el-button type="primary" @click="add">新增</el-button>
+        <el-button type="primary" @click="add">{{ addBtnText }}</el-button>
       </div>
       <el-table
         ref="table"
@@ -58,16 +63,27 @@
         class="mt_10"
         style="width: 100%"
       >
-        <el-table-column prop="promotionName" label="活动名称" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="startTime" label="开始时间" width="170" />
-        <el-table-column prop="endTime" label="结束时间" width="170" />
-        <el-table-column prop="storeName" label="店铺名称" min-width="100" show-overflow-tooltip />
-        <el-table-column label="活动类型" min-width="80">
+        <el-table-column prop="promotionName" label="活动名称" min-width="140" show-overflow-tooltip />
+        <el-table-column label="阶梯优惠规则" min-width="240" show-overflow-tooltip>
           <template #default="{ row }">
-            <span v-if="row">{{ row.fullMinusFlag ? "满减" : "满折" }}</span>
+            <span v-if="row">{{ formatRowRules(row) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="活动状态" min-width="100">
+        <el-table-column prop="startTime" label="开始时间" width="170" />
+        <el-table-column prop="endTime" label="结束时间" width="170" />
+        <el-table-column label="适用范围" width="100">
+          <template #default="{ row }">
+            <span v-if="row">{{ row.scopeType === "ALL" ? "全品类" : "指定商品" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动类型" width="90">
+          <template #default="{ row }">
+            <el-tag v-if="row" size="small" effect="plain" :type="activityTagType(row)">
+              {{ activityTypeText(row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" width="100">
           <template #default="{ row }">
             <el-tag v-if="row" :type="promotionStatusTagType(row.promotionStatus)">
               {{ promotionStatusText(row.promotionStatus) }}
@@ -106,13 +122,45 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
+import { computed, onMounted, reactive, ref, watch } from "vue";
+import { useRoute, useRouter } from "vue-router";
 import { getFullDiscountList, updateFullDiscount } from "@/api/promotion.js";
 import { Message, Modal } from "@/utils/message";
 
+const props = defineProps({
+  /**
+   * 固定活动子类型（FULL_MINUS-满减，FULL_RATE-满折，FULL_GIFT-满赠）
+   */
+  defaultActivityType: {
+    type: String,
+    default: "",
+  },
+});
+
+const route = useRoute();
 const router = useRouter();
 
+const currentActivityType = computed(() => {
+  if (props.defaultActivityType) {
+    return props.defaultActivityType;
+  }
+  const routePath = String(route.path || "");
+  const routeName = String(route.name || "");
+  if (routePath.includes("full-rate") || routeName.includes("full-rate")) {
+    return "FULL_RATE";
+  }
+  if (routePath.includes("full-gift") || routeName.includes("full-gift")) {
+    return "FULL_GIFT";
+  }
+  return "FULL_MINUS";
+});
+
+const addBtnText = computed(() => {
+  if (currentActivityType.value === "FULL_RATE") return "新增满折活动";
+  if (currentActivityType.value === "FULL_GIFT") return "新增满赠活动";
+  return "新增满减活动";
+});
+
 const selectDate = ref([]);
 const total = ref(0);
 const loading = ref(false);
@@ -121,16 +169,72 @@ const searchForm = reactive({
   pageSize: 20,
   sort: "createTime",
   order: "desc",
+  promotionName: "",
+  promotionStatus: "",
 });
 const data = ref([]);
-
-// searchFormRef：模板 ref 改名避免与 searchForm 变量互相覆盖
 const searchFormRef = ref(null);
 
+watch(currentActivityType, () => {
+  searchForm.pageNumber = 1;
+  getDataList();
+});
+
 onMounted(() => {
   init();
 });
 
+function resolveRowType(row) {
+  if (row?.activityType) return row.activityType;
+  if (row?.fullRateFlag) return "FULL_RATE";
+  if (!row?.fullMinusFlag && row?.giftFlag) return "FULL_GIFT";
+  return "FULL_MINUS";
+}
+
+function activityTypeText(row) {
+  const type = resolveRowType(row);
+  if (type === "FULL_RATE") return "满折";
+  if (type === "FULL_GIFT") return "满赠";
+  return "满减";
+}
+
+function activityTagType(row) {
+  const type = resolveRowType(row);
+  if (type === "FULL_RATE") return "warning";
+  if (type === "FULL_GIFT") return "success";
+  return "danger";
+}
+
+function formatRowRules(row) {
+  if (row?.title) return row.title;
+  if (row?.rulesJson) {
+    try {
+      const rules = JSON.parse(row.rulesJson);
+      if (Array.isArray(rules) && rules.length) {
+        const type = resolveRowType(row);
+        return rules
+          .map((r) => {
+            if (type === "FULL_RATE") return `满${r.fullMoney}元打${r.fullRate}折`;
+            if (type === "FULL_GIFT") {
+              const count = Array.isArray(r.giftItems) ? r.giftItems.length : 1;
+              return `满${r.fullMoney}元赠${count}种商品`;
+            }
+            return `满${r.fullMoney}元减${r.fullMinus}元`;
+          })
+          .join("；");
+      }
+    } catch (e) {
+      // ignore
+    }
+  }
+  if (row?.fullMoney != null) {
+    if (row.fullRateFlag) return `满${row.fullMoney}元打${row.fullRate}折`;
+    if (row.giftFlag) return `满${row.fullMoney}元享赠品`;
+    return `满${row.fullMoney}元减${row.fullMinus}元`;
+  }
+  return "-";
+}
+
 function promotionStatusText(status) {
   const map = {
     NEW: "未开始",
@@ -156,18 +260,16 @@ function init() {
 }
 
 function openOrClose(row) {
-  let name = "开启";
   if (row.promotionStatus === "NEW" || row.promotionStatus === "START") {
-    name = "关闭";
     Modal.confirm({
       title: "提示",
-      content: `确认${name}此活动吗?需要一定时间才能生效，请耐心等待`,
+      content: "确认关闭此活动吗？需要一定时间才能生效，请耐心等待",
       loading: true,
       onOk: () => {
         updateFullDiscount(row.id).then((res) => {
           Modal.remove();
           if (res.success) {
-            Message.success(`${name}成功`);
+            Message.success("关闭成功");
             getDataList();
           }
         });
@@ -200,7 +302,11 @@ function getDataList() {
     searchForm.startTime = null;
     searchForm.endTime = null;
   }
-  getFullDiscountList(searchForm).then((res) => {
+  const query = {
+    ...searchForm,
+    activityType: currentActivityType.value,
+  };
+  getFullDiscountList(query).then((res) => {
     loading.value = false;
     if (res.success) {
       data.value = res.result.records;
@@ -210,11 +316,17 @@ function getDataList() {
 }
 
 function add() {
-  router.push({ name: "full-discount-detail" });
+  router.push({
+    name: "full-discount-detail",
+    query: { activityType: currentActivityType.value },
+  });
 }
 
 function goDetail(row) {
-  router.push({ name: "full-discount-detail", query: { id: row.id } });
+  router.push({
+    name: "full-discount-detail",
+    query: { id: row.id, activityType: resolveRowType(row) },
+  });
 }
 </script>
 
diff --git a/seller/src/views/promotion/full-discount/full-gift.vue b/seller/src/views/promotion/full-discount/full-gift.vue
new file mode 100644
index 000000000..c67d0bf1d
--- /dev/null
+++ b/seller/src/views/promotion/full-discount/full-gift.vue
@@ -0,0 +1,14 @@
+<!--
+  商家端-满赠活动列表页
+  @author Bulbasaur
+  @since 2026-11-09
+-->
+<template>
+  <FullDiscountList default-activity-type="FULL_GIFT" />
+</template>
+
+<script setup>
+import FullDiscountList from "./full-discount.vue";
+
+defineOptions({ name: "store-full-gift" });
+</script>
diff --git a/seller/src/views/promotion/full-discount/full-rate.vue b/seller/src/views/promotion/full-discount/full-rate.vue
new file mode 100644
index 000000000..ef3565741
--- /dev/null
+++ b/seller/src/views/promotion/full-discount/full-rate.vue
@@ -0,0 +1,14 @@
+<!--
+  商家端-满折活动列表页
+  @author Bulbasaur
+  @since 2026-11-09
+-->
+<template>
+  <FullDiscountList default-activity-type="FULL_RATE" />
+</template>
+
+<script setup>
+import FullDiscountList from "./full-discount.vue";
+
+defineOptions({ name: "store-full-rate" });
+</script>
diff --git a/seller/src/views/shop/wap/decorate.vue b/seller/src/views/shop/wap/decorate.vue
index 50b91f682..0b098465b 100644
--- a/seller/src/views/shop/wap/decorate.vue
+++ b/seller/src/views/shop/wap/decorate.vue
@@ -433,9 +433,15 @@
                 <!-- 当选择完活动之后的其他回调 -->
                 <span v-if="item.url.___type == 'marketing'">
                   <span v-if="item.url.___promotion == 'SECKILL'"> 秒杀 </span>
-                  <span v-if="item.url.___promotion == 'FULL_DISCOUNT'">
+                  <span v-if="item.url.___promotion == 'FULL_DISCOUNT' || item.url.___promotion == 'FULL_MINUS'">
                     满减
                   </span>
+                  <span v-if="item.url.___promotion == 'FULL_RATE'">
+                    满折
+                  </span>
+                  <span v-if="item.url.___promotion == 'FULL_GIFT'">
+                    满赠
+                  </span>
                   <span v-if="item.url.___promotion == 'PINTUAN'"> 拼团 </span>
                   {{ item.url.title || item.url.goodsName }}</span>
                 <!-- 当选择完活动之后的其他回调 -->