diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php
index d0396d12d..24d491b82 100644
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@@ -662,6 +662,8 @@ class UserController extends BaseController
         if (IS_POST) {
             $new_pwd = $_REQUEST['new_pwd'];
             $u_uid['phone'] = $_REQUEST['phone'];
+            //验证短信验证码
+            $this->checksafecode($u_uid['phone'], $_REQUEST['code'], false);
             $result = M('user', 'tab_')->where($u_uid)->setField('password', think_ucenter_md5($new_pwd, UC_AUTH_KEY));
             if ($result != false) {
                 $this->success("修改成功", U('User/login'));
diff --git a/Application/Mobile/View/User/forget.html b/Application/Mobile/View/User/forget.html
index e03b70ea3..bc6116c9c 100644
--- a/Application/Mobile/View/User/forget.html
+++ b/Application/Mobile/View/User/forget.html
@@ -1,48 +1,47 @@
 <extend name="Public/bases" />
 <block name="body">
-  <link href="__CSS__/user.css" rel="stylesheet" >
   <script src="__JS__/jquery-1.11.3.min.js"></script>
   <script type="text/javascript" src="__JS__/getRem.js"></script>
   <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
-  <link rel="stylesheet" type="text/css" href="__CSS__/name.css">
-  <link rel="stylesheet" type="text/css" href="__CSS__/remove.css">
+  <link rel="stylesheet" type="text/css" href="__CSS__/forgetPass.css">
   <style>
     body {
       background: white;
     }
+    input,button{
+      padding: 0;
+    }
   </style>
-  <div class="name">
+  <div class="loginPhTwo">
     <!-- 子页公共头部 -->
-    <div class="subpage-heard">找回密码
+    <div class="subpage-heard">忘记密码
       <a href="javascript:window.history.go(-1);" class="arrows"></a>
     </div>
-    <div class="remove-info">
-
-      <div class="name-input">
-        <div class="name-inputBox">
-          <img src="__IMG__/shoujibangding.png" alt="">
-          <div>手机号</div>
+    <form action="">
+      <div class="login-box">
+        <div class="login-input">
+          <img src="__IMG__/shouji.png" alt="">
+          <input type="text" placeholder="请输入手机号" name="mobile" id="mobile" value="{$user['phone']}">
         </div>
-        <input type="text" placeholder="请输入手机号" style="padding: 0" name="mobile" id="mobile" value="{$user['phone']}">
-      </div>
-
-      <div class="remove-input">
-        <div class="remove-inputBox">
-          <img src="__IMG__/mingzibianji.png" alt="">
-          <div>验证码</div>
-          <input type="text" placeholder="请输入验证码" id="code" name="code" value="">
+        <div class="login-input">
+          <img src="__IMG__/suo.png" alt="">
+          <input type="password" placeholder="请输入密码" name="new_pwd" id="new_pwd" value="">
+        </div>
+        <div class="login-input">
+          <img src="__IMG__/suo.png" alt="">
+          <input type="password" placeholder="请输入确认密码" name="new_pwd_confirm" id="new_pwd_confirm" value="">
+        </div>
+        <div class="login-code">
+          <input type="text" placeholder="输入验证码" id="code" name="code" value="">
+          <div class="code g-btn jsgetcode" id="sendSafeCode">获取验证码</div>
+        </div>
+        <div class="login-btn submit">保存修改</div>
+        <div class="forget-text">
+          <div>通过手机号找回密码只适用于手机号注册的账号</div>
+          <div>用户名注册的账号可<a href="mqqwpa://im/chat?chat_type=wpa&uin={:C('PC_SET_SERVER_QQ')}&version=1&src_type=web&web_src=oicqzone.com">联系客服</a></div>
         </div>
-        <div class="code g-btn jsgetcode" id="sendSafeCode">获取验证码</div>
-      </div>
-      <div class="save submit">下一步</div>
-      <div>
-        <p class="forget-notice" style="font-size: 0.28rem;text-align: center;line-height: 0.4rem;">
-          通过手机号找回密码只适用于手机号注册的账号<br>用户名注册的账号可
-          <a href="mqqwpa://im/chat?chat_type=wpa&uin={:C('PC_SET_SERVER_QQ')}&version=1&src_type=web&web_src=oicqzone.com"
-             target="_blank" style="color: #21B1EB;">联系客服</a>
-        </p>
       </div>
-    </div>
+    </form>
   </div>
 
   <div class="popmsg pop-dialog"></div>
@@ -90,22 +89,44 @@
       $(".submit").click(function(){
         var mobile = $.trim($("#mobile").val());
         var code = $.trim($("#code").val());
+        var new_pwd = $.trim($("#new_pwd").val());
+        var new_pwd_confirm = $.trim($("#new_pwd_confirm").val());
         if(mobile.length == 0){
           pmsg.msg('请输入手机号码');
           return false;
         }
+        if(new_pwd.length == 0){
+          pmsg.msg('请输入密码');
+          return false;
+        }
+        if(new_pwd_confirm.length == 0){
+          pmsg.msg('请输入确认密码');
+          return false;
+        }
         if(code.length == 0){
           pmsg.msg('请输入验证码');
           return false;
         }
+        if(new_pwd.length < 6 || new_pwd.length > 12){
+          pmsg.msg('密码长度6-12个字符');
+          return false;
+        }
+        if(new_pwd != new_pwd_confirm){
+          pmsg.msg('两次密码输入不一致');
+          return false;
+        }
         $.ajax({
-          url:"{:U('forget')}",
+          url:"{:U('forget1')}",
           type:"POST",
           dataType:"json",
-          data:{phone:$.trim($('#mobile').val()),code:$("#code").val()},
+          data:{
+            phone:$.trim($('#mobile').val()),
+            code:$("#code").val(),
+            new_pwd:new_pwd
+          },
           success:function(result){
             if(result.status == 1){
-              pmsg.msg("验证成功");
+              pmsg.msg("修改成功");
               setTimeout(function () {
                 window.location.href = result.url;
               }, 2000);