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
---
manager/src/views/video/VideoList.vue | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index 275f2d3..ad09c4c 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -72,7 +72,7 @@
<Modal
v-model="auditingShow"
title="瑙嗛瀹℃牳"
- width="800"
+ width="1200"
:loading="auditingLoading"
:mask-closable="false"
>
@@ -99,7 +99,30 @@
<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"/>
+ <Row>
+ <Col span="11">
+ <video :src="detail.videoUrl" autoplay controls style="width: 500px;height: 300px"/>
+ </Col>
+ <Col span="13" style="max-height: 300px;overflow-y: scroll">
+ <Row v-for="goods in detail.goodsList" :key="goods.goodsId" style="width: 100%">
+ <Row style="width:100%;align-items: center">
+ <Col span="6">
+ <img :src="goods.thumbnail" style="width: 100px;height: 100px"/>
+ </Col>
+ <Col span="10">
+ <p>鍟嗗搧鍚嶇О: {{ goods.goodsName }}</p>
+ </Col>
+ <Col span="4">
+ <p>鍟嗗搧鍗曚环: 锟{ goods.price }}</p>
+ </Col>
+ <Col span="4">
+ <p>鍟嗗搧鏁伴噺: {{ goods.goodsNum }}</p>
+ </Col>
+ </Row>
+ </Row>
+ </Col>
+ </Row>
+
</Form-item>
<Form-item v-if="detail.videoContentType === 'img'" :label-width="0">
<div style="display: flex;flex-direction: row;flex-wrap: wrap">
@@ -163,7 +186,7 @@
</div>
</template>
<template slot-scope="{ row, index }" slot="videoFileKey">
- <div class="play-text" @click="playVideo(row.videoFileKey, row.title)">鐐瑰嚮鎾斁</div>
+ <div v-if="row.videoContentType === 'video'" class="play-text" @click="playVideo(row.videoFileKey, row.title)">鐐瑰嚮鎾斁</div>
</template>
<template slot-scope="{ row, index }" slot="videoDuration">
<div>{{formatSeconds(row.videoDuration)}}</div>
@@ -204,9 +227,10 @@
import {getVideoTagList} from "@/api/videoTag";
import {getFilePreview} from "@/api/file";
import Editor from '@/components/editor/index.vue'
+import GoodsExpandRow from '@/views/video/GoodsExpandRow'
export default {
name: "VideoList",
- components: {Editor},
+ components: {Editor,GoodsExpandRow},
data() {
return {
videoDownForm: {
@@ -277,6 +301,17 @@
align: 'center'
},
{
+ width: 60,
+ type: 'expand',
+ render: (h, params) => {
+ return h(GoodsExpandRow, {
+ props: {
+ goodsList: params.row.goodsList
+ }
+ })
+ }
+ },
+ {
title: "鏍囬",
key: "title",
minWidth: 240,
@@ -335,7 +370,7 @@
{
title: "鏉冮噸",
key: "weight",
- width: 170,
+ width: 80,
},
{
title: "鐘舵��",
@@ -577,8 +612,8 @@
cursor: pointer;
}
.video-warp {
- width: 786px;
- height: 432px;
+ width: 100%;
+ height: 440px;
}
.data-item {
display: flex;
--
Gitblit v1.8.0