From 474668108751c268e1ace5ff8765153764bd6476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 16 Mar 2026 16:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/upload/upload.vue               | 15 +++--------
 pages/plugins/video/detail/detail.nvue     | 29 ++++++++++++++++------
 pages/plugins/video/detail/scrollMixins.js |  5 ++--
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/components/upload/upload.vue b/components/upload/upload.vue
index 5e7f7b24..a060aa37 100644
--- a/components/upload/upload.vue
+++ b/components/upload/upload.vue
@@ -74,11 +74,7 @@
             propCallData: {
                 type: [Number, String, Array, Object],
                 default: '',
-            },
-            propChooseFocus: {
-                type: Boolean,
-                default: false,
-            },
+            }
         },
         data() {
             return {
@@ -125,6 +121,7 @@
                                             //#endif
                                             //#ifdef APP-NVUE
                                             self.$emit('callBack', data.data, self.propCallData);
+                                            uni.$emit('callBack', data.data, self.propCallData);
                                             //#endif
                                         } else {
                                             self.$emit('call-back', data.data.url, self.propCallData);
@@ -185,14 +182,10 @@
                     },
                     complete(res) {
                         //#ifndef APP-NVUE
-                        if (self.propChooseFocus) {
-                            self.$emit('chooseFocus');
-                        }
+                        self.$emit('chooseFocus');
                         //#endif
                         //#ifdef APP-NVUE
-                        if (self.propChooseFocus) {
-                            uni.$emit('chooseFocus');
-                        }
+                        uni.$emit('chooseFocus');
                         //#endif
                     },
                 });
diff --git a/pages/plugins/video/detail/detail.nvue b/pages/plugins/video/detail/detail.nvue
index 5f1e7797..a1aec369 100644
--- a/pages/plugins/video/detail/detail.nvue
+++ b/pages/plugins/video/detail/detail.nvue
@@ -4,7 +4,7 @@
             <!-- 视频列表 -->
             <view class="swiper" ref="swiper">
                 <block v-for="(video_item, index) in video_data_list" :key="video_item.id">
-                    <view class="pr" @tap.stop="toggle_play_pause" :style="width_height_style + swiperStyle" @touchstart.prevent="ListTouchStart" @touchmove.prevent="ListTouchMove">
+                    <view class="pr" @tap.stop="toggle_play_pause" :style="width_height_style" @touchstart.prevent="ListTouchStart" @touchmove.prevent="ListTouchMove">
                         <view class="video-bg" :style="width_height_style">
                             <template v-if="!isEmpty(video_item.cover)">
                                 <image class="video-bg-image" :style="width_height_style" :src="video_item.cover" mode="scaleToFill"></image>
@@ -434,6 +434,10 @@
                 uni.$on('chooseFocus', (data) => {  
                     this.upload_event();
                 })  
+
+                uni.$on('callBack', (res) => {  
+                    this.upload_images_event(res);
+                })
                 // 初始化
                 this.init();
 
@@ -451,11 +455,12 @@
             if (this.comment_move_throttle_timer) {
                 clearTimeout(this.comment_move_throttle_timer);
             }
-
+        
             // 清理所有视频资源
             this.cleanup_all_videos();
             this.unbind_keyboard_listener();
             uni.$off('chooseFocus');
+            uni.$off('callBack');
         },
         methods: {
             isEmpty,
@@ -923,8 +928,11 @@
                     
                     if (this.$refs.commentRef) {
                         this.$refs.commentRef.blur();
+                    }
+                    
+                    if (e) {
+                        e.stopPropagation();
                     }
-                    e.stopPropagation();
                 } catch (error) {
                     console.error('close_comment_modal error:', error);
                 }
@@ -1020,11 +1028,16 @@
                             e.preventDefault();
                         }
                         
-                        const current_y = e?.touches[0]?.pageY || 0;
+                        const current_y = e?.touches[0]?.pageY || 0;
+                        const move_y = current_y - this.comment_current_y;
+                        // 小于3的时候不认为是有效滑动，避免因为手指抖动影响
+                        if (move_y < 3) {
+                            return;
+                        }
                         const distance = current_y - this.comment_start_y;
                         
-                        // 只有向下移动且距离超过阈值（30px）才开始拖拽，避免误触和抖动
-                        if (distance > 10) {
+                        // 只有向下移动且距离超过阈值（15px）才开始拖拽，避免误触和抖动
+                        if (distance > 15) {
                             this.is_dragging = true;
                             this.comment_current_y = current_y;
                             
@@ -1032,13 +1045,13 @@
                             if (this.comment_move_throttle_timer) {
                                 return;
                             }
-                            
+
                             this.move_distance = distance;
                             
                             // 设置节流定时器，16ms 约等于 60fps，保证流畅度同时避免过度更新
                             this.comment_move_throttle_timer = setTimeout(() => {
                                 this.comment_move_throttle_timer = null;
-                            }, 80);
+                            }, 60);
                         }
                     }
                 } catch(error) {
diff --git a/pages/plugins/video/detail/scrollMixins.js b/pages/plugins/video/detail/scrollMixins.js
index ad99b352..0035a579 100644
--- a/pages/plugins/video/detail/scrollMixins.js
+++ b/pages/plugins/video/detail/scrollMixins.js
@@ -119,7 +119,6 @@ export default {
 							
 							// 记录当前坐标
 							const distance = this.distance + e.deltaY
-							
 							if(distance>0 || this.distance + e.deltaY-this.windowHeight<-this.windowHeight*this.video_data_list.length) {
 								if (this.index == 0) {
 									this.showToast('当前已经是第一条了');
@@ -163,9 +162,10 @@ export default {
 			} else{
 				// 往上下拖动超过一半时
 				final_Y = this.distance + (Y>0?1:-1) *this.windowHeight
-				changed_Y= final_Y - distance// 计算出需要位置的值
+				changed_Y= final_Y - distance + (Y>0? 23 : -23)// 计算出需要位置的值
 				translate_Y_origin = `easeOutExpo(t,${distance},${changed_Y},600)` // 运动曲线为easeOutExpo
 			}
+			
 			let result = BindingX.bind({
 				eventType:'timing',       // 结束的时候是没有任何监听的 用 timing 来做定时的动画
 				exitExpression:"t>300",  // 当时间超过 300ms 结束动画
@@ -207,6 +207,7 @@ export default {
 				changed_X= final_X - distance// 计算出需要位置的值
 				origin = `easeOutExpo(t,${distance},${changed_X},300)` // 运动曲线为easeOutExpo
 			}
+            console.log(changed_X);
 			let result = BindingX.bind({
 				eventType:'timing',       // 结束的时候是没有任何监听的 用 timing 来做定时的动画
 				exitExpression:"t>300",  // 当时间超过 300ms 结束动画