From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/tabbar/video/video.vue | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/pages/tabbar/video/video.vue b/pages/tabbar/video/video.vue
index ffeb496..af7dfeb 100644
--- a/pages/tabbar/video/video.vue
+++ b/pages/tabbar/video/video.vue
@@ -132,7 +132,7 @@
<view class="goods-price" style="flex: 1;">楼{{ goods.price }}</view>
<view @click.stop="() => {}" style="flex: 1;display: flex;justify-content: center;align-items: center;">
<view style="width: 90rpx">鏁伴噺锛�</view>
- <uni-number-box v-model="goods.selectNum" :min="0"/>
+ <uni-number-box v-model="goods.goodsNum" :min="0"/>
</view>
</view>
</view>
@@ -205,13 +205,7 @@
</template>
<script>
-import UIcon from '@/uview-components/uview-ui/components/u-icon/u-icon.vue';
-import UButton from '@/uview-components/uview-ui/components/u-button/u-button.vue';
-import UForm from '@/uview-components/uview-ui/components/u-form/u-form.vue';
-import UFormItem from '@/uview-components/uview-ui/components/u-form-item/u-form-item.vue';
-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 '@/components/uview-components/uview-ui';
import MyTag from '@/components/my-tag.vue'
import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
@@ -221,7 +215,7 @@
import { getVideoGoodsList } from "@/api/goods.js";
export default {
- components: {MyTag,UIcon,UButton,UForm,UFormItem,UInput,USearch,UPopup},
+ components: {MyTag},
data() {
return {
fileTypeShow: false,
@@ -457,7 +451,22 @@
},
// 閲嶆柊涓婁紶
reUpload() {
- this.resetData()
+ this.videoInfo = {
+ url: '',
+ fileKey: '',
+ fileType: '',
+ fileSize: 0,
+ originalFileName: '',
+ cover: ''
+ };
+ this.formData.videoFileKey = ''
+ this.formData.cover = ''
+ this.formData.videoFit = 'cover'
+ this.formData.videoDuration = 0
+ this.formData.videoImgs = []
+ this.formData.fileInfo = {}
+ this.formData.videoContentType = 'video'
+ this.videoPreviewImgs = []
this.fileTypeShow = true
},
// 閫夋嫨瑙嗛鍥鹃泦
@@ -533,13 +542,20 @@
// 閫夋嫨鍟嗗搧
chooseGoods() {
+ if(this.selectedGoodsList.length > 0) {
+ const selectedGoodsIds = new Set(this.selectedGoodsList.map(i => i.goodsId));
+ console.log(selectedGoodsIds, "mimade");
+ this.goodsList?.forEach(goods => {
+ this.$set(goods, 'selected', selectedGoodsIds.has(goods.goodsId));
+ });
+ }
this.showGoodsPicker = true;
},
// 閫夋嫨鍏蜂綋鍟嗗搧
selectGoods(goods, index) {
if(! this.selectedGoodsList.some(item => item.id === goods.id)) {
- goods["selectNum"] = 1
+ goods["goodsNum"] = 1
this.selectedGoodsList.push(goods)
this.goodsList[index].selected = true
} else {
@@ -622,7 +638,7 @@
if (valid && this.canPublish) {
this.loading = true;
this.formData.fileInfo = this.videoInfo;
- this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.selectNum}});
+ this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsNum: item.goodsNum}});
publish(this.formData).then(res => {
uni.showToast({
title: '瑙嗛宸叉彁浜ゅ鏍竳',
--
Gitblit v1.8.0