+ 满 {{ tier.fullMoney }} 元，赠送以下商品：
+
+
+
+ {{ formatGiftDisplayName(g) }} × {{ g.num || 1 }}件
+
+
+
+ 
-
-
+ 阶梯优惠设置（最多支持 3 级阶梯）
+
+ 添加阶梯（{{ form.ruleList.length }}/3）
+
+
-
-
-
-
-
- 减现金
- 打折
-
-
-
-
-
-
-
- 免邮费
- 送优惠券
- 送赠品
- 送积分
-
-
-
-
-
-
-
-
-
-
-
- 全品类
- 指定商品
-
-
-
-
-
-
-
- 电子卡券赠品支付后自动发卡；卡池不足时仅取消赠品子单，不影响主订单。
-
- 选择商品
-
- 批量删除
+
+
+ 全品类
+ 指定商品
+
+
+ 同一时段内全品类活动互斥；指定商品活动只要所选商品不重叠即可同时开启
+
+
+
+
+
+
+
+
+
+ {{ row?.sn || "-" }}
+
+
+ {{ row?.simpleSpecs || "-" }}
+
+
+
+
+ {{ $filters.unitPrice(row.price, "￥") }}
+
+
+
+
+
+ {{ row.quantity }}
+
+
+
+
+ 删除
+
+
+
+
+
+ 满
+
+
+
+
+ 减
+
+
+
+
+ 打
+
+
+
+
+
+
+
+
+ 第 {{ tierIdx + 1 }} 级阶梯
+
+ 删除此阶梯
+
+
+
+
+ 选择商品
+
+ 批量删除
+
+
+
+ ![]()
+
+ {{ row.goodsName }}
+
+
+
+
@@ -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;
- }
- });
-}
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 @@
+
@@ -48,7 +53,7 @@
-
+
- {{ row.fullMinusFlag ? "满减" : "满折" }}
+ {{ formatRowRules(row) }}
-
+
+
+ {{ row.scopeType === "ALL" ? "全品类" : "指定商品" }}
+
+
+
+
+
+ {{ activityTypeText(row) }}
+
+
+
+
{{ promotionStatusText(row.promotionStatus) }}
@@ -106,13 +122,45 @@
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 @@
+
+
+
- 新增
+ {{ addBtnText }}