From da39dc76573ae9829c0594a701636f0caf8f048b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 27 六月 2025 10:18:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/video/VideoList.vue | 6 +++---
seller/src/views/goods/goods-seller/goodsOperationSec.vue | 35 +++++++++++++++++++++--------------
seller/src/views/lili-components/editor/index.vue | 5 ++++-
3 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/manager/src/views/video/VideoList.vue b/manager/src/views/video/VideoList.vue
index f017ac9..ad09c4c 100644
--- a/manager/src/views/video/VideoList.vue
+++ b/manager/src/views/video/VideoList.vue
@@ -186,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>
@@ -370,7 +370,7 @@
{
title: "鏉冮噸",
key: "weight",
- width: 170,
+ width: 80,
},
{
title: "鐘舵��",
@@ -613,7 +613,7 @@
}
.video-warp {
width: 100%;
- height: 350px;
+ height: 440px;
}
.data-item {
display: flex;
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index a2e8262..dbbdb51 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -101,7 +101,7 @@
</div>
<h4>鍟嗗搧瑙勬牸鍙婂浘鐗�</h4>
<div class="form-item-view">
- <FormItem class="form-item-view-el required" label="涓诲浘" prop="goodsGalleryFiles" v-if=" baseInfoForm.goodsVideo ==null || baseInfoForm.goodsVideo ===''">
+ <FormItem class="form-item-view-el required" label="涓诲浘" prop="goodsGalleryFiles" >
<div style="display: flex; flex-wrap: wrap;">
<vuedraggable :animation="200" :list="showListImages">
<div v-for="(item, __index) in showListImages" :key="__index"
@@ -151,7 +151,7 @@
<!-- </div>-->
<div style="color: grey" v-if="!baseInfoForm.goodsVideo">涓诲浘浠呮敮鎸乸ng锛宩pg锛宩peg鏍煎紡锛屽楂樿嚦灏�600*600px锛屽ぇ灏�2M鍐�</div>
</FormItem>
- <FormItem class="form-item-view-el" label="瑙嗛" prop="goodsVideo" v-if="!(baseInfoForm.goodsGalleryFiles !=null &&baseInfoForm.goodsGalleryFiles.length>0)">
+ <FormItem class="form-item-view-el" label="瑙嗛" prop="goodsVideo" >
<div class="goods-video">
<div v-if="baseInfoForm.goodsVideo">
<div>
@@ -383,6 +383,7 @@
</div>
<FormItem class="form-item-view-el" label="PC鍟嗗搧鎻忚堪" prop="intro" style="width: 100%">
<editor
+ :show-upload="false"
ref="editor"
v-model="baseInfoForm.intro"
height="800px"
@@ -396,6 +397,7 @@
<FormItem class="form-item-view-el" label="绉诲姩绔弿杩�" prop="skuList" style="width: 100%">
<editor
+ :show-upload="false"
ref="introEditor"
v-model="baseInfoForm.mobileIntro"
height="800px"
@@ -781,10 +783,10 @@
},
// ship澶у皬涓嶆纭�
handleVideoMaxSize(file) {
- this.$Notice.warning({
- title: "瓒呰繃鏂囦欢澶у皬闄愬埗",
- desc: "瑙嗛澶у皬涓嶈兘瓒呰繃10MB",
- });
+ // this.$Notice.warning({
+ // title: "瓒呰繃鏂囦欢澶у皬闄愬埗",
+ // desc: "瑙嗛澶у皬涓嶈兘瓒呰繃10MB",
+ // });
},
onAddSku(index) {
if (!this.newSkuValues[index]) {
@@ -1930,14 +1932,19 @@
this.baseInfoForm.goodsId = this.goodsId;
let submit = JSON.parse(JSON.stringify(this.baseInfoForm));
console.log('----------------->鎻愪氦',submit);
- // if (
- // (submit.goodsGalleryFiles &&
- // submit.goodsGalleryFiles.length <= 0) && !submit.goodsVideo
- // ) {
- // this.submitLoading = false;
- // this.$Message.error("璇蜂笂浼犲晢鍝佸浘鐗囨垨鑰呰棰�");
- // return;
- // }
+ if (
+ submit.goodsGalleryFiles &&
+ submit.goodsGalleryFiles.length <= 0
+ ) {
+ this.submitLoading = false;
+ this.$Message.error("璇蜂笂浼犲晢鍝佸浘鐗�");
+ return;
+ }
+ if (!submit.goodsVideo){
+ this.submitLoading = false;
+ this.$Message.error("璇蜂笂浼犲晢鍝佽棰�");
+ return;
+ }
if (submit.templateId === "") submit.templateId = 0;
let flag = false;
let paramValue = "";
diff --git a/seller/src/views/lili-components/editor/index.vue b/seller/src/views/lili-components/editor/index.vue
index a28d64e..5bd05ee 100644
--- a/seller/src/views/lili-components/editor/index.vue
+++ b/seller/src/views/lili-components/editor/index.vue
@@ -3,7 +3,7 @@
<!-- 浣跨敤 fullscreen 绫绘潵鎺у埗鏄惁鍏ㄥ睆鏄剧ず -->
<div :class="{ fullscreen: fullscreen }" class="tinymce-container">
<!-- 浣跨敤 tinymce-textarea 绫讳綔涓虹紪杈戝櫒鐨勬枃鏈尯鍩� -->
- <uploadImage @callback="insertImage" />
+ <uploadImage @callback="insertImage" v-if="showUpload"/>
<textarea :id="tinymceId" class="tinymce-textarea" />
</div>
</div>
@@ -23,6 +23,9 @@
height:{
type:String,
default:'500px'
+ },showUpload:{
+ type:Boolean,
+ default:true
}
},
data() {
--
Gitblit v1.8.0