diff --git a/src/components/Login/index.js b/src/components/Login/index.js
index 79cc56de..c51c9279 100644
--- a/src/components/Login/index.js
+++ b/src/components/Login/index.js
@@ -56,7 +56,9 @@ class Login extends Component {
           });
         },
       },
-      form,
+      form: {
+        ...form,
+      },
       updateActive: activeItem => {
         const { type, active } = this.state;
         if (active[type]) {
diff --git a/src/pages/User/Login.js b/src/pages/User/Login.js
index 29f59c89..a5a78b16 100644
--- a/src/pages/User/Login.js
+++ b/src/pages/User/Login.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { connect } from 'dva';
 import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import Link from 'umi/link';
-import { Checkbox, Alert, message, Icon } from 'antd';
+import { Checkbox, Alert, Modal, Icon } from 'antd';
 import Login from '@/components/Login';
 import styles from './Login.less';
 
@@ -35,7 +35,10 @@ class LoginPage extends Component {
           })
             .then(resolve)
             .catch(reject);
-          message.warning(formatMessage({ id: 'app.login.verification-code-warning' }));
+
+          Modal.info({
+            title: formatMessage({ id: 'app.login.verification-code-warning' }),
+          });
         }
       });
     });
diff --git a/src/pages/User/Register.js b/src/pages/User/Register.js
index 6aab8ffb..ae8df681 100644
--- a/src/pages/User/Register.js
+++ b/src/pages/User/Register.js
@@ -3,7 +3,7 @@ import { connect } from 'dva';
 import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import Link from 'umi/link';
 import router from 'umi/router';
-import { Form, Input, Button, message, Select, Row, Col, Popover, Progress } from 'antd';
+import { Form, Input, Button, Modal, Select, Row, Col, Popover, Progress } from 'antd';
 import styles from './Register.less';
 
 const FormItem = Form.Item;
@@ -75,7 +75,9 @@ class Register extends Component {
         clearInterval(this.interval);
       }
     }, 1000);
-    message.warning(formatMessage({ id: 'app.login.verification-code-warning' }));
+    Modal.info({
+      title: formatMessage({ id: 'app.login.verification-code-warning' }),
+    });
   };
 
   getPasswordStatus = () => {