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

Application/Mobile/Controller/UserController.class.php

@@ -1040,9 +1040,9 @@ class UserController extends BaseController
                 }
             }
 
-            if ($re > 0) {
+            // if ($re > 0) {
             $model = D('User')->where($map)->save(array('real_name' => $_REQUEST['real_name'], 'idcard' => $_REQUEST['idcard'], 'age_status' => $resdata));
-            }
+            // }
 
             if ($model !== false) {
 
@@ -1052,6 +1052,9 @@ class UserController extends BaseController
             }
         } else {
             $user = D('User')->where(array('id' => $logininfo['user_id']))->find();
+            if($user["age_status"] > 0){
+                $user["idcard"] = substr($user["idcard"],0,1)."***********".substr($user["idcard"],-1,1);
+            }
             $this->assign('user', $user);
             $this->display();
         }

Application/Mobile/View/User/userauth.html

@@ -28,7 +28,7 @@
                 <img src="__IMG__/shimingrenzhengmoren.png" alt="">
                 <div>真实姓名</div>
               </div>
-              <input type="text" placeholder="请输入真实姓名" style="padding: 0" name="real_name" id="real_name" value="{$user['real_name']}">
+              <input type="text" placeholder="请输入真实姓名" style="padding: 0;color: #292929;" readonly name="real_name" id="real_name" value="{$user['real_name']}">
             </div>
           <?php }?>
 
@@ -41,18 +41,20 @@
             </div>
             <input type="text" placeholder="请输入证件号码" style="padding: 0;color: #292929" name="idcard" id="idcard" value="">
           </div>
+          <div class="save jssubmit">提交</div>
           <?php }else{ ?>
           <div class="name-input">
             <div class="name-inputBox">
               <img src="__IMG__/haoma.png" alt="">
               <div>证件号码</div>
             </div>
-            <input type="text" placeholder="请输入证件号码" style="padding: 0" name="idcard" id="idcard" value="{$user['idcard']}">
+            <input type="text" placeholder="请输入证件号码" style="padding: 0" name="idcard" id="idcard" readonly value="{$user['idcard']}">
           </div>
+          <div class="save back" >返回</div>
           <?php }?>
 
           
-            <div class="save jssubmit">保存修改</div>
+            
           </div>
 
         </div>
@@ -72,6 +74,9 @@
   <script src="__STATIC__/isCardID.js"></script>
   <script>
     $(function() {
+      $(".back").on("click",function(){
+        window.history.go(-1)
+      })
       $('.jssubmit').click(function() {
         var pmsg = $('.popmsg').pop();
         var real_name = $.trim($('#real_name').val());