From 565df9891dea0b394723b8dbe4199fbdb6026b6a Mon Sep 17 00:00:00 2001
From: unknown <18119604035@163.com>
Date: Thu, 3 Aug 2023 09:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=BB=84=E4=BB=B6open?=
 =?UTF-8?q?=E5=A4=96=E7=BD=AE=E5=B9=B6=E4=BD=BF=E7=94=A8=E4=B8=89=E5=85=83?=
 =?UTF-8?q?=E8=BF=90=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compenents/change-password/index.tsx | 114 ++++++++++++-----------
 src/compenents/user-info/index.tsx       | 104 +++++++++++----------
 2 files changed, 111 insertions(+), 107 deletions(-)

diff --git a/src/compenents/change-password/index.tsx b/src/compenents/change-password/index.tsx
index 10764eb..de930ae 100644
--- a/src/compenents/change-password/index.tsx
+++ b/src/compenents/change-password/index.tsx
@@ -40,63 +40,65 @@ export const ChangePasswordModel: React.FC<PropInterface> = ({
 
   return (
     <>
-      <Modal
-        title="修改密码"
-        centered
-        forceRender
-        open={open}
-        width={416}
-        onOk={() => form.submit()}
-        onCancel={() => onCancel()}
-        maskClosable={false}
-      >
-        <div className="float-left mt-24">
-          <Form
-            form={form}
-            name="change-password"
-            labelCol={{ span: 8 }}
-            wrapperCol={{ span: 16 }}
-            initialValues={{ remember: true }}
-            onFinish={onFinish}
-            onFinishFailed={onFinishFailed}
-            autoComplete="off"
-          >
-            <Form.Item
-              label="请输入原密码"
-              name="old_password"
-              rules={[{ required: true, message: "请输入原密码!" }]}
+      {open ? (
+        <Modal
+          title="修改密码"
+          centered
+          forceRender
+          open={true}
+          width={416}
+          onOk={() => form.submit()}
+          onCancel={() => onCancel()}
+          maskClosable={false}
+        >
+          <div className="float-left mt-24">
+            <Form
+              form={form}
+              name="change-password"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}
+              initialValues={{ remember: true }}
+              onFinish={onFinish}
+              onFinishFailed={onFinishFailed}
+              autoComplete="off"
             >
-              <Input.Password
-                style={{ width: 200 }}
-                autoComplete="off"
-                placeholder="请输入原密码"
-              />
-            </Form.Item>
-            <Form.Item
-              label="输入新密码"
-              name="new_password"
-              rules={[{ required: true, message: "请输入新密码!" }]}
-            >
-              <Input.Password
-                style={{ width: 200 }}
-                autoComplete="off"
-                placeholder="请输入新密码"
-              />
-            </Form.Item>
-            <Form.Item
-              label="再次输入新密码"
-              name="again_new_password"
-              rules={[{ required: true, message: "再次输入新密码!" }]}
-            >
-              <Input.Password
-                style={{ width: 200 }}
-                autoComplete="off"
-                placeholder="再次输入新密码"
-              />
-            </Form.Item>
-          </Form>
-        </div>
-      </Modal>
+              <Form.Item
+                label="请输入原密码"
+                name="old_password"
+                rules={[{ required: true, message: "请输入原密码!" }]}
+              >
+                <Input.Password
+                  style={{ width: 200 }}
+                  autoComplete="off"
+                  placeholder="请输入原密码"
+                />
+              </Form.Item>
+              <Form.Item
+                label="输入新密码"
+                name="new_password"
+                rules={[{ required: true, message: "请输入新密码!" }]}
+              >
+                <Input.Password
+                  style={{ width: 200 }}
+                  autoComplete="off"
+                  placeholder="请输入新密码"
+                />
+              </Form.Item>
+              <Form.Item
+                label="再次输入新密码"
+                name="again_new_password"
+                rules={[{ required: true, message: "再次输入新密码!" }]}
+              >
+                <Input.Password
+                  style={{ width: 200 }}
+                  autoComplete="off"
+                  placeholder="再次输入新密码"
+                />
+              </Form.Item>
+            </Form>
+          </div>
+        </Modal>
+      ) : null}
     </>
   );
 };
diff --git a/src/compenents/user-info/index.tsx b/src/compenents/user-info/index.tsx
index f2ba4e5..04bc25c 100644
--- a/src/compenents/user-info/index.tsx
+++ b/src/compenents/user-info/index.tsx
@@ -75,60 +75,62 @@ export const UserInfoModel: React.FC<PropInterface> = ({ open, onCancel }) => {
 
   return (
     <>
-      <Modal
-        title="个人信息"
-        centered
-        forceRender
-        open={open}
-        width={416}
-        onCancel={() => onCancel()}
-        maskClosable={false}
-        footer={null}
-      >
-        <div className="mt-24">
-          <Form
-            form={form}
-            name="user-info"
-            labelCol={{ span: 8 }}
-            wrapperCol={{ span: 16 }}
-            initialValues={{ remember: true }}
-            autoComplete="off"
-          >
-            <Form.Item
-              label="学员头像"
-              labelCol={{ style: { marginTop: 15, marginLeft: 52 } }}
+      {open ? (
+        <Modal
+          title="个人信息"
+          centered
+          forceRender
+          open={true}
+          width={416}
+          onCancel={() => onCancel()}
+          maskClosable={false}
+          footer={null}
+        >
+          <div className="mt-24">
+            <Form
+              form={form}
+              name="user-info"
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}
+              initialValues={{ remember: true }}
+              autoComplete="off"
             >
-              <div className="d-flex">
-                {avatar && (
-                  <Image
-                    loading="lazy"
-                    width={60}
-                    height={60}
-                    style={{ borderRadius: "50%" }}
-                    src={avatar}
-                    preview={false}
-                  />
-                )}
-                <div className="d-flex ml-16">
-                  <Upload {...props} showUploadList={false}>
-                    <Button>更换头像</Button>
-                  </Upload>
+              <Form.Item
+                label="学员头像"
+                labelCol={{ style: { marginTop: 15, marginLeft: 52 } }}
+              >
+                <div className="d-flex">
+                  {avatar && (
+                    <Image
+                      loading="lazy"
+                      width={60}
+                      height={60}
+                      style={{ borderRadius: "50%" }}
+                      src={avatar}
+                      preview={false}
+                    />
+                  )}
+                  <div className="d-flex ml-16">
+                    <Upload {...props} showUploadList={false}>
+                      <Button>更换头像</Button>
+                    </Upload>
+                  </div>
                 </div>
-              </div>
-            </Form.Item>
-            {name && (
-              <Form.Item label="学员姓名">
-                <div>{name}</div>
               </Form.Item>
-            )}
-            {idCard && (
-              <Form.Item label="身份证号" style={{ marginBottom: 16 }}>
-                <div>{idCard}</div>
-              </Form.Item>
-            )}
-          </Form>
-        </div>
-      </Modal>
+              {name && (
+                <Form.Item label="学员姓名">
+                  <div>{name}</div>
+                </Form.Item>
+              )}
+              {idCard && (
+                <Form.Item label="身份证号" style={{ marginBottom: 16 }}>
+                  <div>{idCard}</div>
+                </Form.Item>
+              )}
+            </Form>
+          </div>
+        </Modal>
+      ) : null}
     </>
   );
 };