From 28167c45044ddb9ceff22b44e48a7ab496b8839a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 25 六月 2025 10:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/tabbar/video/video.vue |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pages/tabbar/video/video.vue b/pages/tabbar/video/video.vue
index af7dfeb..619c135 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.goodsNum" :min="0"/>
+						<uni-number-box v-model="goods.goodsNum" :min="1"/>
 					</view>
 				</view>
               </view>
@@ -249,7 +249,6 @@
 		videoFileKey: '',
 		videoDuration: 0,
 		videoFit: 'cover',
-        goodsId: '',
         videoContentType: 'video',
         videoImgs: [],
         tags: [],
@@ -543,10 +542,9 @@
     // 閫夋嫨鍟嗗搧
     chooseGoods() {
 	  if(this.selectedGoodsList.length > 0) {
-	  		  const selectedGoodsIds = new Set(this.selectedGoodsList.map(i => i.goodsId));
-	  			  console.log(selectedGoodsIds, "mimade");
+	  		  const selectedGoodsSkuIds = new Set(this.selectedGoodsList.map(i => i.id));
 	  		  this.goodsList?.forEach(goods => {
-	  		      this.$set(goods, 'selected', selectedGoodsIds.has(goods.goodsId));
+	  		      this.$set(goods, 'selected', selectedGoodsSkuIds.has(goods.id));
 	  		    });
 	  }
       this.showGoodsPicker = true;
@@ -638,7 +636,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.goodsNum}});
+		  this.formData["goodsList"] = this.selectedGoodsList.map(item => {return {goodsId: item.goodsId, goodsSkuId: item.id, goodsNum: item.goodsNum}});
           publish(this.formData).then(res => {
 			  uni.showToast({
 			    title: '瑙嗛宸叉彁浜ゅ鏍竳',
@@ -683,7 +681,6 @@
 		  cover: '',
 		  videoFit: 'cover',
 		  videoDuration: 0,
-		  goodsId: '',
 		  videoContentType: 'video',
 		  videoImgs: [],
 		  tags: [],

--
Gitblit v1.8.0