diff --git a/src/components/InvitingPersonnelModal/index.module.scss b/src/components/InvitingPersonnelModal/index.module.scss index d94deba..895e8e8 100644 --- a/src/components/InvitingPersonnelModal/index.module.scss +++ b/src/components/InvitingPersonnelModal/index.module.scss @@ -41,6 +41,7 @@ >div:nth-child(2) { font-size: 14px; margin-left: 10px; + white-space: nowrap; } &:last-child { diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx index 52fba6f..45c5cfb 100644 --- a/src/components/InvitingPersonnelModal/index.tsx +++ b/src/components/InvitingPersonnelModal/index.tsx @@ -150,9 +150,12 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { }) }} disabled={!item.isOnline || item.account === user.account || item.disabled} checked={item.checked}>
- {item.userName}{item.account === user.account ? '(我)' : ''}{item.disabled ? '(已入会)' : ''} + {item.userName}{item.account === user.account ? '(我)' : ''} + +
+ {item.disabled ? 已入会 : null} + {item.isOnline ? '在线' : '离线'}
-
{item.isOnline ? '在线' : '离线'}
) : 暂无数据} { diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index 755b401..261edff 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -35,7 +35,7 @@ } >span { - font-size: 16px; + font-size: 13px; color: #EEEEEE; flex-grow: 1; white-space: nowrap; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 186cfa0..423481f 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -278,7 +278,7 @@ const Meeting: React.FC = () => { setStatusList((res: any) => { if (!res.userChatList) { api.open({ - message: item.userName, + message: item.userName + '说:', description: item.message, duration: 3, showProgress: true, @@ -384,20 +384,42 @@ const Meeting: React.FC = () => { : null} - {item.uid !== user.uid ? : null} {item.uid !== user.uid && item.roleId !== '1' ? : null} + {item.uid !== user.uid ? : null} }>
@@ -1417,16 +1439,16 @@ const Meeting: React.FC = () => {
-
+ {item.roleId === '1' || item.isRoomManager ?
{ postOpenMicr(!item.enableMicr, item.uid) }} title={item.enableMicr ? '静音' : '解除声音'} /> -
-
+
: null} + {item.roleId === '1' || item.isRoomManager ?
{ postOpenCamera(!item.enableCamera, item.uid) }} title={item.enableCamera ? '关闭视频' : '开启视频'} /> -
+
: null} {item.uid !== user.uid && user.roleId === '1' ?
@@ -1453,8 +1475,7 @@ const Meeting: React.FC = () => { >{item.isRoomManager ? '取消发言人' : '设为发言人'} : null} : null} - {roomUserItem.uid !== user.uid ? : null} {roomUserItem.uid !== user.uid && roomUserItem.roleId !== '1' ? : null} + {roomUserItem.uid !== user.uid ? : null}
:
用户不在房间内
}>
diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index 2156645..4cc5646 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -269,7 +269,7 @@ const agora = { let data = { frameRate: isFluencyPriority ? 30 : 15, dimensions: { - window: 1920, + width: 1920, height: 1080, } }