Merge remote-tracking branch 'origin/dev_lww' into dev_lww

Application/Mobile/Controller/UserController.class.php

@@ -272,7 +272,7 @@ class UserController extends BaseController
             $post = I('post.');
             $account = $post['nickname'];
             $password = $post['password'];
-            $sex = $post['sex'];
+            $sex = isset($post['sex']) ? $post['sex'] : 0;
             if (empty($account)) {
                 echo json_encode(array('status' => 0, 'msg' => '请填写昵称'));
                 exit;

Application/Mobile/View/User/step.html

@@ -24,17 +24,17 @@
     <div class="loginPhone">
         <!-- 子页公共头部 -->
         <div class="subpage-heard">手机注册
-            <a href="#" class="arrows"></a>
+          <a href="javascript:window.history.go(-1);" class="arrows"></a>
         </div>
         <form action="">
             <div class="login-box">
                 <div class="login-input">
                     <img src="__IMG__/user/nicheng.png" alt="">
-                    <input type="text" placeholder="请输入昵称">
+                    <input id="nickname" type="text" placeholder="请输入昵称">
                 </div>
                 <div class="login-input">
                     <img src="__IMG__/user/suo.png" alt="">
-                    <input type="password" placeholder="请输入密码">
+                    <input id="password" type="password" placeholder="请输入密码">
                 </div>
                 <button class="login-btn nextsubmit">下一步</button>
                 <div class="login-agreement">注册即表示同意<a href="{:U('News/protocol')}">《用户协议》</a></div>
@@ -49,7 +49,6 @@
       $('.nextsubmit').click(function(event) {
           var mobile = $.trim($('#nickname').val());
           var code = $.trim($('#password').val());
-          var sex = $.trim($('input[name=sex]:checked').val());
           var promoteId = parseInt("{:I('get.pid')}") ? parseInt("{:I('get.pid')}") : 0;
           var gameId = parseInt("{:I('get.gid')}") ? parseInt("{:I('get.gid')}") : 0;
           if(mobile.length == 0 ){
@@ -73,7 +72,7 @@
               $.ajax({
                   type:'POST',
                   url:'{:U("User/step")}',
-                  data:{'nickname':mobile,'password':code,'sex':sex,'promote_id':promoteId,'game_id':gameId},
+                  data:{'nickname':mobile,'password':code,'promote_id':promoteId,'game_id':gameId},
                   dataType:"Json",
                   success:function(data){
                     console.log(data);