密码修改

src/components/GlobalHeader/ShowPassword.jsx

@@ -18,13 +18,18 @@ function passwodForm(props) {
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFieldsAndScroll((err, values) => {
+      // 两次密码比较
+      if (values.newPassword !== values.newPasswordToo) {
+        openNotificationWithIcon('error', '两次密码输入不一样,请重新输入')
+        return
+      }
       if (!err) {
         request({ ...apis.user.updatePassword, params: { ...values } }).then(() => {
           openNotificationWithIcon('success', '操作成功!')
           props.form.resetFields()
           props.onSuccess()
         }).catch(error => {
-          openNotificationWithIcon('error', error)
+          // openNotificationWithIcon('error', error.message)
         })
       }
     });
@@ -33,10 +38,32 @@ function passwodForm(props) {
   const { getFieldDecorator } = props.form
   return (
     <>
-      <Form layout="horizontal" onSubmit={(e) => handleSubmit(e)}>
-        <Form.Item>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={(e) => handleSubmit(e)}>
+      <Form.Item label="请输入旧密码">
+            {getFieldDecorator('originalPassword', {
+              rules: [{ required: true, message: '请输入旧密码' }],
+            })(
+              <Input
+                prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                type="password"
+                placeholder="Password"
+              />,
+            )}
+          </Form.Item>
+        <Form.Item label="新密码">
             {getFieldDecorator('newPassword', {
-              rules: [{ required: true, message: 'Please input your Password!' }],
+              rules: [{ required: true, message: '请输入新密码' }],
+            })(
+              <Input
+                prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                type="password"
+                placeholder="Password"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item label="确认密码">
+            {getFieldDecorator('newPasswordToo', {
+              rules: [{ required: true, message: '请确认新密码' }],
             })(
               <Input
                 prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />}