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 @@ 注册赠券 精准发券 自动赠券 + 创建券礼包 查看 + | + 推广码 @@ -70,6 +73,22 @@ @size-change="changePageSize" /> + + + + + 正在生成推广二维码... + + + + + H5 访问链接: + {{ qrCodeInfo.h5Url }} + + 复制 H5 访问链接 + + + @@ -77,7 +96,7 @@ + + diff --git a/seller/src/views/stock/outbound/list.vue b/seller/src/views/stock/outbound/list.vue new file mode 100644 index 000000000..7607c121b --- /dev/null +++ b/seller/src/views/stock/outbound/list.vue @@ -0,0 +1,339 @@ + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + 新建出库单 + + + + + + + + + {{ statusText(row.status) }} + + + + + + + + + 查看 + + | + 编辑 + | + 提交 + + + | + 审核 + + + | + 作废 + + + + + + + + + + + + + + + {{ currentOutbound?.outboundSn }} + + + {{ currentOutbound?.totalQuantity }} + + + + 通过(扣减库存) + 驳回 + + + + + + + + 取消 + 确定 + + + + + + + + diff --git a/seller/src/views/stock/outbound/operation.vue b/seller/src/views/stock/outbound/operation.vue new file mode 100644 index 000000000..8f94efa30 --- /dev/null +++ b/seller/src/views/stock/outbound/operation.vue @@ -0,0 +1,375 @@ + + + + + + + {{ pageTitle }} + 返回列表 + + + + + + + {{ detail.outboundSn || "-" }} + + {{ statusText(detail.status) }} + + {{ detail.reasonName || "-" }} + {{ detail.totalQuantity ?? "-" }} + {{ detail.createBy || "-" }} + {{ detail.createTime || "-" }} + {{ detail.auditBy || "-" }} + {{ detail.auditTime || "-" }} + + {{ detail.auditRemark }} + + {{ detail.remark || "-" }} + + + 出库商品明细 + + + + + + + {{ row.specs || "-" }} + + + + {{ row.unit || "-" }} + + + {{ row.remark || "-" }} + + + + + + + + + + + + + + + + + + + + + + + 出库商品明细 + 选择商品 + + + + + + + + {{ row.specs || "-" }} + + + + + + + + + + + + + + + + + + + 删除 + + + + + + 出库品种数:{{ items.length }} + 合计出库数量:{{ totalQuantity }} + + + + + + + + + + + + + +