From 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 11 九月 2025 18:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into send_coupon
---
seller/src/views/goods/goods-seller/goods.vue | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index ed68fda..63942cf 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -95,10 +95,11 @@
<template slot="goodsSlot" slot-scope="{ row }">
<div style="margin-top: 5px; height: 90px; display: flex">
<div style="">
- <img
+ <img v-if="row.original"
:src="row.original"
style="height: 80px; margin-top: 3px; width: 70px"
/>
+ <video :src="row.goodsVideo" v-else style="height: 80px; margin-top: 3px; width: 70px"></video>
</div>
<div style="margin-left: 13px">
@@ -332,6 +333,8 @@
return h("Tag", { props: { color: "orange" } }, "闆跺敭");
} else if (params.row.salesModel === "WHOLESALE") {
return h("Tag", { props: { color: "magenta" } }, "鎵瑰彂");
+ } else if (params.row.salesModel === "PRESALE") {
+ return h("Tag", { props: { color: "magenta" } }, "棰勫敭");
} else {
return h("Tag", { props: { color: "volcano" } }, "鍏朵粬绫诲瀷");
}
--
Gitblit v1.8.0