diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss
index 5ea7095..3d55b4a 100644
--- a/src/page/Meeting/index.module.scss
+++ b/src/page/Meeting/index.module.scss
@@ -50,8 +50,8 @@
justify-content: center;
display: flex;
align-items: center;
- left: 50%;
- top: 50%;
+ left: calc(50% + 2px);
+ top: calc(50% + 2px);
transform: translate(-50%, -50%);
width: calc(100% - 18px);
height: calc(100% - 18px);
@@ -258,11 +258,17 @@
box-sizing: border-box;
.boxShadow {
- box-shadow: 0px 0px 13px 0px #7B96FF;
- border: 2px solid #7B96FF;
+ box-shadow: 0px 0px 13px 0px #7B96FF !important;
+ border: 2px solid #7B96FF !important;
+ }
+
+ .active {
+ border: 2px solid #0fa01b !important;
}
.meetingContentSwiperCardVdeio {
+ box-shadow: 0px 0px 13px 0px transparent;
+ border: 2px solid transparent;
width: 100%;
height: 100%;
cursor: pointer;
@@ -275,6 +281,7 @@
top: 50%;
transform: translate(-50%, -50%) scale(2);
}
+
}
}
@@ -607,7 +614,11 @@
position: absolute;
color: white;
font-size: 14px;
- width: 30px;
+ width: 26px;
+ height: 26px;
+ text-align: center;
+ line-height: 26px;
+ right: -10px;
}
&:hover {
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index e46a44e..dc006a0 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -271,7 +271,7 @@ const Meeting: React.FC = () => {
case 'AllLeave':
leaveChannel(false)
break;
- // 踢出房间
+ // 移出会议
case 'ForceExitRoom':
leaveChannel()
break;
@@ -1007,13 +1007,13 @@ const Meeting: React.FC = () => {
}
}}
>
-
+
{meetingContentUser(item)}
- {item.enableCamera ? null : meetingContentError(currentVideoId, item, item.roleId === '1' || item.isRoomManager)}
+ {item.enableCamera ? null : meetingContentError(item)}
{String(isShare) === item.screenShareId ?
屏幕分享中
: null}
@@ -1036,7 +1036,7 @@ const Meeting: React.FC = () => {
event.stopPropagation();
GetRoomKickout(state.channelId, item.uid)
}}
- >踢出房间 : null}
+ >移出会议 : null}
{item.uid !== user.uid ?
: null}
+ >{item.isRoomManager ? '取消发言人' : '设为发言人'} : null}
{item.isRoomManager ?
}
{meetingContentUser(currentLookUserAccount, true)}
- {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
+ {currentLookUserAccount.enableCamera ? null : meetingContentError(currentLookUserAccount)}
: null}
{currentLookUserStatus === 2 && currentLookUserAccount ?
@@ -1136,7 +1136,7 @@ const Meeting: React.FC = () => {
{meetingContentUser(currentLookUserAccount, true)}
- {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)}
+ {currentLookUserAccount.enableCamera ? null : meetingContentError(currentLookUserAccount)}
: null}
@@ -1227,7 +1227,7 @@ const Meeting: React.FC = () => {
})
}
}}
- >{item.isRoomManager ? '取消房间发言人' : '设为发言人'}
+ >{item.isRoomManager ? '取消发言人' : '设为发言人'}
+ >移出会议
}>
{
event.stopPropagation();
GetRoomKickout(state.channelId, roomUserItem.uid)
}}
- >踢出房间 : null}
+ >移出会议 : null}
{roomUserItem.uid !== user.uid ? : null}
+ >{roomUserItem.isRoomManager ? '取消发言人' : '设为发言人'} : null}
{roomUserItem.isRoomManager ?