From 1eefd113e28e802348a9cae69a41945c1dc48b0f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 六月 2025 21:05:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages/tabbar/video/video.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pages/tabbar/video/video.vue b/pages/tabbar/video/video.vue
index 103a3ff..18d38ae 100644
--- a/pages/tabbar/video/video.vue
+++ b/pages/tabbar/video/video.vue
@@ -20,7 +20,7 @@
</view>
<view class="video-actions">
<u-button type="error" size="mini" @click="reUpload">閲嶆柊涓婁紶</u-button>
- <u-button type="primary" size="mini" @click="chooseCover" v-if="videoInfo.url">閫夋嫨灏侀潰</u-button>
+ <u-button type="primary" size="mini" @click="chooseCover" v-if="videoInfo.url">{{formData.cover ? '鏇存崲灏侀潰' : '璇烽�夋嫨灏侀潰'}}</u-button>
</view>
</view>
</view>
@@ -57,7 +57,7 @@
:key="index"
:text="tag.tagName"
:index="index"
- type="error"
+ type="success"
@close="removeTag(index)"
/>
</view>
@@ -74,7 +74,7 @@
:key="index"
:text="tag.tagName"
:index="index"
- type="primary"
+ type="success"
:closeable="false"
@click="selectTopic(index)"
/>
@@ -178,7 +178,8 @@
import UInput from '@/uview-components/uview-ui/components/u-input/u-input.vue';
import USearch from '@/uview-components/uview-ui/components/u-search/u-search.vue';
import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
-import MyTag from "@/components/my-tag.vue"
+import MyTag from '@/components/my-tag.vue'
+
import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
import { publish } from "@/api/video.js";
import { getRecommendTag3 } from "@/api/video-tag.js";
@@ -206,6 +207,7 @@
formData: {
id: '',
title: '',
+ cover: '',
videoFileKey: '',
videoDuration: 0,
videoFit: 'cover',
@@ -239,7 +241,7 @@
},
computed: {
canPublish() {
- return this.formData.videoFileKey && this.formData.title;
+ return this.formData.videoFileKey && this.formData.title && this.formData.cover;
},
filteredGoods() {
if (!this.goodsSearch) return this.goodsList;
@@ -272,7 +274,6 @@
},
// 鍒濆鍖栬吘璁簯cos瀹㈡埛绔�
initCOS() {
- console.log("鎵ц浜�");
// 璋冪敤鍚庣鑾峰彇sts涓存椂璁块棶鍑瘉
getSTSToken().then(res => {
const COS = require('@/lib/cos-wx-sdk-v5.js'); // 寮�鍙戞椂浣跨敤
@@ -519,6 +520,7 @@
id: '',
title: '',
videoFileKey: '',
+ cover: '',
videoFit: 'cover',
videoDuration: 0,
goodsId: '',
--
Gitblit v1.8.0