From c1e567ddda7f65651179a8a73ca849b07b066b14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 19:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/goods/goods-info/goodsApply.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue
index 30deb6a..8b8aa08 100644
--- a/manager/src/views/goods/goods-info/goodsApply.vue
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -42,11 +42,13 @@
<!-- 鍟嗗搧鏍忕洰鏍煎紡鍖� -->
<template slot="goodsSlot" slot-scope="scope">
<div style="margin-top: 5px; height: 80px; display: flex">
- <div style="">
- <img
+ <div style="" >
+ <img v-if="scope.row.original"
:src="scope.row.original"
style="height: 60px; margin-top: 3px; width: 60px"
/>
+ <video v-else :src="scope.row.goodsVideo" style="height: 60px; margin-top: 3px; width: 60px"
+ />
</div>
<div style="margin-left: 13px">
--
Gitblit v1.8.0