diff --git a/components/u-popup/u-popup.vue b/components/u-popup/u-popup.vue index 4ac9a4be..76d6004b 100644 --- a/components/u-popup/u-popup.vue +++ b/components/u-popup/u-popup.vue @@ -7,20 +7,20 @@ - + + + + {{ propTitle }} + + + + 取消 {{ propCustomBtnText }} 确定 - - - - {{ propTitle }} - - - @@ -187,6 +187,10 @@ type: Boolean, default: true, }, + propWidth: { + type: String, + default: '', + }, }, watch: { @@ -473,6 +477,7 @@ show: false, type: this.propType, }); + this.$emit('close') clearTimeout(this.timer); // // 自定义关闭事件 // this.customOpen && this.customClose() diff --git a/pages/plugins/video/components/comment-info.vue b/pages/plugins/video/components/comment-info.vue index 066369fb..1eb57e47 100644 --- a/pages/plugins/video/components/comment-info.vue +++ b/pages/plugins/video/components/comment-info.vue @@ -14,7 +14,7 @@ - + {{ item.label }} @@ -113,8 +113,8 @@ //#endif //#ifndef APP-NVUE this.dropdownOptions = [ - { label: $t('common.delete'), type: 'delete' }, - { label: $t('common.complaint'), type: 'report' } + { label: this.$t('common.del'), type: 'delete' }, + { label: this.$t('common.complaint'), type: 'report' } ] //#endif }, diff --git a/pages/plugins/video/detail/detail.nvue b/pages/plugins/video/detail/detail.nvue index 3bf23938..c094e904 100644 --- a/pages/plugins/video/detail/detail.nvue +++ b/pages/plugins/video/detail/detail.nvue @@ -7,13 +7,13 @@ - + - + - - + + @@ -26,7 +26,7 @@ - {{ video_item.comments_count }} + {{ video_item.comments_count }}{{ paused }}{{ current_index == index }} @@ -165,33 +165,37 @@ - + - {{$t('video-detail.video-detail.rfsdfg')}}* - - - - - {{mainItem.name}} + {{$t('video-detail.video-detail.rfsdfg')}}* + + + + + + {{mainItem.name}} + - + - {{$t('video-detail.video-detail.fsdf33')}}* - - - - - {{subItem}} + {{$t('video-detail.video-detail.fsdf33')}}* + + + + + + {{subItem}} + - + @@ -824,13 +828,14 @@ }, // 切换播放暂停 - toggle_play_pause() { + toggle_play_pause(e) { try { const currentIndex = this.current_index; // 检查视频上下文是否存在 const videoContext = this.create_video_contexts[currentIndex] || this.video_contexts[currentIndex]; if (!videoContext) { - console.warn(`当前索引 ${currentIndex} 无可用视频上下文`); + console.warn(`当前索引 ${currentIndex} 无可用视频上下文`); + e.stopPropagation(); return; } @@ -841,13 +846,15 @@ // 暂停当前视频 try { videoContext.pause(); - } catch (error) { + } catch (error) { + e.stopPropagation(); console.warn('暂停视频失败:', error); } } else { // 播放当前视频 this.video_play_event(videoContext); - } + } + e.stopPropagation(); } catch (error) { console.error('toggle_play_pause error:', error); } @@ -1102,7 +1109,6 @@ // 关闭评论区 close_comment_modal(e) { try { - console.log('close_comment_modal', e.currentTarget.dataset.type); this.active_dropdown_id = null; this.show_comment_modal = false; this.comment_scroll_top = 0 + Math.random(); // 关闭评论时滚动到最顶部 @@ -1631,8 +1637,8 @@ } }); // this.video_data_list = this.video_data_list; - this.$set(this, 'video_data_list', this.video_data_list); - console.log(this.video_data_list); + this.$set(this, 'video_data_list', this.video_data_list); + console.log(this.video_data_list); e.stopPropagation(); } catch (error) { console.error('product_close_event error:', error); @@ -1837,7 +1843,7 @@ // 关闭举报弹窗 popup_report_close_event() { try { - this.$refs.popupReportRef.close(); + // this.$refs.popupReportRef.close(); this.current_main_index = 0; this.current_sub_index = 0; } catch (error) { @@ -1849,6 +1855,7 @@ select_main_reason(e) { try { const index = e?.currentTarget?.dataset?.index || 0; + console.log(index); const main_index = parseInt(index); if (main_index !== this.current_main_index) { this.current_main_index = main_index; @@ -1964,30 +1971,19 @@ .play-icon { position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); + top: 0; + left: 0; pointer-events: none; } - .play-icon .play-icon-bg { + .play-icon-bg { position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); background: #fff; width: 60rpx; height: 60rpx; z-index: 0; } - .play-icon .play-icon-iconfont { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - } - .right-actions { position: absolute; right: 20rpx; @@ -2269,7 +2265,7 @@ color: #333; } - .report-label text { + .report-required { color: #e74c3c; font-size: 30rpx; vertical-align: middle;