From 81321207cc8ee0220ef700040c1313214b44b042 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 13 六月 2025 11:06:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager/src/views/video/VideoList.vue |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index 8e2e6b0..275f2d3 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -92,11 +92,22 @@
               </div>
             </div>
           </Form-item>
-          <Form-item label="瑙嗛鏃堕暱锛�" :label-width="72">
+          <Form-item v-if="detail.videoContentType === 'video'" label="瑙嗛鏃堕暱锛�" :label-width="72">
             <div>{{formatSeconds(detail.videoDuration)}}</div>
           </Form-item>
-          <Form-item class="video-warp" :label-width="0">
+          <Form-item v-if="detail.videoContentType === 'img'" label="鍥剧墖寮犳暟锛�" :label-width="72">
+            <div>{{detail.imgs.length}}</div>
+          </Form-item>
+          <Form-item v-if="detail.videoContentType === 'video'" class="video-warp" :label-width="0">
             <video :src="detail.videoUrl" autoplay controls style="width: 768px;height: 432px"/>
+          </Form-item>
+          <Form-item v-if="detail.videoContentType === 'img'" :label-width="0">
+            <div style="display: flex;flex-direction: row;flex-wrap: wrap">
+              <div v-for="img in detail.imgs" :key="img" class="img-warp">
+                <img :src="img" class="image">
+              </div>
+            </div>
+
           </Form-item>
           <Form-item label="瀹℃牳缁撴灉锛�" :label-width="100" prop="result">
             <RadioGroup v-model="auditingForm.result">
@@ -573,4 +584,11 @@
   display: flex;
   align-items: center;
 }
+.img-warp {
+  padding: 10px;
+}
+.image {
+  width: 150px;
+  height: 200px;
+}
 </style>

--
Gitblit v1.8.0