Merge branch 'feature/resetPassword' into release/5.6

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-04-13 14:43:19
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-04-18 11:36:23
+ * @Last Modified time: 2017-04-18 16:39:47
  */
 
 /* ***************
@@ -82,15 +82,11 @@ $sureResetBtn.on('click', function() {
         success: function(result) {
             tip.show(result.message);
 
-            let href = '/passport/password/resetsuccess';
-
-            if (result.code !== 200) {
-                href = '/passport/login';
+            if (result.code === 402) {
+                setTimeout(function() {
+                    window.location.href = '/passport/login';
+                }, 500);
             }
-
-            setTimeout(function() {
-                window.location.href = href;
-            }, 500);
         },
         error: function() {
             tip.show('系统异常！');

@@ -68,6 +68,7 @@
             color: #fff;
             background-color: transparent;
             border: none;
+            width: 100%;
         }
 
         input::-webkit-input-placeholder {