From f6c05b70e6f74b413d8bce3d63f844c6cdb194f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 21:20:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
seller/src/views/goods/goods-seller/goods.vue | 3 ++-
1 files changed, 2 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..e4efb96 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">
--
Gitblit v1.8.0