From ef70f387ae504f20e15aa7d7a933800b768892fc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/views/video/VideoList.vue | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index e3aa4b1..a25608f 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -259,13 +259,13 @@
:title="playVideoTitle"
width="800"
:mask-closable="false"
- @close="playVideoClose"
+ @on-cancel="playVideoClose"
>
<div class="video-warp">
<video :src="playVideoUrl" autoplay controls style="width: 768px;height: 432px"/>
</div>
<div slot="footer">
- <Button type="text" @click="playVideoClose">鍏抽棴</Button>
+ <Button type="text" @click="playVideoClose">鍏抽棴1</Button>
</div>
</Modal>
@@ -462,7 +462,7 @@
<Col>
<FormItem :label-width="70" label="寮�濮嬫椂闂达細" prop="startTime">
<DatePicker
- :v-model="commentForm.startTime"
+ v-model="commentForm.startTime"
type="datetime"
placeholder="閫夋嫨寮�濮嬫椂闂�"
style="width: 120px"
@@ -474,7 +474,7 @@
<Col>
<FormItem :label-width="70" label="缁撴潫鏃堕棿锛�" prop="endTime">
<DatePicker
- :v-model="commentForm.endTime"
+ v-model="commentForm.endTime"
type="datetime"
placeholder="閫夋嫨缁撴潫鏃堕棿"
style="width: 120px"
@@ -487,8 +487,7 @@
</Form>
<div slot="footer">
- <Button type="text" @click="closeVideoDown">鍏抽棴</Button>
- <Button type="primary" @click="videoDown">纭</Button>
+ <Button type="text" @click="closeComment">鍏抽棴</Button>
</div>
<Table
:loading="commentLoading"
@@ -517,9 +516,7 @@
show-sizer
></Page>
</Row>
- <div slot="footer">
- </div>
</Modal>
<Modal
@@ -573,6 +570,7 @@
removeById
} from "@/api/video";
import {getVideoTagList, recommend, videoGoodsEsPage} from "@/api/videoTag";
+import {addPrizeNum} from "@/api/activity-prize";
import {getFilePreview, getSts} from "@/api/file";
import Editor from '@/components/editor/index.vue'
import GoodsExpandRow from '@/views/video/GoodsExpandRow'
@@ -879,6 +877,9 @@
this.getTags('')
},
methods: {
+ closeComment(){
+ this.showVideoComment = false
+ },
commentChangePage(page) {
this.commentForm.pageNumber = page
this.commentPage()
@@ -891,8 +892,14 @@
this.commentPage()
},
commentPage(){
+ //杞崲涓哄瓧绗︿覆
+ let startTime = this.formatDate(this.commentForm.startTime);
+ let endTime = this.formatDate(this.commentForm.endTime);
+ let from = {...this.commentForm};
+ from.startTime = startTime;
+ from.endTime = endTime;
this.commentLoading = true;
- getCommentPage(this.commentForm).then(res =>{
+ getCommentPage(from).then(res =>{
this.commentLoading = false;
if (res.code === 200){
this.commentData = res.data;
@@ -938,6 +945,7 @@
// this.selectCount = selection.length
},
openComment(row){
+ this.$refs.commentForm.resetFields();
console.log(row)
this.commentForm.videoId = row.id;
this.showVideoComment = true;
@@ -1067,11 +1075,10 @@
this.upLoadVideoShow = false;
},
submitVideoUpload() {
- console.log(this.uploadVideoForm.coverUrl)
- if (this.uploadVideoForm.coverUrl === null || this.uploadVideoForm.coverUrl === undefined) {
- this.$Message.error('鏍囬涓嶈兘涓虹┖');
- return;
- }
+ // if (this.uploadVideoForm.coverUrl === null || this.uploadVideoForm.coverUrl === undefined) {
+ // this.$Message.error('灏侀潰涓嶈兘涓虹┖');
+ // return;
+ // }
this.uploadVideoForm.goodsList = this.uploadVideoForm.goodsList.filter(item => {
return item.goodsNum > 0;
})
@@ -1400,10 +1407,20 @@
console.log(this.auditingForm, "sb")
this.$refs.auditingForm.validate((valid) => {
if (valid) {
+ let currentVideoId = this.auditingForm.id
auditingVideo(this.auditingForm).then(res => {
this.$Message.success("瀹℃牳瀹屾垚")
this.closeAuditing()
this.getDataList()
+ let param = {
+ addType:"USER_PUBLISH_EXAMINE",
+ userId:this.detail.authorId,
+ extend:""
+ }
+ param.extend = JSON.stringify({
+ videoId:currentVideoId
+ })
+ addPrizeNum(param)
})
}
})
--
Gitblit v1.8.0