修复bug
This commit is contained in:
parent
f647c1b972
commit
0c90133ca4
|
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"usingComponents": {},
|
"usingComponents": {},
|
||||||
"navigationBarTextStyle": "white",
|
"navigationBarTextStyle": "white",
|
||||||
"pageOrientation": "landscape"
|
"pageOrientation": "landscape",
|
||||||
|
"disableScroll": true
|
||||||
}
|
}
|
||||||
|
|
@ -179,7 +179,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
&-box {
|
&-box {
|
||||||
height: calc(100% / 3);
|
height: 96px;
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 2rpx 4rpx;
|
padding: 2rpx 4rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,7 @@ Page({
|
||||||
isReconnec: false,
|
isReconnec: false,
|
||||||
isReconnecTime: false,
|
isReconnecTime: false,
|
||||||
isAutoApplySpeakDialog: false,
|
isAutoApplySpeakDialog: false,
|
||||||
|
showScroll: false,
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'roomUserList.**': function (roomUserList) {
|
'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) {
|
async onLoad(option) {
|
||||||
wx.enableAlertBeforeUnload({
|
wx.enableAlertBeforeUnload({
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
<text class="meeting-content-video-user-text">{{currentUser.userName}}</text>
|
<text class="meeting-content-video-user-text">{{currentUser.userName}}</text>
|
||||||
</view>
|
</view>
|
||||||
</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" 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 {{item.uid == currentUid ? 'active' : ''}}">
|
||||||
<view class="meeting-content-smallvideo-box-view-avatar {{item.uid == currentUid ? 'active' : ''}}" wx:if="{{!item.enableCamera}}">
|
<view class="meeting-content-smallvideo-box-view-avatar {{item.uid == currentUid ? 'active' : ''}}" wx:if="{{!item.enableCamera}}">
|
||||||
|
|
@ -59,10 +59,10 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</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" />
|
<t-icon name="chevron-up" size="24rpx" data-name="chevron-up" />
|
||||||
</view>
|
</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" />
|
<t-icon name="chevron-down" size="24rpx" data-name="chevron-down" />
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue