From 792229a11b231e2c8357b3190f5bb4dda9c5d64e Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 12 Nov 2026 16:25:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(promotion,stock):=20=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=B5=81=E6=B0=B4=E6=9F=A5=E8=AF=A2=E5=8F=8A=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E7=A4=BC=E5=8C=85=E6=8E=A8=E5=B9=BF=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + manager/src/api/promotion.js | 5 + .../coupon-activity/coupon-publish.vue | 6 +- .../promotions/coupon-activity/coupon.vue | 72 +++- seller/src/api/stock.js | 26 ++ seller/src/libs/seller-navigation.js | 1 + seller/src/views/stock/flow/list.vue | 235 +++++++++++ seller/src/views/stock/outbound/list.vue | 339 ++++++++++++++++ seller/src/views/stock/outbound/operation.vue | 375 ++++++++++++++++++ 9 files changed, 1059 insertions(+), 2 deletions(-) create mode 100644 seller/src/api/stock.js create mode 100644 seller/src/views/stock/flow/list.vue create mode 100644 seller/src/views/stock/outbound/list.vue create mode 100644 seller/src/views/stock/outbound/operation.vue diff --git a/README.md b/README.md index 45ffc2fc6..f6b1a16de 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,8 @@ lilishop-ui | 时间 | 功能模块 | 完成内容 | | :--- | :--- | :--- | +| 2026-11-12 | 优惠券礼包 | 支持券礼包活动创建、多券组合打包、管理端 H5 推广二维码生成及链接复制。 | +| 2026-11-12 | 出库单 / 库存流水 | 支持商家端出库单管理(录入、审核与作废)及商品库存流水台账。 | | 2026-11-06 | 提货卡 | 支持提货卡活动与候选商品配置、制卡发卡、兑换核销及使用记录管理。 | | 2026-11-05 | 付费会员 | 单一付费会员、开通与续费、有效期、关联权益、商家与商品折扣、平台补贴及付费记录。 | | 2026-11-04 | 客户等级体系 / 客户权益 | 等级配置、权益介绍、经验值任务与明细、权益发放及重试,提供默认等级与权益数据。 | diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index c220dbbc4..4073436be 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -147,6 +147,11 @@ export const getCouponActivityList = params => { return getRequest("/promotion/couponActivity", params); }; // 关闭优惠券活动 +// 获取优惠券礼包H5推广二维码及链接 +export const getCouponPackageQrCode = (id, params) => { + return getRequest(`/promotion/couponActivity/package/qrcode/${id}`, params); +}; + export const closeActivity = id => { return deleteRequest(`/promotion/couponActivity/${id}`); }; diff --git a/manager/src/views/promotions/coupon-activity/coupon-publish.vue b/manager/src/views/promotions/coupon-activity/coupon-publish.vue index 541a5f9de..debe996f5 100644 --- a/manager/src/views/promotions/coupon-activity/coupon-publish.vue +++ b/manager/src/views/promotions/coupon-activity/coupon-publish.vue @@ -202,7 +202,11 @@ const form = reactive({ watch( () => route.query.couponActivityType, (type) => { - if (["REGISTERED", "SPECIFY", "AUTO_COUPON"].includes(type)) { + if (["REGISTERED", "SPECIFY", "AUTO_COUPON", "COUPON_PACKAGE"].includes(type)) { + if (type === "COUPON_PACKAGE") { + form.couponFrequencyEnum = "DAY"; + form.activityScope = "ALL"; + } form.couponActivityType = type; } }, diff --git a/manager/src/views/promotions/coupon-activity/coupon.vue b/manager/src/views/promotions/coupon-activity/coupon.vue index 33b626d9a..93219feea 100644 --- a/manager/src/views/promotions/coupon-activity/coupon.vue +++ b/manager/src/views/promotions/coupon-activity/coupon.vue @@ -5,6 +5,7 @@ 注册赠券 精准发券 自动赠券 + 创建券礼包