diff --git a/buyer/src/api/cart.js b/buyer/src/api/cart.js index 4e77ab1a..60499586 100644 --- a/buyer/src/api/cart.js +++ b/buyer/src/api/cart.js @@ -65,7 +65,7 @@ export function addCartGoods (params) { /** * 创建交易 * @param client 客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端 - * @param way 购物车购买：CART/立即购买：BUY_NOW / 积分购买：POINT + * @param way 购物车：CART / 立即购买：BUY_NOW / 积分：POINTS / 拼团：PINTUAN / 砍价：KANJIA * @param remark 备注 非必填 */ export function createTrade (data) { @@ -81,7 +81,7 @@ export function createTrade (data) { /** * 选择优惠券 * @param memberCouponId 优惠券id - * @param way 购物车购买：CART/立即购买：BUY_NOW/ 积分购买：POINT + * @param way 购物车：CART / 立即购买：BUY_NOW / 积分：POINTS * @param used 使用true 弃用 false */ export function selectCoupon (params) { @@ -95,7 +95,7 @@ export function selectCoupon (params) { /** * 选择礼品卡 - * @param way 购物车购买：CART/立即购买：BUY_NOW/拼团购买：PINTUAN / 积分购买：POINT + * @param way 购物车：CART / 立即购买：BUY_NOW / 拼团：PINTUAN / 积分：POINTS / 砍价：KANJIA * @param credentialId 礼品卡凭证 id；used=false 且不传则清空全部 * @param used 使用 true / 弃用 false */ diff --git a/buyer/src/api/goods.js b/buyer/src/api/goods.js index 76fe0d03..1cba631b 100644 --- a/buyer/src/api/goods.js +++ b/buyer/src/api/goods.js @@ -33,12 +33,13 @@ export function goodsDetail (goodsId) { }); } -// id获取商品Sku详情 +// id获取商品Sku详情（支持未登录浏览，登录后可选携带 token） export function goodsSkuDetail (params) { return request({ url: `/buyer/goods/goods/sku/${params.goodsId}/${params.skuId}`, method: Method.GET, - needToken: true, + needToken: false, + optionalToken: true, params }); } diff --git a/buyer/src/api/pay.js b/buyer/src/api/pay.js index 0b0d2e02..12246a6e 100644 --- a/buyer/src/api/pay.js +++ b/buyer/src/api/pay.js @@ -24,12 +24,13 @@ export function tradeDetail (params) { * @param payClient 调起方式 可用值：APP,NATIVE,JSAPI,H5 * @param sn 订单编号 */ -export function pay (params) { +export function pay (params, config = {}) { return request({ url: `/buyer/payment/cashier/pay/${params.paymentMethod}/${params.paymentClient}`, needToken: true, method: Method.GET, - params + params, + skipMessage: !!config.skipMessage, }); } diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js index 05bdf3d1..0e5fb90e 100644 --- a/buyer/src/api/shopentry.js +++ b/buyer/src/api/shopentry.js @@ -46,7 +46,8 @@ export function applyThird (params) { export function getDetailById (id) { return request({ url: `/buyer/store/store/get/detail/${id}`, - needToken: true, + needToken: false, + optionalToken: true, method: Method.GET }) } diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 74cc4f6c..2e74b747 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -44,7 +44,14 @@
{{ skuDetail.goodsName }} + 电子卡券 + + @@ -85,7 +92,7 @@
-
+
价     格 @@ -158,6 +165,36 @@
+ +
+

+ 促     销 + 限时折扣 + + 享 {{ promotionMap["DISCOUNT"].discount }} 折 + +

+
+ +
+

+ 促     销 + 第N件 + + 第 {{ promotionMap["NTH"].nthNum || promotionMap["NTH"].num }} 件优惠 + +

+
+ +
+

+ 拼     团 + 拼团价 + + {{ $filters.unitPrice(promotionMap["PINTUAN"].price, "￥") }} + +

+

@@ -222,7 +259,6 @@

-
@@ -238,14 +274,16 @@ :precision="0" @blur="changeCount" > -   库存{{ skuDetail.quantity }} +   库存{{ displayStock }}
@@ -279,19 +317,35 @@
加入购物车 + 拼团购买 立即购买 + @@ -320,6 +374,18 @@ import { } from "@/api/member.js"; import { addCartGoods } from "@/api/cart.js"; import playIcon from "@/assets/iconfont/play.svg"; +/** 卡密商品（E_COUPON）判定与库存工具，见 @/constants/goodsType */ +import { + isECoupon, + getECouponStock, + getECouponMaxBuyNum, + createEmptyPromotionMap, + resolveECouponCartType, + eCouponAfterSaleHint, + E_COUPON_CART_BUY_NOW, + E_COUPON_CART_PINTUAN, + E_COUPON_CART_POINTS, +} from "@/constants/goodsType"; export default { name: "ShowGoods", @@ -362,15 +428,11 @@ export default { specList: [], }, // sku详情 goodsSpecList: this.detail.specs, // 商品spec - promotionMap: { - // 活动状态 - SECKILL: null, - FULL_DISCOUNT: null, - COUPON: [], - }, // 促销活动 + promotionMap: createEmptyPromotionMap(), formatList: [], // 选择商品品类的数组 loading: false, // 立即购买loading loading1: false, // 加入购物车loading + loadingPintuan: false, isCollected: false, // 是否收藏 }; }, @@ -397,15 +459,32 @@ export default { }) : []; }, + /** 卡密商品：禁加购，仅立即购买；库存读 quantity（M-02 起支持促销） */ + isECouponGoods() { + return isECoupon(this.skuDetail.goodsType); + }, + displayStock() { + if (this.isECouponGoods) { + return getECouponStock(this.skuDetail); + } + return Number(this.skuDetail.quantity) || 0; + }, quantityMax() { + if (this.isECouponGoods) { + return getECouponMaxBuyNum(this.skuDetail); + } const qty = Number(this.skuDetail.quantity) || 0; return qty > 0 ? qty : 1; }, isOutOfStock() { + if (this.isECouponGoods) { + return getECouponStock(this.skuDetail) <= 0; + } return (Number(this.skuDetail.quantity) || 0) <= 0; }, }, methods: { + eCouponAfterSaleHint, // 初始化video initVideo(){ if(!this.goodsVideo ){ @@ -425,17 +504,20 @@ export default { syncCountWithQuantity() { - const qty = Number(this.skuDetail.quantity) || 0; + const qty = this.isECouponGoods + ? getECouponStock(this.skuDetail) + : Number(this.skuDetail.quantity) || 0; if (qty <= 0) { this.count = 1; return; } - if (this.wholesaleList && this.wholesaleList.length > 0) { + if (!this.isECouponGoods && this.wholesaleList && this.wholesaleList.length > 0) { this.count = Math.min(Math.max(this.wholesaleList[0].num, 1), qty); return; } - if (this.count > qty) { - this.count = qty; + const max = this.isECouponGoods ? getECouponMaxBuyNum(this.skuDetail) : qty; + if (this.count > max) { + this.count = max; } else if (this.count < 1) { this.count = 1; } @@ -471,6 +553,11 @@ export default { }, addShoppingCartBtn() { + // FR-B-01：E_COUPON 禁止加购物车（后端亦返回 CARD_KEY_E_COUPON_CART_FORBIDDEN） + if (this.isECouponGoods) { + Message.warning("电子卡券请使用立即购买"); + return; + } // 添加购物车 const params = { num: this.count, @@ -500,20 +587,32 @@ export default { }); }, buyNow() { - // 立即购买 + this.startCheckout(E_COUPON_CART_BUY_NOW, "loading1"); + }, + pintuanBuy() { + this.startCheckout(E_COUPON_CART_PINTUAN, "loadingPintuan"); + }, + pointPay() { + this.startCheckout(E_COUPON_CART_POINTS, "loading"); + }, + startCheckout(action, loadingKey) { const params = { num: this.count, skuId: this.skuDetail.id, cartType: "BUY_NOW", }; - // 虚拟商品购买 if (this.skuDetail.goodsType === "VIRTUAL_GOODS") { params.cartType = "VIRTUAL"; + } else if (this.isECouponGoods) { + params.cartType = resolveECouponCartType({ + routeWay: this.$route.query.way, + action, + }); } - this.loading1 = true; + this[loadingKey] = true; addCartGoods(params) .then((res) => { - this.loading1 = false; + this[loadingKey] = false; if (res.success) { this.$router.push({ path: "/pay", @@ -524,7 +623,7 @@ export default { } }) .catch(() => { - this.loading1 = false; + this[loadingKey] = false; }); }, async collect() { @@ -602,16 +701,20 @@ export default { }); }, promotion() { - this.promotionMap = {SECKILL: null, FULL_DISCOUNT: null, COUPON: []}; - // 格式化促销活动，返回当前促销的对象 - if (!this.detail.promotionMap) return false; - let keysArr = Object.keys(this.detail.promotionMap); + this.promotionMap = createEmptyPromotionMap(); + if (!this.detail || !this.detail.promotionMap) return false; + const keysArr = Object.keys(this.detail.promotionMap); if (keysArr.length === 0) return false; for (let i = 0; i < keysArr.length; i++) { - let key = keysArr[i].split("-")[0]; + const key = keysArr[i].split("-")[0]; if (key === "COUPON") { - this.promotionMap[key].push(this.detail.promotionMap[keysArr[i]]); + if (!Array.isArray(this.promotionMap.COUPON)) { + this.promotionMap.COUPON = []; + } + this.promotionMap.COUPON.push(this.detail.promotionMap[keysArr[i]]); + } else if (Object.prototype.hasOwnProperty.call(this.promotionMap, key)) { + this.promotionMap[key] = this.detail.promotionMap[keysArr[i]]; } else { this.promotionMap[key] = this.detail.promotionMap[keysArr[i]]; } @@ -630,8 +733,8 @@ export default { }, }, mounted() { - // 用户登录才会判断是否收藏 - if (this.Cookies.getItem("userInfo")) { + // 用户登录才会判断是否收藏（须同时有 token，避免残留 userInfo 触发 401 跳转登录） + if (this.Cookies.getItem("accessToken") && this.Cookies.getItem("userInfo")) { isCollection("GOODS", this.skuDetail.id).then((res) => { if (res.success && res.result) { this.isCollected = true; @@ -958,6 +1061,22 @@ export default { border-top: 1px dotted $border_color; } +.e-coupon-after-sale-notice { + width: fit-content; + max-width: 420px; + flex: 0 0 auto; + padding: 4px 10px; + + :deep(.el-alert__content) { + padding: 0; + } + + :deep(.el-alert__title) { + font-size: 12px; + line-height: 1.5; + } +} + .add-buy-car-row { margin-top: 25px; diff --git a/buyer/src/constants/goodsType.js b/buyer/src/constants/goodsType.js new file mode 100644 index 00000000..70f27872 --- /dev/null +++ b/buyer/src/constants/goodsType.js @@ -0,0 +1,208 @@ +/** + * 卡密商品（E_COUPON / 电子卡券）— 买家端公共常量与工具 + * + * 与 VIRTUAL_GOODS（核销型虚拟）区分：E_COUPON 常规促销走 BUY_NOW， + * 特殊活动走 PINTUAN / POINTS / KANJIA；禁止 CART / VIRTUAL。 + * 需求：lilishop/docs/requirements/card-key-goods-v4.md · M-02 + * + * @author Mike + * @date 2026-07-31 + */ +export const E_COUPON_GOODS_TYPE = "E_COUPON"; +export const E_COUPON_ORDER_TYPE = "E_COUPON"; + +/** 单次购买数量上限（O-09 默认：min(quantity, 999)） */ +export const E_COUPON_MAX_BUY_NUM = 999; + +/** 常规立即购买（秒杀/满减/券/限时/第N件等） */ +export const E_COUPON_CART_BUY_NOW = "BUY_NOW"; +export const E_COUPON_CART_PINTUAN = "PINTUAN"; +export const E_COUPON_CART_POINTS = "POINTS"; +export const E_COUPON_CART_KANJIA = "KANJIA"; + +export function isECoupon(goodsType) { + return goodsType === E_COUPON_GOODS_TYPE; +} + +export function isECouponOrder(orderType) { + return orderType === E_COUPON_ORDER_TYPE; +} + +/** 详情页提示：卡密交付后不支持买家售后（FR-B-04） */ +export const E_COUPON_AFTER_SALE_HINT = + "卡密交付后不支持买家售后，请确认商品信息后再购买。"; + +export function eCouponAfterSaleHint() { + return E_COUPON_AFTER_SALE_HINT; +} + +/** 可售库存：E_COUPON 读 SKU quantity（由卡池 syncSkuStock 同步） */ +export function getECouponStock(sku) { + if (!sku) return 0; + return Number(sku.quantity) || 0; +} + +export function getECouponMaxBuyNum(sku) { + const stock = getECouponStock(sku); + if (stock <= 0) return 1; + return Math.min(stock, E_COUPON_MAX_BUY_NUM); +} + +/** + * 解析 E_COUPON 结算 cartType / way + * @param {object} opts + * @param {string} [opts.routeWay] 路由 query.way + * @param {'BUY_NOW'|'PINTUAN'|'POINTS'|'KANJIA'} [opts.action] 用户点击的购买入口 + */ +export function resolveECouponCartType({ routeWay, action } = {}) { + if (action === E_COUPON_CART_PINTUAN) return E_COUPON_CART_PINTUAN; + if (action === E_COUPON_CART_POINTS) return E_COUPON_CART_POINTS; + if (action === E_COUPON_CART_KANJIA) return E_COUPON_CART_KANJIA; + if (action === E_COUPON_CART_BUY_NOW) return E_COUPON_CART_BUY_NOW; + const way = routeWay ? String(routeWay).toUpperCase() : ""; + if (way === "KANJIA") return E_COUPON_CART_KANJIA; + if (way === "PINTUAN") return E_COUPON_CART_PINTUAN; + if (way === "POINT" || way === "POINTS") return E_COUPON_CART_POINTS; + return E_COUPON_CART_BUY_NOW; +} + +/** 详情页 promotionMap 初始结构（切换 SKU 时完整重置） */ +export function createEmptyPromotionMap() { + return { + SECKILL: null, + FULL_DISCOUNT: null, + COUPON: [], + DISCOUNT: null, + NTH: null, + PINTUAN: null, + KANJIA: null, + }; +} + +/** 卡密履约状态（与后端 CardKeyFulfillStatusEnum 一致） */ +export const CARD_KEY_FULFILL_STATUS = { + PENDING: "PENDING", + DELIVERED: "DELIVERED", + FAILED: "FAILED", + NOT_APPLICABLE: "NOT_APPLICABLE", +}; + +export const CARD_KEY_FULFILL_STATUS_TEXT = { + PENDING: "待发放", + DELIVERED: "已发放", + FAILED: "发放失败", + NOT_APPLICABLE: "不适用", +}; + +export function cardKeyFulfillAlertType(status) { + const map = { + PENDING: "info", + DELIVERED: "success", + FAILED: "warning", + }; + return map[status] || "info"; +} + +export function formatCardKeyFulfillStatus(status) { + return CARD_KEY_FULFILL_STATUS_TEXT[status] || status || "—"; +} + +export function resolveCardKeyFulfillMessage(line) { + if (line && line.message) return line.message; + return formatCardKeyFulfillStatus(line?.status); +} + +export function isCardKeyFulfillApplicable(item) { + if (!item) return false; + const status = item.cardKeyFulfillStatus; + if (status) return status !== CARD_KEY_FULFILL_STATUS.NOT_APPLICABLE; + if (item.cardKeyDelivered != null || (item.cardKeys && item.cardKeys.length)) return true; + return item.goodsType === E_COUPON_GOODS_TYPE; +} + +function normalizeCardKeyFulfillLine(source) { + const status = + source.cardKeyFulfillStatus || + (source.cardKeyDelivered + ? CARD_KEY_FULFILL_STATUS.DELIVERED + : CARD_KEY_FULFILL_STATUS.PENDING); + const cardKeys = + status === CARD_KEY_FULFILL_STATUS.DELIVERED && source.cardKeyDelivered + ? source.cardKeys || [] + : []; + return { + key: source.sn || source.orderSn || source.id || source.skuId, + goodsName: source.goodsName, + status, + message: source.cardKeyFulfillMessage, + cardKeys, + isGift: !!source.isGift, + }; +} + +/** 汇总当前订单 orderItems 中的卡密履约行（不含满赠子单；赠品卡密在赠品子单详情单独查看） */ +export function collectCardKeyFulfillLines(orderItems = []) { + const lines = []; + (orderItems || []).forEach((item) => { + if (!isCardKeyFulfillApplicable(item)) return; + lines.push(normalizeCardKeyFulfillLine(item)); + }); + return lines; +} + +export function orderHasCardKeySection({ orderItems, isECouponOrder } = {}) { + if (isECouponOrder) return true; + if (collectCardKeyFulfillLines(orderItems).length > 0) return true; + return (orderItems || []).some( + (item) => + item.goodsType === E_COUPON_GOODS_TYPE || + (Array.isArray(item.cardKeys) && item.cardKeys.length > 0) + ); +} + +export function flattenCardKeyFulfillLines(lines, withGoodsName = false) { + const rows = []; + (lines || []).forEach((line) => { + if (line.status !== CARD_KEY_FULFILL_STATUS.DELIVERED) return; + (line.cardKeys || []).forEach((ck) => { + rows.push(withGoodsName ? { ...ck, goodsName: line.goodsName } : { ...ck }); + }); + }); + return rows; +} + +/** 当前订单是否含已交付卡密（仅 orderItems，不含满赠子单） */ +export function orderHasCardKeyContent(orderItems) { + return flattenCardKeyFulfillLines(collectCardKeyFulfillLines(orderItems)).length > 0; +} + +/** 扁平化当前订单 orderItems 卡密 */ +export function flattenOrderCardKeys(orderItems, withGoodsName = false) { + const lines = collectCardKeyFulfillLines(orderItems); + if (lines.some((line) => line.status)) { + return flattenCardKeyFulfillLines(lines, withGoodsName); + } + const rows = []; + (orderItems || []).forEach((item) => { + if (!item.cardKeyDelivered || !item.cardKeys || !item.cardKeys.length) return; + item.cardKeys.forEach((ck) => { + rows.push(withGoodsName ? { ...ck, goodsName: item.goodsName } : { ...ck }); + }); + }); + return rows; +} + +/** createTrade 后是否无需进入收银台（积分单 / 0 元 / 服务端已标记） */ +export function shouldSkipPaymentPage(tradeResult, way) { + if (!tradeResult) return false; + if (way === E_COUPON_CART_POINTS) return true; + if (tradeResult.needPay === false || tradeResult.paid === true) return true; + const price = + tradeResult.price != null + ? Number(tradeResult.price) + : tradeResult.flowPrice != null + ? Number(tradeResult.flowPrice) + : null; + if (price != null && !Number.isNaN(price) && price <= 0) return true; + return false; +} diff --git a/buyer/src/main.js b/buyer/src/main.js index ebfcc214..7c284225 100644 --- a/buyer/src/main.js +++ b/buyer/src/main.js @@ -13,6 +13,7 @@ import storage from "@/plugins/storage"; import { fetchAndApplyTheme } from "@/utils/theme"; import { getThemeSetting } from "@/api/common.js"; import config from "@/config"; +import { openLink } from "@/utils/buyerLogin"; const { aMapSecurityJsCode, inputMaxLength } = config; @@ -36,12 +37,7 @@ app.config.globalProperties.Cookies = storage; app.config.globalProperties.$inputMaxLength = inputMaxLength; app.config.globalProperties.linkTo = function (url) { - if (!url) return; - if (url.substr(0, 1) === "/") { - window.open(location.origin + url, "_blank"); - } else { - window.open(url, "_blank"); - } + openLink(url, router); }; app.config.globalProperties.connectCs = function ( diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index 98b5b567..938cef40 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -248,6 +248,7 @@ import Promotion from "@/components/goodsDetail/Promotion"; import Search from "@/components/Search"; import * as APICart from "@/api/cart"; import * as APIMember from "@/api/member"; +import { isECoupon } from "@/constants/goodsType"; export default { name: "Cart", beforeRouteEnter(to, from, next) { @@ -407,11 +408,20 @@ export default { }, // 跳转支付页面 pay() { - if (this.checkedNum) { - this.$router.push({ path: "/pay", query: { way: "CART" } }); - } else { + if (!this.checkedNum) { Message.warning("请至少选择一件商品"); + return; } + const hasECoupon = this.cartList.some((shop) => + (shop.skuList || []).some( + (goods) => goods.checked && isECoupon(goods.goodsSku && goods.goodsSku.goodsType) + ) + ); + if (hasECoupon) { + Message.warning("电子卡券请使用立即购买，不可通过购物车结算"); + return; + } + this.$router.push({ path: "/pay", query: { way: "CART" } }); }, // 展示优惠券 showCoupon(storeId, index) { diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index ecaf8060..cf281726 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -140,8 +140,8 @@ export default { if (!this.goodsMsg.data.intro) { this.goodsMsg.data.intro = '' } - // 判断是否收藏 - if (this.Cookies.getItem("userInfo")) { + // 判断是否收藏（须同时有 token，避免未登录/ token 失效时误跳登录页） + if (this.Cookies.getItem("accessToken") && this.Cookies.getItem("userInfo")) { isStoreCollection("STORE", this.goodsMsg.data.storeId).then((res) => { if (res.success && res.result) { this.storeCollected = true; diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 6cd061a3..8644a133 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -80,9 +80,16 @@ > 自营 + + + 电子卡券 + 虚拟 @@ -118,6 +125,7 @@ import { Message } from "@/utils/message"; import { ArrowDown, ArrowUp } from '@element-plus/icons-vue'; import GoodsClassNav from "@/components/nav/GoodsClassNav"; import * as apiGoods from "@/api/goods"; +import { isBuyerLoggedIn, redirectToLogin } from "@/utils/buyerLogin"; export default { name: "GoodsList", beforeRouteEnter(to, from, next) { @@ -194,12 +202,15 @@ export default { this.getGoodsList(); }, goGoodsDetail(skuId, goodsId) { - // 跳转商品详情 - let routeUrl = this.$router.resolve({ + const location = { path: "/goodsDetail", query: { skuId, goodsId }, - }); - window.open(routeUrl.href, "_blank"); + }; + if (!isBuyerLoggedIn()) { + redirectToLogin(this.$router, location); + return; + } + window.open(this.$router.resolve(location).href, "_blank"); }, goShopPage(id) { if (!id) { @@ -281,13 +292,24 @@ export default { } .goods-show-tag { - height: 18px; - width: 32px; - line-height: 14px; - white-space: nowrap; - text-align: center; + display: inline-flex; align-items: center; - padding: 0 3px; + justify-content: center; + height: 18px; + min-width: 32px; + width: auto; + line-height: 1; + white-space: nowrap; + padding: 0 4px; + box-sizing: border-box; + + :deep(.el-tag__content) { + line-height: 1; + } +} + +.goods-show-tag-ecoupon { + padding: 0 5px; } .goods-show-tag-self { diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue index 98cb7762..da9db604 100644 --- a/buyer/src/pages/Login.vue +++ b/buyer/src/pages/Login.vue @@ -197,6 +197,7 @@ export default { mobile: "", }, verifyStatus: false, // 是否图片验证通过 + codeSent: false, // 是否已成功发送短信验证码 ruleInline: { // 验证规则 username: [{required: true, message: "请输入用户名"}], @@ -237,7 +238,15 @@ export default { if (this.type) { this.$refs.verify?.init(); } else { - let data = JSON.parse(JSON.stringify(this.formSms)); + if (!this.verifyStatus) { + Message.warning("请先完成安全验证"); + return; + } + if (!this.codeSent) { + Message.warning("请先获取短信验证码"); + return; + } + const data = JSON.parse(JSON.stringify(this.formSms)); apiLogin.smsLogin(data).then((res) => { this.hideVerify(); if (res.success) { @@ -262,7 +271,7 @@ export default { } else { Message.error(res.message); } - }); + }).catch(() => {}); } } }); @@ -285,6 +294,7 @@ export default { sendSms(params).then((res) => { if (res.success) { Message.success("验证码发送成功"); + this.codeSent = true; let that = this; this.interval = setInterval(() => { that.time--; @@ -292,6 +302,7 @@ export default { that.time = 60; that.codeMsg = "重新发送"; that.verifyStatus = false; + that.codeSent = false; clearInterval(that.interval); } else { that.codeMsg = that.time; @@ -300,7 +311,7 @@ export default { } else { Message.warning(res.message); } - }); + }).catch(() => {}); } }, verifyChange(con) { @@ -453,11 +464,19 @@ export default { this.$refs.formSms.resetFields(); } this.verifyStatus = false; + this.codeSent = false; this.hideVerify(); clearInterval(this.interval); this.codeMsg = "发送验证码"; this.time = 60; }, + "formSms.mobile"() { + this.codeSent = false; + this.verifyStatus = false; + clearInterval(this.interval); + this.codeMsg = "发送验证码"; + this.time = 60; + }, }, }; diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue index 79b5f296..96e456ba 100644 --- a/buyer/src/pages/home/orderCenter/MyOrder.vue +++ b/buyer/src/pages/home/orderCenter/MyOrder.vue @@ -72,8 +72,8 @@ 取消订单 去支付 确认收货 - - + 申请售后
@@ -141,8 +141,8 @@ 取消订单 去支付 确认收货 - - + 申请售后
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 7389b04a..1ce29e45 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -30,7 +30,7 @@ >取消订单 查看物流 -

+

核验码：{{ order.order.verificationCode }}

@@ -51,7 +51,7 @@ >
-
+

收货人信息

收货人：{{ order.order.consigneeName }}

手机号码：{{ $filters.secrecyMobile( order.order.consigneeMobile ) }}

@@ -70,7 +70,7 @@

支付方式：{{ order.paymentMethodValue }}

付款状态：{{ order.payStatusValue }}

-
+

配送信息

配送方式：{{ order.deliveryMethodValue }}

配送状态：{{ order.deliverStatusValue }}

@@ -132,6 +132,51 @@
未开发票
+ +
+

卡密信息

+
+ + +
+ + 复制全部卡密 + +
+
@@ -144,8 +189,8 @@ 货号 单价 数量 - 退款状态 - 实际退款金额 + 退款状态 + 实际退款金额 小计 操作 @@ -170,8 +215,8 @@ {{ goods.id }} {{ $filters.unitPrice(goods.goodsPrice, "￥") }} {{ goods.num }} - {{refundPriceList(goods.isRefund)}} - {{ $filters.unitPrice(goods.refundPrice, "￥") }} + {{refundPriceList(goods.isRefund)}} + {{ $filters.unitPrice(goods.refundPrice, "￥") }} {{ $filters.unitPrice((goods.goodsPrice * goods.num), "￥") }} 商品总价：{{ $filters.unitPrice(order.order.goodsPrice, "￥") }}
-
+
运费：+{{ $filters.unitPrice(order.order.freightPrice, "￥") }}
@@ -319,6 +365,19 @@ 取消
+ + + +
+

卡号：{{ row.cardNo }}

+

卡密：{{ row.cardSecret }}

+ 复制 +
+ +
@@ -333,6 +392,19 @@ import { getPackage } from "@/api/order.js"; import { afterSaleReason, receiptDetail } from "@/api/member"; +import { + isECouponOrder as checkECouponOrder, + collectCardKeyFulfillLines, + orderHasCardKeySection, + flattenOrderCardKeys, + cardKeyFulfillAlertType, + resolveCardKeyFulfillMessage, +} from "@/constants/goodsType"; + +/** + * 订单详情：E_COUPON 展示 orderItems[].cardKeys，屏蔽售后/物流（FR-B-03 / FR-B-04）。 + * 移动端已完成订单用 Dialog 查看卡密（原型 P-09 / D-01）。 + */ export default { name: "order-detail", data() { @@ -340,6 +412,7 @@ export default { order: {}, // 订单详情数据 progressList: [], // 订单流程 logistics: "", // 物流数据 + cardKeyDialogVisible: false, cancelParams: { // 取消售后参数 orderSn: "", @@ -352,7 +425,63 @@ export default { logisticsModal: false, }; }, + computed: { + /** 电子卡券订单：无物流/核验码，卡密数据来自 API-B-01 orderItems[].cardKeys */ + isECouponOrder() { + return checkECouponOrder(this.order?.order?.orderType); + }, + isVirtualOrder() { + return this.order?.order?.orderType === "VIRTUAL"; + }, + isNonPhysicalOrder() { + return this.isVirtualOrder || this.isECouponOrder; + }, + /** 是否展示卡密区块（仅当前订单 orderItems） */ + hasCardKeySection() { + return orderHasCardKeySection({ + orderItems: this.order.orderItems, + isECouponOrder: this.isECouponOrder, + }); + }, + cardKeyFulfillLines() { + return collectCardKeyFulfillLines(this.order.orderItems); + }, + ecouponCardKeyRows() { + return flattenOrderCardKeys(this.order.orderItems, false); + }, + }, methods: { + cardKeyFulfillAlertType, + resolveCardKeyFulfillMessage, + lineCardKeyRows(line) { + return line.cardKeys || []; + }, + copyCardKey(row) { + const text = `卡号：${row.cardNo || ""}\n卡密：${row.cardSecret || ""}`; + this.copyText(text); + }, + copyAllCardKeys() { + const text = this.ecouponCardKeyRows + .map((row, i) => `${i + 1}. 卡号：${row.cardNo || ""} 卡密：${row.cardSecret || ""}`) + .join("\n"); + this.copyText(text || ""); + }, + copyText(text) { + if (!text) return; + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(text).then(() => { + Message.success("已复制到剪贴板"); + }); + } else { + const ta = document.createElement("textarea"); + ta.value = text; + document.body.appendChild(ta); + ta.select(); + document.execCommand("copy"); + document.body.removeChild(ta); + Message.success("已复制到剪贴板"); + } + }, isVatSpecialReceipt (receipt) { if (!receipt) return false; const rt = receipt.receiptType != null ? String(receipt.receiptType).trim() : ""; @@ -660,6 +789,38 @@ table { color: $theme_color; } } + +.ecoupon-card-keys-mobile { + display: none; +} + +.ecoupon-fulfill-block + .ecoupon-fulfill-block { + margin-top: 16px; + padding-top: 16px; + border-top: 1px dashed #eee; +} + +.ecoupon-card-keys-pc { + display: block; +} + +.card-key-mobile-item { + padding: 12px 0; + border-bottom: 1px solid #eee; + p { + margin: 4px 0; + word-break: break-all; + } +} + +@media (max-width: 768px) { + .ecoupon-card-keys-mobile { + display: block; + } + .ecoupon-card-keys-pc { + display: none; + } +} /** 订单进度条 */ .progress { margin: 15px 0; diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 81cf558e..757d8722 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -18,7 +18,8 @@
-
+ +
收货人信息 管理收货人地址 @@ -94,7 +95,7 @@
-
+
配送方式
@@ -150,8 +151,8 @@
- -
+ +
发票信息 开企业抬头发票须填写纳税人识别号，以免影响报销 @@ -283,13 +284,13 @@
提交订单
-
+
配送至：{{ $filters.unitAddress(selectedAddress.consigneeAddressPath) }} {{ selectedAddress.detail }}  收货人：{{ selectedAddress.name }}  {{ selectedAddress.mobile }}
-
+
自提地点：{{selectedStoreAddress.address}}   联系方式：{{ selectedStoreAddress.mobile }}
@@ -328,6 +329,7 @@ import { } from "@/api/cart"; import { getStoreAddress } from "@/api/shopentry.js" import { canUseCouponList } from "@/api/member.js"; +import { isECoupon, shouldSkipPaymentPage } from "@/constants/goodsType"; export default { name: "Pay", @@ -377,6 +379,14 @@ export default { ); return Number.isFinite(n) ? n : 0; }, + /** 电子卡券结算：免地址、隐藏发票；优惠券/礼品卡/促销明细可用（M-02） */ + isECouponCheckout() { + return isECoupon(this.goodsType); + }, + /** 虚拟型结算（核销虚拟 + 电子卡券）：均不需要收货地址 */ + isVirtualLikeCheckout() { + return this.goodsType === "VIRTUAL_GOODS" || this.isECouponCheckout; + }, }, data() { return { @@ -845,19 +855,24 @@ export default { .then((res) => { Spin.hide(); if (res.success) { - if (params.way === "POINTS") { - // 积分支付不需要跳转支付页面 + const way = params.way; + if (shouldSkipPaymentPage(res.result, way)) { this.$router.push("/payDone"); - } else { - this.$router.push({ - path: "/payment", - query: { orderType: "TRADE", sn: res.result.sn }, - }); + return; } + this.$router.push({ + path: "/payment", + query: { orderType: "TRADE", sn: res.result.sn }, + }); + } else if (res.message) { + Message.warning(res.message); } }) - .catch(() => { + .catch((err) => { Spin.hide(); + if (err?.message && !err?.data?.message) { + Message.error(err.message); + } }); }, // 优惠券可用范围 diff --git a/buyer/src/pages/payment/PayMent.vue b/buyer/src/pages/payment/PayMent.vue index 4a23be0b..2e0c6048 100644 --- a/buyer/src/pages/payment/PayMent.vue +++ b/buyer/src/pages/payment/PayMent.vue @@ -37,7 +37,7 @@ diff --git a/buyer/src/pages/promotion/PointGoodsDetail.vue b/buyer/src/pages/promotion/PointGoodsDetail.vue index 5d55378a..8e5cbe92 100644 --- a/buyer/src/pages/promotion/PointGoodsDetail.vue +++ b/buyer/src/pages/promotion/PointGoodsDetail.vue @@ -2,18 +2,14 @@
-
首页 - {{goodsMsg.pointsGoodsCategoryName}} + {{ goodsMsg.pointsGoodsCategoryName }}
-
-
-
-
-

{{ goodsSku.goodsName }}

+
+

{{ goodsSku.goodsName }}

+ 电子卡券 +
- {{goodsSku.sellingPoint}} + {{ goodsSku.sellingPoint }}
-
-

积     分 - {{goodsMsg.points}} + {{ goodsMsg.points }}

@@ -55,25 +51,37 @@

数量

- - 库存{{goodsSku.quantity}} + + 库存{{ displayStock }}
-
+

重量

- {{goodsSku.weight}}kg + {{ goodsSku.weight }}kg
- 积分购买 + 积分购买
-
商品介绍
@@ -86,101 +94,140 @@ + diff --git a/manager/src/constants/cardKey.js b/manager/src/constants/cardKey.js new file mode 100644 index 00000000..453824a3 --- /dev/null +++ b/manager/src/constants/cardKey.js @@ -0,0 +1,19 @@ +/** + * 卡密商品（E_COUPON）— 平台端订单展示用常量 + * + * 平台不管理卡池明文（S-04）；本模块仅用于订单详情卡密状态文案。 + * + * @author Mike + * @date 2026-07-31 + */ +/** 卡密状态文案（与后端 CardKeyStatusEnum 一致） */ +export const CARD_KEY_STATUS_TEXT = { + UNUSED: "未使用", + ALLOCATED: "已分配", + RESERVED: "已预占", + VOIDED: "已作废", +}; + +export function formatCardKeyStatus(status) { + return CARD_KEY_STATUS_TEXT[status] || status || "—"; +} diff --git a/manager/src/constants/goodsType.js b/manager/src/constants/goodsType.js new file mode 100644 index 00000000..ee8660f2 --- /dev/null +++ b/manager/src/constants/goodsType.js @@ -0,0 +1,35 @@ +/** + * 卡密商品（E_COUPON）— 平台端公共常量 + * + * @author Mike + * @date 2026-08-02 + */ +export const E_COUPON_GOODS_TYPE = "E_COUPON"; + +export function isECoupon(goodsType) { + return goodsType === E_COUPON_GOODS_TYPE; +} + +export function goodsTypeLabel(goodsType) { + const map = { + E_COUPON: "电子卡券", + VIRTUAL_GOODS: "虚拟商品", + PHYSICAL_GOODS: "实物商品", + }; + return map[goodsType] || goodsType || "—"; +} + +export function goodsTypeTagType(goodsType) { + if (goodsType === E_COUPON_GOODS_TYPE) return "warning"; + if (goodsType === "VIRTUAL_GOODS") return "info"; + return ""; +} + +export function eCouponStockHint(goodsType) { + if (!isECoupon(goodsType)) return ""; + return "库存来自卡池同步（quantity）"; +} + +export function promotionPriceMin(goodsType) { + return isECoupon(goodsType) ? 0 : 0.01; +} diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue index b1626744..9064e3ea 100644 --- a/manager/src/views/goods/goods-info/goods.vue +++ b/manager/src/views/goods/goods-info/goods.vue @@ -53,6 +53,8 @@ > + + @@ -385,7 +387,8 @@ export default { goodsTypeText(v) { if (v === "PHYSICAL_GOODS") return "实物商品"; if (v === "VIRTUAL_GOODS") return "虚拟商品"; - return "电子卡券"; + if (v === "E_COUPON") return "电子卡券"; // 卡密商品 + return v || "—"; }, marketEnableText(v) { if (v === "DOWN") return "下架"; diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue index ab28264c..7c9b9e73 100644 --- a/manager/src/views/order/order/orderDetail.vue +++ b/manager/src/views/order/order/orderDetail.vue @@ -8,7 +8,7 @@ 订单取消 收款 订单日志 - 打印发货单 + 打印发货单
@@ -90,7 +90,7 @@
-
+
收货信息：
{{ orderInfo.order.consigneeName }} @@ -165,7 +165,7 @@
--> -
+
配送方式：
{{ orderInfo.deliveryMethodValue }} @@ -217,6 +217,41 @@ + + +
+

卡密信息

+ + + + + + + + + + + + + +
+
  • @@ -280,7 +315,7 @@ {{item.promotionName}}：| ¥{{ unitPrice(item.discountPrice) }}
    • --> -
  • +
  • 运费： {{ unitPrice(orderInfo.order.freightPrice, "￥") @@ -440,6 +475,7 @@ import vueQr from "vue-qr"; import { printElement } from "@/utils/print"; import { ElMessage, ElMessageBox } from "element-plus"; import { unitPrice, clientTypeWay } from "@/utils/filters"; +import { formatCardKeyStatus } from "@/constants/cardKey"; export default { name: "orderList", components: { @@ -447,6 +483,32 @@ export default { multipleMap, "vue-qr": vueQr, }, + computed: { + /** 电子卡券订单：无物流区，卡密来自 orderItems[].cardKeys */ + isECouponOrder() { + const t = this.orderInfo?.order?.orderType; + return t === "E_COUPON" || this.$route.query.orderType === "E_COUPON"; + }, + isVirtualOrder() { + const t = this.orderInfo?.order?.orderType; + return t === "VIRTUAL" || this.$route.query.orderType === "VIRTUAL"; + }, + isNonPhysicalOrder() { + return this.isVirtualOrder || this.isECouponOrder; + }, + ecouponCardKeyDelivered() { + return (this.data || []).some((item) => item.cardKeyDelivered); + }, + ecouponCardKeyRows() { + const rows = []; + (this.data || []).forEach((item) => { + (item.cardKeys || []).forEach((ck) => { + rows.push({ ...ck }); + }); + }); + return rows; + }, + }, data () { return { typeList: [], @@ -546,6 +608,23 @@ export default { methods: { unitPrice, clientTypeWay, + formatCardKeyStatus, + copyCardKey(row) { + const text = `卡号：${row.cardNo || ""}\n卡密：${row.cardSecret || ""}`; + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(text).then(() => { + ElMessage.success("已复制到剪贴板"); + }); + } else { + const ta = document.createElement("textarea"); + ta.value = text; + document.body.appendChild(ta); + ta.select(); + document.execCommand("copy"); + document.body.removeChild(ta); + ElMessage.success("已复制到剪贴板"); + } + }, getPromotionText(row) { let resultText = ""; if (row && row.promotionType) { diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-add-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-add-goods.vue index e064b141..bb2ccbb0 100644 --- a/manager/src/views/promotions/kanjia/kanjia-activity-add-goods.vue +++ b/manager/src/views/promotions/kanjia/kanjia-activity-add-goods.vue @@ -105,6 +105,7 @@ import { saveKanJiaActivityGoods } from "@/api/promotion"; import { regular } from "@/utils"; import skuSelect from "@/components/lili-dialog"; +import { isECoupon } from "@/constants/goodsType"; export default { name: "add-kanjia-activity-goods", @@ -175,6 +176,7 @@ export default { let checkResult = true; this.form.promotionGoodsList.forEach((res) => { + const eCoupon = isECoupon(res.goodsType); if (res.stock <= 0 || res.stock > res.quantity) { checkResult = false; this.$Message.error("活动库存不能为0且不能超过商品库存"); @@ -186,9 +188,16 @@ export default { this.$Message.error("结算价格金额格式不正确"); return; } - if (res.settlementPrice < 0 || res.settlementPrice > res.price) { + if ( + (eCoupon ? res.settlementPrice < 0 : res.settlementPrice <= 0) || + res.settlementPrice > res.price + ) { checkResult = false; - this.$Message.error("结算价格金额不能为0且不能超过商品价格"); + this.$Message.error( + eCoupon + ? "结算价格不能小于0且不能超过商品价格" + : "结算价格金额不能为0且不能超过商品价格" + ); return; } if (!regular.money.test(res.highestPrice)) { @@ -206,9 +215,9 @@ export default { this.$Message.error("最低可砍金额格式错误"); return; } - if (res.lowestPrice <= 0 || res.lowestPrice > res.price) { + if (res.lowestPrice < 0 || (!eCoupon && res.lowestPrice <= 0) || res.lowestPrice > res.price) { checkResult = false; - this.$Message.error("最低可砍金额不能为0"); + this.$Message.error(eCoupon ? "最低可砍金额不能小于0" : "最低可砍金额不能为0"); return; } if (parseInt(res.lowestPrice) > parseInt(res.highestPrice)) { @@ -277,6 +286,7 @@ export default { storeId: e.storeId, storeName: e.storeName, skuId: e.id, + goodsType: e.goodsType, }); }); this.form.promotionGoodsList = list; diff --git a/manager/src/views/promotions/kanjia/kanjia-activity-edit-goods.vue b/manager/src/views/promotions/kanjia/kanjia-activity-edit-goods.vue index 43ece4f4..ad432847 100644 --- a/manager/src/views/promotions/kanjia/kanjia-activity-edit-goods.vue +++ b/manager/src/views/promotions/kanjia/kanjia-activity-edit-goods.vue @@ -90,6 +90,7 @@ + + diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue index f564ae40..56aa8cdc 100644 --- a/seller/src/views/goods/goods-seller/goods.vue +++ b/seller/src/views/goods/goods-seller/goods.vue @@ -53,6 +53,8 @@ > + + @@ -148,7 +150,7 @@ - + @@ -196,6 +203,7 @@ import { getGoodsListData, getGoodsNumerData, + getQueryGoodsIdGoodsList, upGoods, lowGoods, } from "@/api/goods"; @@ -252,7 +260,34 @@ export default { goodsTypeText(v) { if (v === "PHYSICAL_GOODS") return "实物商品"; if (v === "VIRTUAL_GOODS") return "虚拟商品"; - return "电子卡券"; + if (v === "E_COUPON") return "电子卡券"; // 卡密商品 + return v || "—"; + }, + /** 跳转卡池管理；单 SKU 商品默认取第一个 SKU（card-key-pool 需 skuId） */ + async goCardKeyPool(row) { + let skuId = row.skuId; + if (!skuId) { + try { + const res = await getQueryGoodsIdGoodsList(row.id); + if (res.success && res.result?.length) { + skuId = res.result[0].id; + } else { + this.$message.warning("该商品暂无 SKU，请先完善商品规格"); + return; + } + } catch { + this.$message.error("获取商品规格失败"); + return; + } + } + this.$router.push({ + path: "/card-key-pool", + query: { + skuId, + goodsId: row.id, + goodsName: row.goodsName, + }, + }); }, marketEnableText(v) { if (v === "DOWN") return "下架"; diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue index df7a6bb0..8bb67f9d 100644 --- a/seller/src/views/goods/goods-seller/goodsOperation.vue +++ b/seller/src/views/goods/goods-seller/goodsOperation.vue @@ -1,58 +1,31 @@ diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index ec94a0ae..bd110fd1 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -8,12 +8,37 @@

    基本信息

    - - {{ - baseInfoForm.categoryName[0] - }} - > {{ baseInfoForm.categoryName[1] }} - > {{ baseInfoForm.categoryName[2] }} + + + +
    + {{ item.label }} + {{ item.desc }} +
    +     +     +
    {{ currentGoodsTypeDesc }}
    +     + + @@ -44,7 +69,7 @@ @@ -52,7 +77,7 @@ 批发型 - 虚拟型 + {{ isECouponGoods ? "电子卡券" : "虚拟型" }} + + +
    -
    +

    商品物流信息

    @@ -486,7 +519,6 @@
    - 上一步 {{ $route.query.id ? "保存" : "保存商品" }} @@ -513,7 +545,7 @@ @selected="(list) => { selectedImage = list }" /> @@ -552,6 +584,28 @@ export default { type: Object, }, }, + computed: { + /** 卡密商品：库存只读展示 quantity，提交时 quantity 传 0（FR-S-01 / P-02） */ + isECouponGoods() { + return this.baseInfoForm.goodsType === "E_COUPON"; + }, + isVirtualGoods() { + return this.baseInfoForm.goodsType === "VIRTUAL_GOODS"; + }, + isVirtualLikeGoods() { + return this.isVirtualGoods || this.isECouponGoods; + }, + /** 仅实物需要运费模板；E_COUPON 强制 templateId=0（§6.1） */ + needsLogistics() { + return this.baseInfoForm.goodsType === "PHYSICAL_GOODS"; + }, + currentGoodsTypeDesc() { + const matched = this.goodsTypeOptions.find( + (item) => item.value === this.baseInfoForm.goodsType + ); + return matched ? matched.desc : ""; + }, + }, data() { // 表单验证项，商品价格 const checkPrice = (rule, value, callback) => { @@ -584,6 +638,16 @@ export default { accessToken: "", //令牌token goodsParams: [], categoryId: "", // 商品分类第三级id + /** 商品类型选项 */ + goodsTypeOptions: [ + { label: "实物商品", value: "PHYSICAL_GOODS", desc: "零售批发，物流配送" }, + { label: "虚拟商品", value: "VIRTUAL_GOODS", desc: "虚拟核验，无需物流" }, + { label: "电子卡券", value: "E_COUPON", desc: "卡密自动发卡，无需物流" }, + ], + /** 商城分类级联数据 */ + categoryList: [], + /** 商城分类选中值 [一级id, 二级id, 三级id] */ + selectedCategory: [], //提交状态 submitLoading: false, //上传图片路径 @@ -705,6 +769,8 @@ export default { /** 存储未通过校验的单元格位置 */ validateError: [], baseInfoFormRule: { + goodsType: [{ required: true, message: "请选择商品类型", trigger: "change" }], + categoryPath: [{ required: true, message: "请选择商品分类", trigger: "change" }], goodsName: [regular.REQUIRED, regular.WHITE_SPACE, regular.VARCHAR60], price: [regular.REQUIRED, { validator: checkPrice }], sellingPoint: [regular.REQUIRED, regular.VARCHAR60], @@ -759,11 +825,22 @@ export default { } }, methods: { + /** E_COUPON 提交固定传 0，真实库存由卡池 syncSkuStock 同步至 quantity */ + resolveSubmitQuantity(sku) { + if (this.isECouponGoods) { + return 0; + } + return sku.quantity; + }, + defaultSkuQuantity() { + return this.isECouponGoods ? 0 : ""; + }, draggableItemKey(item) { return item; }, // 选择图片modal handleCLickImg(val, index) { + this.selectedImage = []; this.picModelFlag = true; this.selectedFormBtnName = val; this.$nextTick(() => { @@ -793,22 +870,60 @@ export default { desc: "视频大小不能超过10MB", }); }, + parseOssSelectionUrl(item) { + if (!item) return ""; + if (typeof item === "string") { + const index = item.indexOf(","); + return index >= 0 ? item.slice(index + 1) : item; + } + return item.url || ""; + }, // 图片选择后回调 callbackSelected(val) { this.picModelFlag = false; - if (val && this.selectedFormBtnName == 'selectedSkuImages') { - this.selectedSku.images.push(val); + if (!val?.url) { + return; + } + if (this.selectedFormBtnName === "selectedSkuImages") { + if (!this.selectedSku.images) { + this.selectedSku.images = []; + } + this.selectedSku.images.push(val.url); } else { this.baseInfoForm[this.selectedFormBtnName].push(val.url); } - }, confirmUrls() { - if (this.selectedImage && this.selectedFormBtnName == 'selectedSkuImages') { - this.selectedSku.images = [...this.selectedSku.images, ...this.selectedImage]; - } else { - this.baseInfoForm[this.selectedFormBtnName] = [...this.baseInfoForm[this.selectedFormBtnName], ...this.selectedImage]; + const urls = (this.selectedImage || []) + .map((item) => this.parseOssSelectionUrl(item)) + .filter(Boolean); + if (!urls.length) { + this.$Message.warning("请选择图片"); + return; } + if (this.selectedFormBtnName === "selectedSkuImages") { + if (!this.selectedSku.images) { + this.selectedSku.images = []; + } + urls.forEach((url) => { + if (this.selectedSku.images.length < 5) { + this.selectedSku.images.push(url); + } + }); + } else if (this.selectedFormBtnName === "goodsGalleryFiles") { + urls.forEach((url) => { + if (this.baseInfoForm.goodsGalleryFiles.length < 5) { + this.baseInfoForm.goodsGalleryFiles.push(url); + } + }); + } else if (this.selectedFormBtnName) { + const target = this.baseInfoForm[this.selectedFormBtnName]; + if (Array.isArray(target)) { + urls.forEach((url) => target.push(url)); + } + } + this.selectedImage = []; + this.picModelFlag = false; }, // 局部刷新 refresh(v) { @@ -913,9 +1028,79 @@ export default { }); } }, - pre() { - // 上一步 - this.$parent.activestep--; + /** 加载商城商品分类树 */ + loadCategoryList() { + return API_GOODS.getGoodsCategoryAll().then((res) => { + if (res.success && res.result) { + this.categoryList = this.formatCategoryTree(res.result); + this.syncSelectedCategoryFromPath(); + } + }); + }, + formatCategoryTree(list) { + return (list || []).map((item) => ({ + value: String(item.id), + label: item.name, + children: (item.children || []).map((child) => ({ + value: String(child.id), + label: child.name, + children: (child.children || []).map((grandson) => ({ + value: String(grandson.id), + label: grandson.name, + })), + })), + })); + }, + syncSelectedCategoryFromPath() { + const path = this.baseInfoForm.categoryPath; + if (!path) { + return; + } + const ids = path.split(",").filter(Boolean).map(String); + if (ids.length >= 3) { + this.selectedCategory = ids; + this.categoryId = ids[2]; + } + }, + getCategoryNames(ids) { + const names = []; + let options = this.categoryList; + ids.forEach((id) => { + const found = (options || []).find((item) => item.value === id); + if (found) { + names.push(found.label); + options = found.children || []; + } + }); + return names; + }, + handleGoodsTypeChange() { + if (this.isVirtualLikeGoods) { + this.baseInfoForm.salesModel = "RETAIL"; + } + if (this.isECouponGoods) { + this.baseInfoForm.templateId = 0; + } + this.renderTableData(this.skuTableData); + }, + handleCategoryChange(val) { + if (!val || val.length < 3) { + this.selectedCategory = val || []; + this.categoryId = ""; + this.baseInfoForm.categoryPath = ""; + this.baseInfoForm.categoryName = []; + this.baseInfoForm.brandId = 0; + this.brandList = []; + this.goodsParams = []; + this.params_panel = []; + return; + } + this.categoryId = val[2]; + this.baseInfoForm.categoryPath = val.join(","); + this.baseInfoForm.categoryName = this.getCategoryNames(val); + this.baseInfoForm.brandId = 0; + this.getGoodsBrandList(); + this.GET_GoodsParams(); }, // 预览图片 handleView(url) { @@ -1192,6 +1377,7 @@ export default { this.baseInfoForm = { ...this.baseInfoForm, ...response.result }; this.baseInfoForm.release = 1; //即使是被放入仓库，修改的时候也会显示会立即发布 this.categoryId = response.result.categoryPath.split(",")[2]; + this.syncSelectedCategoryFromPath(); // 如果是复制商品，需要清除ID，确保提交时作为新商品 if (this.$route.query.copyId) { @@ -1228,19 +1414,6 @@ export default { this.GET_ShopGoodsLabel(); this.GET_GoodsUnit(); - if (this.firstData.category) { - const cateId = []; - this.baseInfoForm.categoryName = []; - this.firstData.category.forEach((cate) => { - this.baseInfoForm.categoryName.push(cate.name); - cateId.push(cate.id); - }); - this.categoryId = cateId[2]; - - this.baseInfoForm.categoryPath = cateId.toString(); - } - this.firstData.goodsType && - (this.baseInfoForm.goodsType = this.firstData.goodsType); /** 查询商品参数 */ this.GET_GoodsParams(); }, @@ -1724,14 +1897,19 @@ export default { ...combination, id: existingCombination.id || "", sn: existingCombination.sn || "", - quantity: existingCombination.quantity || "", + quantity: this.isECouponGoods + ? (existingCombination.quantity ?? 0) + : (existingCombination.quantity || ""), cost: existingCombination.cost || "", price: existingCombination.price || "", weight: existingCombination.weight || "" }; } else { // 新组合使用默认值 - return combination; + return { + ...combination, + quantity: this.defaultSkuQuantity(), + }; } }); this.baseInfoForm.regeneratorSkuFlag = true; @@ -1779,14 +1957,19 @@ export default { ...combination, id: existingCombination.id || "", sn: existingCombination.sn || "", - quantity: existingCombination.quantity || "", + quantity: this.isECouponGoods + ? (existingCombination.quantity ?? 0) + : (existingCombination.quantity || ""), cost: existingCombination.cost || "", price: existingCombination.price || "", weight: existingCombination.weight || "" }; } else { // 新组合使用默认值 - return combination; + return { + ...combination, + quantity: this.defaultSkuQuantity(), + }; } }); @@ -1833,7 +2016,7 @@ export default { // 有重量的情况 if ( - this.baseInfoForm.goodsType !== "VIRTUAL_GOODS" && + this.needsLogistics && this.baseInfoForm.salesModel !== "WHOLESALE" ) { pushData.push({ @@ -1878,7 +2061,9 @@ export default { ...combination, id: existingCombination.id || "", sn: existingCombination.sn || "", - quantity: existingCombination.quantity || "", + quantity: this.isECouponGoods + ? (existingCombination.quantity ?? 0) + : (existingCombination.quantity || ""), cost: existingCombination.cost || "", price: existingCombination.price || (this.baseInfoForm.salesModel === 'WHOLESALE' && this.wholesaleData.length > 0 ? this.wholesaleData[0].price : ""), weight: existingCombination.weight || "" @@ -1889,7 +2074,7 @@ export default { ...combination, id: "", sn: "", - quantity: "", + quantity: this.defaultSkuQuantity(), cost: "", price: this.baseInfoForm.salesModel === 'WHOLESALE' && this.wholesaleData.length > 0 ? this.wholesaleData[0].price : "", weight: "" @@ -2119,6 +2304,10 @@ export default { this.$Message.error(`以下参数为必填项：${missingParams.join('、')}`); return; } + if (!this.selectedCategory || this.selectedCategory.length < 3) { + this.$Message.error("必须选择到三级分类"); + return; + } this.submitLoading = true; this.$refs["baseInfoForm"].validate((valid) => { if (valid) { @@ -2153,6 +2342,10 @@ export default { return; } if (submit.templateId === "") submit.templateId = 0; + if (this.isECouponGoods) { + submit.templateId = 0; + submit.salesModel = "RETAIL"; + } let flag = false; let paramValue = ""; @@ -2175,7 +2368,7 @@ export default { let skuCopy = { cost: 1, price: sku.price, - quantity: sku.quantity, + quantity: this.resolveSubmitQuantity(sku), // alertQuantity: sku.alertQuantity, sn: sku.sn, images: [], @@ -2273,37 +2466,20 @@ export default { accessToken: this.getStore("accessToken"), }; this.GET_ShipTemplate() + this.loadCategoryList(); if (this.$route.query.id || this.$route.query.draftId) { // 编辑商品、模板 this.GET_GoodData(this.$route.query.id, this.$route.query.draftId); } else if (this.$route.query.copyId) { // 复制商品 this.GET_GoodData(this.$route.query.copyId); + } else if (this.firstData.tempId) { + // 选择模板 + this.GET_GoodData("", this.firstData.tempId); } else { - // 新增商品、模板 - if (this.firstData.tempId) { - // 选择模板 - this.GET_GoodData("", this.firstData.tempId); - } else { - const cateId = []; - this.firstData.category.forEach((cate) => { - this.baseInfoForm.categoryName.push(cate.name); - cateId.push(cate.id); - }); - this.categoryId = cateId[2]; - this.baseInfoForm.categoryPath = cateId.toString(); - this.baseInfoForm.goodsType = this.firstData.goodsType; - - - /** 获取该商城分类下 商品参数信息 */ - this.GET_GoodsParams(); - /** 查询品牌列表 */ - this.getGoodsBrandList(); - // 获取商品单位 - this.GET_GoodsUnit(); - // 获取当前店铺分类 - this.GET_ShopGoodsLabel(); - } + // 新增商品 + this.GET_GoodsUnit(); + this.GET_ShopGoodsLabel(); } }, }; @@ -2416,4 +2592,58 @@ export default { .refresh-icon { margin-left: 10px; } + +.form-tip { + color: #666; + font-size: 12px; + line-height: 1.5; + margin-top: 4px; + max-width: 260px; +} + +.goods-type-option { + display: flex; + flex-direction: column; + line-height: 1.4; + padding: 2px 0; +} + +.goods-type-option-label { + color: #303133; +} + +.goods-type-option-desc { + color: #909399; + font-size: 12px; +} + + diff --git a/seller/src/views/goods/goods-seller/goodsOperationThird.vue b/seller/src/views/goods/goods-seller/goodsOperationThird.vue index b2b90859..8f4e5605 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationThird.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationThird.vue @@ -2,9 +2,6 @@

    恭喜您，商品发布成功!

    -
    - 去店铺查看商品列表>> -

    您还可以：

    @@ -34,5 +31,17 @@ export default { } \ No newline at end of file diff --git a/seller/src/views/lili-dialog/goods-dialog.vue b/seller/src/views/lili-dialog/goods-dialog.vue index 2049c2c8..768bda55 100755 --- a/seller/src/views/lili-dialog/goods-dialog.vue +++ b/seller/src/views/lili-dialog/goods-dialog.vue @@ -253,6 +253,7 @@ export default { goodsData: [], loading: false, tableHeight: 400, + syncingSelection: false, }; }, watch: { @@ -339,14 +340,15 @@ export default { initGoods(res) { const records = res?.result?.records || []; this.total = res?.result?.total || 0; + const selectedIds = new Set( + (this.selectedList || []) + .map((e) => e.id || e.skuId) + .filter((id) => id != null) + .map(String) + ); records.forEach((item) => { - item.selected = false; item.___type = "goods"; - this.selectedList.forEach((e) => { - if (e.id && e.id === item.id) { - item.selected = true; - } - }); + item.selected = selectedIds.has(String(item.id)); }); this.goodsData = records; this.syncTableSelection(); @@ -356,12 +358,18 @@ export default { const table = this.$refs.goodsTable; if (!table) return; if (this.type === "multiple") { + // clearSelection/toggleRowSelection 都会触发 selection-change， + // 同步期间忽略，避免把已选状态清掉 + this.syncingSelection = true; table.clearSelection(); this.goodsData.forEach((row) => { if (row.selected) { table.toggleRowSelection(row, true); } }); + this.$nextTick(() => { + this.syncingSelection = false; + }); return; } const selected = this.goodsData.find((item) => item.selected); @@ -382,13 +390,16 @@ export default { this.$refs.goodsTable?.setCurrentRow(row); }, handleSelectionChange(selection) { - if (this.type !== "multiple") return; - const selectedIds = new Set(selection.map((item) => item.id)); + if (this.type !== "multiple" || this.syncingSelection) return; + const selectedIds = new Set(selection.map((item) => String(item.id))); this.goodsData.forEach((item) => { - item.selected = selectedIds.has(item.id); + item.selected = selectedIds.has(String(item.id)); + }); + const currentPageIds = new Set(this.goodsData.map((item) => String(item.id))); + const otherPages = this.selectedList.filter((item) => { + const id = item.id || item.skuId; + return id != null && !currentPageIds.has(String(id)); }); - const currentPageIds = new Set(this.goodsData.map((item) => item.id)); - const otherPages = this.selectedList.filter((item) => !currentPageIds.has(item.id)); this.emitSelected([...otherPages, ...selection]); }, formatShopCategory(list) { diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue index 5364d3d8..38da6d6d 100644 --- a/seller/src/views/order/order/orderDetail.vue +++ b/seller/src/views/order/order/orderDetail.vue @@ -27,7 +27,7 @@ @click="toPrint" >打印电子面单
    -
    +
    收货信息：
    {{ orderInfo.order.consigneeName }} @@ -204,7 +204,7 @@
    --> -
    +
    配送方式：
    {{ orderInfo.deliveryMethodValue }} @@ -256,6 +256,48 @@ + + +
    +

    卡密信息

    +
    + + + + + + + + + + + + + +
    +
    +
    • @@ -319,7 +361,7 @@ {{item.promotionName}}：| ¥{{ $filters.unitPrice(item.discountPrice) }}
      • --> -
    • +
    • 运费： {{ $filters.unitPrice(orderInfo.order.freightPrice, "￥") @@ -694,6 +736,14 @@ import * as RegExp from "@/libs/RegExp.js"; import multipleMap from "@/views/my-components/map/multiple-map"; import vueQr from "vue-qr"; import { printElement } from "@/utils/print"; +import { formatCardKeyStatus } from "@/constants/cardKey"; +import { + collectCardKeyFulfillLines, + orderHasCardKeySection, + flattenOrderCardKeys, + cardKeyFulfillAlertType, + resolveCardKeyFulfillMessage, +} from "@/constants/goodsType"; export default { name: "orderDetail", components: { @@ -814,11 +864,35 @@ export default { }; }, computed: { + /** 电子卡券订单：隐藏物流/发货/售后，展示 orderItems[].cardKeys（FR-S-04 / FR-S-05） */ + isECouponOrder() { + const t = this.orderInfo?.order?.orderType; + return t === "E_COUPON" || this.$route.query.orderType === "E_COUPON"; + }, + isVirtualOrder() { + const t = this.orderInfo?.order?.orderType; + return t === "VIRTUAL" || this.$route.query.orderType === "VIRTUAL"; + }, + isNonPhysicalOrder() { + return this.isVirtualOrder || this.isECouponOrder; + }, + hasCardKeySection() { + return orderHasCardKeySection({ + orderItems: this.data, + isECouponOrder: this.isECouponOrder, + }); + }, + cardKeyFulfillLines() { + return collectCardKeyFulfillLines(this.data); + }, + ecouponCardKeyRows() { + return flattenOrderCardKeys(this.data, true); + }, canPartDelivery() { if (!this.allowOperation.ship) return false; const status = this.orderInfo.order && this.orderInfo.order.orderStatus; return ( - this.$route.query.orderType !== "VIRTUAL" && + !this.isNonPhysicalOrder && ["UNDELIVERED", "PARTS_DELIVERED"].includes(status) && this.deliverableOrderItems.length > 0 ); @@ -845,6 +919,28 @@ export default { }, }, methods: { + formatCardKeyStatus, + cardKeyFulfillAlertType, + resolveCardKeyFulfillMessage, + lineCardKeyRows(line) { + return line.cardKeys || []; + }, + copyCardKey(row) { + const text = `卡号：${row.cardNo || ""}\n卡密：${row.cardSecret || ""}`; + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(text).then(() => { + this.$Message.success("已复制到剪贴板"); + }); + } else { + const ta = document.createElement("textarea"); + ta.value = text; + document.body.appendChild(ta); + ta.select(); + document.execCommand("copy"); + document.body.removeChild(ta); + this.$Message.success("已复制到剪贴板"); + } + }, getPromotionText(row) { let resultText = ""; if (row && row.promotionType) { diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue index dca4f7db..1ff78aa6 100644 --- a/seller/src/views/order/receiptManager/receipt.vue +++ b/seller/src/views/order/receiptManager/receipt.vue @@ -196,7 +196,7 @@ export default { receiptModalMode: "detail", uploadFileUrl: uploadFile, accessToken: {}, - receiptUploadData: { directoryPath: "receipt" }, + receiptUploadData: { directoryPath: "default" }, // OSS 上传目录（与后端存储配置一致） currentReceipt: {}, selectedReceiptRow: null, searchForm: { diff --git a/seller/src/views/promotion/flash-discount/flash-discount-add.vue b/seller/src/views/promotion/flash-discount/flash-discount-add.vue index 6eb37899..75c5891b 100644 --- a/seller/src/views/promotion/flash-discount/flash-discount-add.vue +++ b/seller/src/views/promotion/flash-discount/flash-discount-add.vue @@ -6,7 +6,14 @@ - + 0 表示不限 @@ -16,12 +23,22 @@ 选择商品 - - - - + + + + @@ -38,6 +55,7 @@