From 700e7d3bc6cec38610b2ee85139c4d6506102ff6 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:30:18 +0800
Subject: [PATCH] 取消封面必传校验
---
pages/kitchen/KitchenVideo.vue | 392 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 347 insertions(+), 45 deletions(-)
diff --git a/pages/kitchen/KitchenVideo.vue b/pages/kitchen/KitchenVideo.vue
index 43b3432..f69b41b 100644
--- a/pages/kitchen/KitchenVideo.vue
+++ b/pages/kitchen/KitchenVideo.vue
@@ -1,5 +1,15 @@
<template>
<view class="video-container">
+ <view class="choosePlatType" :style="{top: menueButton + 'px'}">
+ <view class="platTypeItem" v-for="item in choosePlat" :key="item.type" @click="chooseType=item.type">
+ <view class="platTypeItenName">
+ {{item.name}}
+ </view>
+ <view class="platTypeItemChoose" v-if="chooseType===item.type" >
+ </view>
+ </view>
+
+ </view>
<!-- 瑙嗛鍔犺浇 -->
<zero-loading v-show="videoLoading" type="circle" color="#0ebd57" text=""></zero-loading>
<view class="showLeft" @click="showDrawer('showLeft')" v-if="!showLeft" :style="{top: buttonHeight+'px'}">
@@ -29,7 +39,7 @@
@click="togglePlay(index)"
v-show="!currentVideoIsPlaying"
>
- <image src="/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
+ <image src="/pages/subComponents/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
</view>
<video
v-if="index >= currentIndex - videoLiveOffset && index <= currentIndex + videoLiveOffset"
@@ -134,29 +144,33 @@
<!-- 鍙充晶浜掑姩鎸夐挳 -->
<view class="action-buttons" v-if="false">
- <view class="avatar-container">
- <image class="avatar" @click="jumpToHomePage(item.authorId)" :src="item.authorAvatar" mode="aspectFill"></image>
- <!-- 鍏虫敞鍥炬爣 - 浣跨敤缁濆瀹氫綅 -->
- <view v-if="!item.subscribeThisAuthor" class="follow-icon" @click="subscribeAuth(index, item.authorId)">
- <text class="iconfont"></text>
- </view>
- </view>
- <view class="action-item" @click="toggleCollect(item, index)">
- <text class="iconfont" v-if="item.collected"></text>
- <text class="iconfont" v-else></text>
- <text style="font-size: 10px;font-weight: lighter;">{{item.collectNum}}</text>
- </view>
+ <view class="avatar-container">
+ <image class="avatar" @click="jumpToHomePage(item.authorId)" @touchend.stop :src="item.authorAvatar" mode="aspectFill"></image>
+ <!-- 鍏虫敞鍥炬爣 - 浣跨敤缁濆瀹氫綅 -->
+ <view v-if="!item.subscribeThisAuthor" class="follow-icon" @touchend.stop @click="subscribeAuth(index, item.authorId)">
+ <text class="iconfont"></text>
+ </view>
+ </view>
+ <view class="action-item" @click="toggleThumbsUp(item, index)">
+ <text class="iconfont" v-if="item.thumbsUp"></text>
+ <text class="iconfont" v-else></text>
+ <text style="font-size: 10px;font-weight: lighter;">{{item.thumbsUpNum}}</text>
+ </view>
<view class="action-item" @click="showComments(item)">
- <text class="iconfont"></text>
- <text style="font-size: 10px;font-weight: lighter;">{{item.commentNum}}</text>
- </view>
- <view class="action-item">
- <button open-type="share" class="custom-share-btn" :data-obj="item">
- <text class="iconfont"></text>
- </button>
-
- </view>
- </view>
+ <text class="iconfont"></text>
+ <text style="font-size: 10px;font-weight: lighter;">{{item.commentNum}}</text>
+ </view>
+ <view class="action-item" @click="toggleCollect(item, index)">
+ <text class="iconfont" v-if="item.collected"></text>
+ <text class="iconfont" v-else></text>
+ <text style="font-size: 10px;font-weight: lighter;">{{item.collectNum}}</text>
+ </view>
+ <view class="action-item">
+ <button open-type="share" class="custom-share-btn" :data-obj="item">
+ <text class="iconfont"></text>
+ </button>
+ </view>
+ </view>
</swiper-item>
</swiper>
@@ -238,7 +252,7 @@
</view>
</view>
</uni-popup>
- <uni-drawer ref="showLeft" mode="left" width="120" :cus-style="true" height="80vh"
+ <uni-drawer v-if="leftHeight" ref="showLeft" mode="left" width="120" :cus-style="true" :height="`${leftHeight}px`"
@change="change($event,'showLeft')" class="navigationLeft" :drawerTop="buttonHeight">
<scroll-view class="typeNavigation" :scroll-y="true" :show-scrollbar="false">
<view class="typeNavigationItem" :class="{typeNavigationItemCheck:currentCategort ==item.id}"
@@ -262,11 +276,16 @@
getVideoComments,
addVideoComment,
thubmsUpComment,
- cancelThubmsUpComment
+ cancelThubmsUpComment,
+ changeThumbsUp,
+ getGoodsSimilarlyVideos
} from "@/api/video.js";
import {
changeCollect
} from "@/api/collect.js";
+import { saveShare, saveShareClickRecord } from "@/api/share.js";
+import storage from "@/utils/storage.js";
+
export default {
computed: {
hasPlayTime() {
@@ -275,6 +294,13 @@
},
data() {
return {
+ choosePlat:[
+ {type:'platForm',name:'骞冲彴'},
+ {type:'custom',name:'鐢ㄦ埛'}
+ ],
+ chooseType:'platForm',
+ leftHeight:null,
+ menueButton:0,
buttonHeight:0,
showLeft:false,
currentCategort: '',
@@ -344,16 +370,28 @@
},
loading: false, // 鏄惁姝ｅ湪鍔犺浇
videoQuery: {
+ source: 'system',
pageNumber: 1,
pageSize: 6,
videoFrom: 'recommend',
videoType: 'cook'
},
+ goodsSimilarlyQuery: { // 鐩镐技瑙嗛鏌ヨ
+ pageNumber: 1,
+ pageSize: 10,
+ videoFrom: 'goodsSimilarly',
+ goodsIds: [],
+ currentVideoId: ''
+ },
+ similarlyVideoList: [], // 鐩镐技瑙嗛
+ similarlyNomore: false, // 鏄惁杩樻湁鏇村鐩镐技瑙嗛
+ similaryVideoIndex: 0, // 鐩镐技瑙嗛鐨勬挱鏀句綅缃�
+ similarlyLoading: false, // 鐩镐技瑙嗛鍔犺浇
marginBottom: 0 // 搴曢儴瀹夊叏鍖哄煙
}
},
onShow() {
- this.showDrawer('showLeft')
+ // this.showDrawer('showLeft')
this.loadVideos()
// 濡傛灉瑙嗛鎸変笅鏆傚仠鍚庡垏鎹㈤〉闈㈠啀鍥炲埌椤甸潰鏃讹紝鍙畻鏆傚仠鏃堕棿锛堝洜涓烘殏鍋滄椂闂村拰绂诲紑椤甸潰鏃堕棿鏄噸澶嶇殑锛屽彧绠椾竴涓級
if (this.startHidenTime !== 0 && this.currentVideoIsPlaying) {
@@ -364,15 +402,126 @@
onHide() {
this.startHidenTime = Date.now()
},
- onLoad() {
- this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
- // 鑾峰彇鐘舵�佹爮楂樺害
- const systemInfo = uni.getSystemInfoSync();
- this.buttonHeight = systemInfo.statusBarHeight;
- this.getKitchenTypeList();
- this.loadVideos();
+ onLoad(option) {
+ this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom;
+ // 鑾峰彇鐘舵�佹爮楂樺害
+ const systemInfo = uni.getSystemInfoSync();
+ console.log('systemInfo------------------------>',systemInfo.windowHeight)
+ const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+ console.log('menuButtonInfo--------------------------->',menuButtonInfo)
+ const {top,height} = menuButtonInfo
+ this.buttonHeight = systemInfo.statusBarHeight+height;
+ this.menueButton = top;
+ console.log('systemInfo.safeAreaInsets.bottom>',systemInfo.safeAreaInsets.bottom)
+ this.leftHeight = systemInfo.windowHeight - top -50 - systemInfo.safeAreaInsets.bottom -22;
+ console.log('-------------leftHeight------------------------>',this.leftHeight)
+ let queryParam = this.videoQuery;
+ if(option.q){
+ const decodedUrl = decodeURIComponent(decodeURIComponent(option.q));
+ console.log('鍘熷URL:', decodedUrl);
+
+ // 瑙ｆ瀽URL涓殑鏌ヨ鍙傛暟
+ const params = this.parseUrlParams(decodedUrl);
+ const shareType = params.shareType;
+ const videoId = params.videoId;
+ const source = params.source;
+ queryParam.videoId = videoId
+ queryParam.shareType = shareType
+ queryParam.source = source
+ console.log('瑙ｆ瀽鍙傛暟:', { shareType, videoId,source });
+ }
+ const token = storage.getAccessToken();
+ if(!token){
+ this.wxSilentLogin(() => {
+ // 鍒ゆ柇鏄笉鏄偣鍑诲垎浜摼鎺ヨ繘鏉ョ殑
+ if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
+ // 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
+ saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
+ }
+ this.getKitchenTypeList();
+ this.loadVideos(queryParam);
+
+ })
+ }else{
+ if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
+ // 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
+ saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
+ }
+ this.getKitchenTypeList();
+ this.loadVideos(queryParam);
+ }
+
+ },
+ onShareAppMessage(e) {
+ const userInfo = storage.getUserInfo();
+ if(!userInfo) {
+ console.log("鏈櫥褰曚笉鑳藉垎浜�");
+ return
+ }
+ const videoInfo = e.target.dataset.obj;
+ // 淇濆瓨鍒嗕韩璁板綍
+ const data = {
+ shareType: 'video',
+ refId: videoInfo.id,
+ shareUser: userInfo.id
+ }
+ saveShare(data)
+ return {
+ title: videoInfo.title,
+ path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ imageUrl: videoInfo.coverUrl
+ }
},
methods: {
+ // 瑙ｆ瀽URL鍙傛暟
+ parseUrlParams(url) {
+ const params = {};
+ // 澶勭悊鍙兘瀛樺湪鐨刪ash锛堝鏋滄湁鐨勮瘽锛�
+ const cleanUrl = url.split('#')[0];
+ const queryStr = cleanUrl.split('?')[1] || '';
+
+ queryStr.split('&').forEach(pair => {
+ const [key, value] = pair.split('=');
+ if (key) {
+ // 濡傛灉鍊煎瓨鍦紝鍒欒В鐮侊紝鍚﹀垯璁句负绌哄瓧绗︿覆
+ params[key] = value ? decodeURIComponent(value) : '';
+ }
+ });
+
+ return params;
+ },
+
+ // 鏌ヨ褰撳墠瑙嗛鐨勫叧鑱旇棰戯紙鎸備簡鍚屼竴鍟嗗搧鐨勶級
+ async getGoodsSimilarly() {
+ if (this.similarlyLoading || this.similarlyNomore) return Promise.resolve();;
+ const video = this.videoList[this.currentIndex];
+ if (video.goodsList && video.goodsList.length > 0) {
+ this.goodsSimilarlyQuery.goodsIds = video.goodsList.map(goods => goods.goodsId);
+ this.goodsSimilarlyQuery.currentVideoId = video.id;
+ if (this.similarlyVideoList.length < 1) {
+ this.similarlyVideoList.push(video); // 纭繚鍘熻棰戞槸妯悜瑙嗛鐨勭涓�涓厓绱�
+ }
+ this.similarlyLoading = true;
+ return getGoodsSimilarlyVideos(this.goodsSimilarlyQuery).then(res => {
+
+ this.similarlyVideoList = [
+ ...this.similarlyVideoList,
+ ...res.data.data.filter(
+ (newItem) => !this.similarlyVideoList.some((oldItem) => oldItem.id === newItem.id)
+ ),
+ ];
+
+ this.similarlyLoading = false;
+ if(res.data.data.length < this.goodsSimilarlyQuery.pageSize) {
+ this.similarlyNomore = true;
+ return;
+ }
+ this.goodsSimilarlyQuery.pageNumber++;
+ })
+ }
+ },
async chooseCategory(id) {
if (this.currentCategort === id) return
this.currentCategort = id
@@ -653,33 +802,74 @@
})
},
// 鍔犺浇瑙嗛鏁版嵁
- async loadVideos() {
+ async loadVideos(param) {
console.log(this.loading, this.videoNoMore,this.videoQuery)
if (this.videoQuery.pageNumber == 1) {
} else if (this.loading || this.videoNoMore) return;
this.loading = true;
-
+ if(param){
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ1")
+ console.log(this.videoQuery)
+ getkitchenVideoList(this.videoQuery).then(res => {
+ console.log(res)
+ // 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
+ const data = res.data.data.map(item => {
+ return {
+ ...item,
+ updateKey: item.id
+ }
+ })
+ if (this.videoQuery.pageNumber === 1) {
+ this.videoList = data;
+ } else {
+ this.videoList = [
+ ...this.videoList,
+ ...data.filter(
+ (newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
+ ),
+ ];
+ }
+ this.loading = false;
+ if (data.length < this.videoQuery.pageSize) {
+ this.videoNoMore = true;
+ return;
+ }
+ this.videoQuery.pageNumber++;
+
+ })
+ }else{
+
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ2")
+ console.log(this.videoQuery)
getkitchenVideoList(this.videoQuery).then(res => {
- console.log(res, "瑙嗛鏁版嵁");
+ console.log(res)
+ // 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
+ const data = res.data.data.map(item => {
+ return {
+ ...item,
+ updateKey: item.id
+ }
+ })
if (this.videoQuery.pageNumber === 1) {
- this.videoList = res.data.data;
+ this.videoList = data;
} else {
this.videoList = [
...this.videoList,
- ...res.data.data.filter(
+ ...data.filter(
(newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
),
];
}
this.loading = false;
- if (res.data.data.length < this.videoQuery.pageSize) {
+ if (data.length < this.videoQuery.pageSize) {
this.videoNoMore = true;
return;
}
this.videoQuery.pageNumber++;
})
+ }
},
// 婊戝姩鍒囨崲瑙嗛
@@ -708,6 +898,23 @@
// 鎾斁褰撳墠瑙嗛
const videoContext1 = uni.createVideoContext(`video${this.currentIndex}`, this);
videoContext1.play()
+
+ // 涓嬫粦鏃讹紝闇�瑕佸皢涓婁竴涓棰戦噸缃负鍘熷瑙嗛(濡傛灉妯悜婊戝姩浜嗙浉鍏宠棰�)
+ if (this.similaryVideoIndex !== 0) {
+ this.videoList[oldIndex] = this.similarlyVideoList[0]
+ }
+ this.similarlyVideoList = [];
+ this.similaryVideoIndex = 0;
+ this.similarlyNomore = false;
+ this.similarlyLoading = false;
+ this.goodsSimilarlyQuery = {
+ pageNumber: 1,
+ pageSize: 6,
+ videoFrom: 'goodsSimilarly',
+ goodsIds: [],
+ currentVideoId: ''
+ }
+
// 濡傛灉鍓╀綑瑙嗛涓嶈冻锛岃Е鍙戣姹傝幏鍙栨洿澶氳棰�
if (this.videoList.length - 1 < this.currentIndex + this.videoLiveOffset) {
this.loadVideos()
@@ -726,7 +933,7 @@
this.touchXY.endY = e.touches[0].pageY
},
// 缁撴潫瑙︽懜
- handleSwiperEnd(item) {
+ async handleSwiperEnd(item) {
// 闃叉婊戝姩婊氬姩鏉′篃瑙﹀彂璺宠浆
if (this.showProcess) {
return
@@ -738,11 +945,37 @@
if (Math.abs(diffX) > Math.abs(diffY)) {
if (diffX > 0) {
console.log('鍙虫粦')
- if (item.goodsList && item.goodsList.length > 0) {
- this.jumpToPay(item.id)
- }
+ if (this.similaryVideoIndex !== 0) {
+ // 濡傛灉婊戝姩浜嗘í鍚戣棰戯紝閭ｄ箞鍙虫粦灏卞仛瑙嗛鍒囨崲鑰屼笉鏄烦杞晢鍝侀〉
+ // 鍒囨崲涓嬩竴涓棰�
+ const oldIndex = this.similaryVideoIndex;
+ this.similaryVideoIndex = Math.max(this.similaryVideoIndex - 1, 0);
+ if (this.similaryVideoIndex < oldIndex) {
+ // 鎶婄珫鍚戣棰戠殑褰撳墠鎾斁浣嶇疆鏇挎崲涓烘í鍚戣棰戠殑褰撳墠绱㈠紩鍏冪礌
+ const video = this.similarlyVideoList[this.similaryVideoIndex];
+ video["updateKey"] = video.id + this.similaryVideoIndex
+ this.videoList.splice(this.currentIndex, 1, video);
+ // this.videoList[this.currentIndex] = video
+ }
+ }
+ else if (item.goodsList && item.goodsList.length > 0) {
+ this.jumpToPay(item.id)
+ }
} else {
console.log('宸︽粦')
+ if (this.similarlyVideoList.length < 1 || this.similarlyVideoList.length - this.similaryVideoIndex - 1 <= 3) {
+ // 鐩稿叧瑙嗛涓虹┖鎴栬�呭墿浣欒棰戜笉瓒筹紝瑙﹀彂鍔犺浇鐩稿叧瑙嗛
+ await this.getGoodsSimilarly()
+ }
+ // 鍒囨崲涓嬩竴涓棰�
+ const oldIndex = this.similaryVideoIndex;
+ this.similaryVideoIndex = Math.min(this.similaryVideoIndex + 1, this.similarlyVideoList.length - 1);
+ if (this.similaryVideoIndex > oldIndex) {
+ // 鎶婄珫鍚戣棰戠殑褰撳墠鎾斁浣嶇疆鏇挎崲涓烘í鍚戣棰戠殑褰撳墠绱㈠紩鍏冪礌
+ const video = this.similarlyVideoList[this.similaryVideoIndex];
+ video["updateKey"] = video.id + this.similaryVideoIndex
+ this.videoList.splice(this.currentIndex, 1, video);
+ }
}
}
// 閲嶇疆鍧愭爣
@@ -776,6 +1009,28 @@
}
})
},
+ // 鐐硅禐/鍙栨秷鐐硅禐
+ toggleThumbsUp(item, index) {
+ let data = {
+ refId: item.id,
+ thumbsUpType: 'video'
+ }
+ const beforeThumbsUp = item.thumbsUp
+ const beforeThumbsUpNum = item.thumbsUpNum
+ if(item.thumbsUp) {
+ this.videoList[index].thumbsUp = false
+ this.videoList[index].thumbsUpNum -= 1
+ } else {
+ this.videoList[index].thumbsUp = true
+ this.videoList[index].thumbsUpNum += 1
+ }
+ changeThumbsUp(data).then(res => {
+ if(res.data.code !== 200) {
+ this.videoList[index].thumbsUp = beforeThumbsUp
+ this.videoList[index].thumbsUpNum = beforeThumbsUpNum
+ }
+ })
+ },
// 鍗曞嚮灞忓箷锛氭殏鍋滄垨缁х画鎾斁
togglePlay(index) {
console.log("鍗曞嚮瑙嗛", index);
@@ -927,7 +1182,42 @@
::v-deep .custom-tabbar {
border-top: none !important;
}
-
+.choosePlatType{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: fixed;
+ z-index: 9999;
+ left: 0;
+ right: 0;
+
+}
+.platTypeItem{
+ width: 80rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ height: 60rpx;
+
+}
+.platTypeItem:nth-child(n+1){
+ margin-left: 32rpx;
+}
+.platTypeItemChoose{
+ margin-top: 15rpx;
+ width: 40%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #fff;
+ height: 4rpx;
+ border-radius: 5rpx;
+}
+.platTypeItenName{
+ color: #fff;
+ font-weight: bold;
+ font-size: 32rpx;
+}
.video-container {
position: relative;
width: 100%;
@@ -943,7 +1233,7 @@
background-color: #b6b6b6;
opacity: 0.8;
position: fixed;
- z-index: 999;
+ z-index: 99999;
height: 70rpx;
width: 50rpx;
border-radius: 0 50% 50% 0;
@@ -1423,4 +1713,16 @@
background-color: lightpink !important;
}
+
+.custom-share-btn {
+ font-size: unset;
+ background: none;
+ padding: 0;
+ margin: 0;
+ line-height: normal;
+ border: none;
+}
+.custom-share-btn::after {
+ border: none;
+}
</style>
--
Gitblit v1.8.0