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

Application/Mobile/Controller/UserController.class.php

@@ -1016,8 +1016,8 @@ class UserController extends BaseController
                 //     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
                 // }
             }
-
+            $status = M("Tool","tab_")->field("status")->where("name = 'tool_age'")->find()['status'];
-            if (C('tool_age.status') == 0) {
+            if ($status == 0) {
                 $this->ajaxReturn(array('status' => 0, 'info' => '实名认证暂未开启！', 'url' => U('User/userauth')));
             } else {
                 $re = age_verify($_REQUEST['real_name'], $_REQUEST['idcard']);

Application/Mobile/View/User/userauth.html

@@ -59,15 +59,24 @@
       </form>
     </section>
   </section>
+  <style>
+    .pop-dialog span{
+      top:35%;
+      line-height: 1.5;
+      max-width: 3rem;
+      padding: 10px;
+    }
+  </style>
   <div class="popmsg pop-dialog"></div>
   <script src="__JS__/pop.lwx.min.js"></script>
   <script src="__STATIC__/isCardID.js"></script>
   <script>
     $(function() {
       $('.jssubmit').click(function() {
+        var pmsg = $('.popmsg').pop();
         var real_name = $.trim($('#real_name').val());
         var idcard = $.trim($('#idcard').val());
-        var pmsg = $('.popmsg').pop();
+        
         if(real_name == ""){
           pmsg.msg("请输入真实姓名");
           $('#real_name').focus();