From bfd629f26433ba66197d00fa21f1e1c6b016fa7b Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Fri, 13 Dec 2024 12:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserName/index.tsx | 23 ++++++++++++++---------
 src/page/Meeting/index.tsx        |  9 ++++++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/UserName/index.tsx b/src/components/UserName/index.tsx
index 2f0d030..1bc10d7 100644
--- a/src/components/UserName/index.tsx
+++ b/src/components/UserName/index.tsx
@@ -5,13 +5,16 @@ import { Button, Input, message, Modal } from 'antd';
 import { useState, useImperativeHandle, forwardRef } from "react";
 const UserName = forwardRef((props: any, ref: any) => {
   useImperativeHandle(ref, () => ({
-    changeModal: (str: string) => {
-      setUserName(str)
+    changeModal: (data: any) => {
+      setInfo(data)
       setUserNameModal(true)
     }
   }))
   const [userNameModal, setUserNameModal] = useState(false);
-  const [userName, setUserName] = useState('');
+  const [info, setInfo] = useState({
+    userName: '',
+    uid: ''
+  });
   return (
     <>
       <Modal
@@ -28,9 +31,12 @@ const UserName = forwardRef((props: any, ref: any) => {
             <Input
               placeholder="请输入用户名称"
               style={{ width: '100%' }}
-              value={userName}
+              value={info.userName}
               onChange={(e) => {
-                setUserName(e.target.value)
+                setInfo({
+                  ...info,
+                  userName: e.target.value
+                })
               }}
             />
           </div>
@@ -40,12 +46,11 @@ const UserName = forwardRef((props: any, ref: any) => {
             <Button type="primary"
               onClick={async () => {
                 const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
-                const userInfo = await JSON.parse(storage.getItem('user') as string);
-                if (userName) {
+                if (info.userName) {
                   PutAlterUname({
-                    nickName: userName,
+                    nickName: info.userName,
                     roomNum: stateInfo.channelId,
-                    uid: userInfo.uid,
+                    uid: info.uid,
                   }).then((res) => {
                     if (res.code === 200) {
                       message.success('修改成功')
diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 92d061e..e16d663 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -1284,7 +1284,7 @@ const Meeting: React.FC = () => {
         break;
       case 'ModifyNickName':
         setRoomUserList((res: any) => {
-          let userItem = res.find((row: any) => row.uid === item.uid)
+          let userItem = res.find((row: any) => row.uid == item.uid)
           if (userItem) {
             userItem.userName = item.nickName
           }
@@ -2505,9 +2505,12 @@ const Meeting: React.FC = () => {
                                       <Button
                                         type="primary"
                                         className='m-ant-btn'
-                                        style={{ width: '100%' }}
+                                        style={{ width: '100%', marginTop: '10px' }}
                                         onClick={() => {
-                                          userNameRef.current.changeModal(item.userName)
+                                          userNameRef.current.changeModal({
+                                            userName: item.userName,
+                                            uid: item.uid
+                                          })
                                         }}
                                       >修改用户名</Button>
                                     </div>