From 2eb21bfe2f40630a46e675211f23b5f240e395a4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 15:01:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon
---
pages/health/healthVideo.vue | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/pages/health/healthVideo.vue b/pages/health/healthVideo.vue
index c77bfdb..4b17775 100644
--- a/pages/health/healthVideo.vue
+++ b/pages/health/healthVideo.vue
@@ -337,6 +337,7 @@
},
loading: false, // 鏄惁姝ｅ湪鍔犺浇
videoQuery: {
+ source:'system',
pageNumber: 1,
pageSize: 10,
videoFrom: 'recommend'
@@ -375,18 +376,41 @@
},
onLoad(option) {
this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
+ let queryParam = this.videoQuery;
+ if (option.q) {
+ // 鍙岄噸瑙ｇ爜锛氬井淇″URL杩涜浜嗕袱娆＄紪鐮�
+ 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(() => {
- this.loadVideos();
// 鍒ゆ柇鏄笉鏄偣鍑诲垎浜摼鎺ヨ繘鏉ョ殑
if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
// 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
}
+ this.loadVideos(queryParam);
})
} else {
- this.loadVideos();
+ if (option.userId && option.videoId) {
+ queryParam.videoId = option.videoId
+ // 淇濆瓨鍒嗕韩鐐瑰嚮璁板綍
+ saveShareClickRecord({refId: option.videoId, shareUserId: option.userId})
+ }
+ this.loadVideos(queryParam);
}
},
onShareAppMessage(e) {
@@ -410,6 +434,23 @@
}
},
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();;
@@ -739,11 +780,45 @@
},
// 鍔犺浇瑙嗛鏁版嵁
- async loadVideos() {
+ async loadVideos(param) {
if (this.loading || this.videoNoMore) return;
this.loading = true;
+ if(param){
+ console.log("浜岀淮鐮佹壂鐮佹暟鎹墽琛屽湪姝ゅ1")
+ console.log(this.videoQuery)
+ getHealthRecommendVideos(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)
getHealthRecommendVideos(this.videoQuery).then(res => {
+ console.log(res)
// 鏂板涓�涓瓧娈电敤浜庡惊鐜椂鐨刱ey
const data = res.data.data.map(item => {
return {
@@ -768,7 +843,7 @@
}
this.videoQuery.pageNumber++;
- })
+ })}
},
// 婊戝姩鍒囨崲瑙嗛
--
Gitblit v1.8.0