diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index ca74f6dc..1ab24536 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -13,7 +13,15 @@
                     <Input v-if="$Electron && cacheServerUrl" :value="$A.getDomain(cacheServerUrl)" prefix="ios-globe-outline" size="large" readonly clearable @on-clear="clearServerUrl"/>
 
                     <Input v-model="email" prefix="ios-mail-outline" :placeholder="$L('输入您的电子邮件')" size="large" @on-enter="onLogin" @on-blur="onBlur" />
-                    <Input v-model="password" prefix="ios-lock-outline" :placeholder="$L('输入您的密码')" type="password" size="large" @on-enter="onLogin" />
+                    <Input v-if="loginType=='login'"
+                           v-model="password" prefix="ios-lock-outline" :placeholder="$L('输入您的密码')" type="password"
+                           size="large"
+                            @on-enter="onLogin" />
+                    <Poptip v-else :content="$L('密码必须包含数字，字母大小写或者特殊字符的组合，长度在6~32位之间')" :transfer="true">
+                        <Input v-model="password" prefix="ios-lock-outline" :placeholder="$L('输入您的密码')" type="password"
+                               size="large"
+                               @on-enter="onLogin" />
+                    </Poptip>
 
                     <Input v-if="loginType=='reg'" v-model="password2" prefix="ios-lock-outline" :placeholder="$L('输入确认密码')" type="password" size="large" @on-enter="onLogin" />
                     <Input v-if="loginType=='reg' && needInvite" v-model="invite" class="login-code" :placeholder="$L('请输入注册邀请码')" type="text" size="large" @on-enter="onLogin"><span slot="prepend">&nbsp;{{$L('邀请码')}}&nbsp;</span></Input>
@@ -268,7 +276,10 @@ export default {
                     });
                 }).catch(({data, msg}) => {
                     this.loadIng--;
-                    $A.noticeError(msg);
+                    $A.noticeError({
+                        desc: msg,
+                        duration: 10
+                    });
                     if (data.code === 'need') {
                         this.reCode();
                         this.codeNeed = true;
diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss
index ce92e1ff..d837412c 100644
--- a/resources/assets/sass/pages/page-login.scss
+++ b/resources/assets/sass/pages/page-login.scss
@@ -89,7 +89,12 @@
                         color: #c7c7c7;
                     }
                 }
-
+                > .ivu-poptip {
+                    width: 100%;
+                    > .ivu-poptip-rel {
+                        width: 100%;
+                    }
+                }
             }
         }
         .login-bottom {