From 0c90133ca4c4cb1027479bbe3f4b348ee84c7226 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Mon, 17 Feb 2025 17:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meeting/index.json |  7 ++++---
 pages/meeting/index.scss |  2 +-
 pages/meeting/index.ts   | 10 ++++++++++
 pages/meeting/index.wxml |  6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pages/meeting/index.json b/pages/meeting/index.json
index 8692885..40239f1 100644
--- a/pages/meeting/index.json
+++ b/pages/meeting/index.json
@@ -1,5 +1,6 @@
 {
-    "usingComponents": {},
-    "navigationBarTextStyle": "white",
-    "pageOrientation": "landscape"
+  "usingComponents": {},
+  "navigationBarTextStyle": "white",
+  "pageOrientation": "landscape",
+  "disableScroll": true
 }
\ No newline at end of file
diff --git a/pages/meeting/index.scss b/pages/meeting/index.scss
index 83e8d7b..7bd50e0 100644
--- a/pages/meeting/index.scss
+++ b/pages/meeting/index.scss
@@ -179,7 +179,7 @@
       }
 
       &-box {
-        height: calc(100% / 3);
+        height: 96px;
         position: relative;
         padding: 2rpx 4rpx;
         box-sizing: border-box;
diff --git a/pages/meeting/index.ts b/pages/meeting/index.ts
index e798ad6..d686ab3 100644
--- a/pages/meeting/index.ts
+++ b/pages/meeting/index.ts
@@ -104,6 +104,7 @@ Page({
     isReconnec: false,
     isReconnecTime: false,
     isAutoApplySpeakDialog: false,
+    showScroll: false,
   },
   watch: {
     'roomUserList.**': function (roomUserList) {
@@ -231,6 +232,15 @@ Page({
         })
       }
     },
+    'isAdmin': function () {
+      const query = wx.createSelectorQuery()
+      query.select('#meeting-content-smallvideo').fields({ size: true, scrollOffset: true }, (res) => {
+        this.setData({
+          showScroll: Math.ceil(res.scrollHeight) > Math.ceil(res.height)
+        })
+      })
+      query.exec()
+    }
   },
   async onLoad(option) {
     wx.enableAlertBeforeUnload({
diff --git a/pages/meeting/index.wxml b/pages/meeting/index.wxml
index a171314..508e79f 100644
--- a/pages/meeting/index.wxml
+++ b/pages/meeting/index.wxml
@@ -29,7 +29,7 @@
         <text class="meeting-content-video-user-text">{{currentUser.userName}}</text>
       </view>
     </view>
-    <scroll-view scroll-y class="meeting-content-smallvideo" id="meeting-content-smallvideo" style="width: {{isFullscreen ? '0' :'20%'}}" bindscroll='scroll' scroll-top="{{scrollTop}}">
+    <scroll-view scroll-y class="meeting-content-smallvideo" id="meeting-content-smallvideo" style="width: {{isFullscreen ? '0' :'170px'}}" bindscroll='scroll' scroll-top="{{scrollTop}}">
       <view class="meeting-content-smallvideo-box" id="video-{{item.uid}}" wx:for="{{roomUserList}}" data-item="{{item}}" wx:key="index" bind:tap="clickChangeVideo" wx:if="{{item.isRoom && item.isAdmin}}">
         <view class="meeting-content-smallvideo-box-view {{item.uid == currentUid  ? 'active' : ''}}">
           <view class="meeting-content-smallvideo-box-view-avatar {{item.uid == currentUid  ? 'active' : ''}}" wx:if="{{!item.enableCamera}}">
@@ -59,10 +59,10 @@
           </view>
         </view>
       </view>
-      <view class="meeting-content-smallvideo-up" bind:tap="scrollUp" wx:if="{{!isFullscreen && isAdmin>3}}">
+      <view class="meeting-content-smallvideo-up" bind:tap="scrollUp" wx:if="{{!isFullscreen && showScroll}}">
         <t-icon name="chevron-up" size="24rpx" data-name="chevron-up" />
       </view>
-      <view class="meeting-content-smallvideo-down" bind:tap="scrollDown" wx:if="{{!isFullscreen && isAdmin>3}}">
+      <view class="meeting-content-smallvideo-down" bind:tap="scrollDown" wx:if="{{!isFullscreen && showScroll}}">
         <t-icon name="chevron-down" size="24rpx" data-name="chevron-down" />
       </view>
     </scroll-view>