Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/AutoController.class.php

@@ -926,7 +926,6 @@ public function  auto_rrdae(){
     {
         if (isset($map['pay_time'])) {
             $map['pay_status'] = 1;
-            $map['pay_game_status'] = 1;
             $map['game_player_id'] = ['gt', 0];
             $map['server_id'] = ['gt', 0];
             $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,promote_id,user_id,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count';
@@ -955,4 +954,84 @@ public function  auto_rrdae(){
             }
         }
     }
+
+    //用户推广员数据刷新
+    public function updateUserPromoteAccount()
+    {
+        $map['promote_id'] = ['gt', 0];
+        $map['_string'] = "promote_account = '' or promote_account = '自然注册' or promote_account = '官方渠道' or promote_account is NULL";
+        $userModel = M('user', 'tab_');
+        $userPlayModel = M('user_play', 'tab_');
+        $userPlayInfoModel = M('user_play_info', 'tab_');
+        $userData = $userModel->field('id,promote_id')->where($map)->select();
+        $userPlayData = $userPlayModel->field('id,promote_id')->where($map)->select();
+        $userPlayInfoData = $userPlayInfoModel->field('id,promote_id')->where($map)->select();
+        $promoteData = [];
+
+        $userRet = $this->updateUserPromoteAccountSql($userModel, $userData, $promoteData);
+        $userSuccess = $userRet['success'];
+        $userError = $userRet['error'];
+        $userErrorData = empty($userRet['error_data']) ? '' : implode(',', $userRet['error_data']);
+        $promoteData = $userRet['promote_data'];
+        $userAll = count($userData);
+        unset($userData);
+
+        $userPlayRet = $this->updateUserPromoteAccountSql($userPlayModel, $userPlayData, $promoteData);
+        $userPlaySuccess = $userPlayRet['success'];
+        $userPlayError = $userPlayRet['error'];
+        $userPlayErrorData = empty($userPlayRet['error_data']) ? '' : implode(',', $userPlayRet['error_data']);
+        $promoteData = $userPlayRet['promote_data'];
+        $userPlayAll = count($userPlayData);
+        unset($userPlayData);
+
+        $userPlayInfoRet = $this->updateUserPromoteAccountSql($userPlayInfoModel, $userPlayInfoData, $promoteData);
+        $userPlayInfoSuccess = $userPlayInfoRet['success'];
+        $userPlayInfoError = $userPlayInfoRet['error'];
+        $userPlayInfoErrorData = empty($userPlayInfoRet['error_data']) ? '' : implode(',', $userPlayInfoRet['error_data']);
+        $promoteData = $userPlayInfoRet['promote_data'];
+        $userPlayInfoAll = count($userPlayInfoData);
+        unset($userPlayInfoData);
+
+        echo "tab_user：all--{$userAll} success--{$userSuccess} error--{$userError} error_ids--{$userErrorData}";
+        echo '<br>';
+        echo "tab_user_play：all--{$userPlayAll} success--{$userPlaySuccess} error--{$userPlayError} error_ids--{$userPlayErrorData}";
+        echo '<br>';
+        echo "tab_user_play_info：all--{$userPlayInfoAll} success--{$userPlayInfoSuccess} error--{$userPlayInfoError} error_ids--{$userPlayInfoErrorData}";
+        echo '<br>';
+    }
+
+    private function updateUserPromoteAccountSql($model, $data = [], $promoteData = [])
+    {
+        $success = 0;
+        $error = 0;
+        $errorData = [];
+        foreach ($data as &$list) {
+            if (isset($promoteData[$list['promote_id']])) {
+                $promoteAccount = $promoteData[$list['promote_id']];
+            } else {
+                $promoteAccount = M('promote', 'tab_')->where(array('id' => $list['promote_id']))->getField('account');
+                $promoteAccount = empty($promoteAccount) ? '未知推广员' : $promoteAccount;
+                $promoteData[$list['promote_id']] = $promoteAccount;
+            }
+
+            $save['id'] = $list['id'];
+            $save['promote_account'] = $promoteAccount;
+            $res = $model->save($save);
+            if ($res === false) {
+                $error++;
+                $errorData = $list['id'];
+            } else {
+                $success++;
+            }
+            unset($list);
+        }
+
+        $ret = [
+            'success' => $success,
+            'error' => $error,
+            'error_data' => $errorData,
+            'promote_data' => $promoteData,
+        ];
+        return $ret;
+    }
 }

Application/Admin/Controller/GameController.class.php

@@ -290,6 +290,10 @@ class GameController extends ThinkController
     public function edit($id = null)
     {
         if (IS_POST) {
+            if ($_POST['game_score'] <0 || $_POST['game_score'] > 5) {
+                $this->error('游戏评分只能为0-5之间的数字！');
+                exit;
+            }
             /*if($_POST['apply_status']==0&&$_POST['game_status']==1){
                $this->error('游戏未审核不允许显示');//游戏添加完成
         }*/

Application/Common/Common/function.php

@@ -1190,15 +1190,15 @@ function age_verify($cardno, $name)
 {
     $date = age($cardno, $name);
 
-    if ($date['resp']['code'] == 0 && $date > 0) {
+    if ($date['status'] == "01") {
         $age = floor((time() - strtotime($date['data']['birthday'])) / (60 * 60 * 24 * 365));
         if ($age > 17) {
             return 1;
         } else {
             return 2;
         }
-    } elseif ($date['resp']['code'] != 0 && $date > 0) {
-        return 0;
+    } elseif ($date['status'] > 200) {
+        return -2;
     } else {
         return $date;
     }
@@ -1207,13 +1207,14 @@ function age_verify($cardno, $name)
 //根据配置向接口发送身份证号和姓名进行验证
 function age($cardno, $name)
 {
-    $host = "http://idcard.market.alicloudapi.com";
-    $path = "/lianzhuo/idcard";
+    $host = "https://idcardcert.market.alicloudapi.com";
+    $path = "/idCardCert";
     $method = "GET";
     $appcode = C('tool_age.appcode');
+    // $appcode = "244181f0846541a19e24df409736d3b9";
     $headers = array();
     array_push($headers, "Authorization:APPCODE " . $appcode);
-    $querys = "cardno=" . $cardno . "&name=" . $name;
+    $querys = "idCard=" . $cardno . "&name=" . $name;
     $bodys = "";
     $url = $host . $path . "?" . $querys;
     $curl = curl_init();
@@ -1231,15 +1232,22 @@ function age($cardno, $name)
     if (empty($output)) {
         return -1;//用完
     }
-    if (curl_getinfo($curl, CURLINFO_HTTP_CODE) == '200') {
-        $headersize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
-        $header = substr($output, 0, $headersize);
-        $body = substr($output, $headersize);
-        curl_close($curl);
-        return json_decode($body, true);
-    } else {
-        return -2;//失败
-    }
+    
+    $r = json_decode($output, true);
+    if ($r['status'] == "02") return 0;
+    return $r;
+    // if (empty($output)) {
+    //     return -1;//用完
+    // }
+    // if (curl_getinfo($curl, CURLINFO_HTTP_CODE) == '200') {
+    //     $headersize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+    //     $header = substr($output, 0, $headersize);
+    //     $body = substr($output, $headersize);
+    //     curl_close($curl);
+    //     return json_decode($body, true);
+    // } else {
+    //     return -2;//失败
+    // }
 }
 
 /*短信发送验证限制条件  */

Application/Home/Controller/DownloadController.class.php

@@ -1182,13 +1182,20 @@ class DownloadController extends BaseController {
         }
 
         
-        
+
          if (!empty(I('begtime')) && empty(I('endtime'))) {
             $map['tab_spend.pay_time'] = ['egt', strtotime(I('begtime'))];
         } elseif (empty(I('begtime')) && !empty(I('endtime'))) {
             $map['tab_spend.pay_time'] = ['elt', strtotime(I('endtime')) + 86399];
         } elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
             $map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
+        }else {
+            $nowTime = date('Y-m-d');
+            $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
+            $initEndTime = date('Y-m-d');
+            $initBegTime = strtotime($initBegTime);
+            $initEndTime = strtotime($initEndTime);
+            $map['tab_spend.pay_time'] = ['between',[$initBegTime,$initEndTime]];
         }
         
         empty(I('relation_game_id')) || $map['tab_game.relation_game_id'] = I('relation_game_id');
@@ -1196,7 +1203,7 @@ class DownloadController extends BaseController {
         empty(I('server_id')) || $map['tab_spend.server_id'] = I('server_id');
         empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%'];
         empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%'];
-        empty(I('order_number')) || $map['tab_spend.order_number'] = I('order_number');
+        empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number');
         $map['tab_spend.pay_status'] = 1;
         $map['tab_spend.is_check'] = ['neq', 2];
         
@@ -1233,8 +1240,8 @@ class DownloadController extends BaseController {
         $costBegin = I('cost_begin', '');     //充值总额范围
         $costEnd = I('cost_end', '');
         $nowTime = date('Y-m-d');
-        $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
-        $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
+        $initBegTime = date('Y-m-d', strtotime('-7 day', strtotime($nowTime)));
+        $initBegTime = empty(I('begtime')) ? $initBegTime  : I('begtime');
         $initEndTime = $nowTime;
         $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
         $begTime = strtotime($initBegTime);
@@ -2900,7 +2907,8 @@ class DownloadController extends BaseController {
                 ->buildSql();
             $map['_string'] = 'ui.role_id in (' . $subQuery . ')';
         }
-        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
+        $secondDay = 24*3600 + 1;
+        $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]];
         unset($map['begintime']);
         unset($map['endtime']);
         //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
@@ -2909,7 +2917,7 @@ class DownloadController extends BaseController {
         $field = $fieldUC . ',' . $fieldUI;
         $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
         ->field($field)
-        ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+        ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
         ->where($map)
         ->group('uc.role_id,uc.server_id,uc.game_id')
         ->buildSql();
@@ -2919,7 +2927,7 @@ class DownloadController extends BaseController {
         $total = [];
         $total = M('user_play_data_count', 'tab_')->alias('uc')
             ->field($fieldUC)
-            ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+            ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
             ->where($map)
             ->find();
          foreach ($roles as $role) {
@@ -3030,7 +3038,7 @@ class DownloadController extends BaseController {
             $value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')';  
            // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12);
             $value1['user_account'] = $this->encryption($value1['user_account']);
-            $value1['order_number'] = $this->encryption($value1['order_number']);
+            $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']);
             if(!empty($value1['chain'])) {
                     $chain = trim($value1['chain'],'/');
                     $chainArr = explode('/', $chain);
@@ -3052,7 +3060,7 @@ class DownloadController extends BaseController {
                   
                 }
             $csvData["user_account"] = $value1["user_account"];
-            $csvData["order_number"] = $value1["order_number"];
+            $csvData["pay_order_number"] = $value1["pay_order_number"];
             $csvData["pay_amount"] = $value1["pay_amount"];
             $csvData["pay_way"] = $value1["pay_way"];
             $csvData["game_name"] = $value1["game_name"];
@@ -3079,7 +3087,7 @@ class DownloadController extends BaseController {
                 ->order('tab_spend.id desc')
                 ->find()['income'];
         $csvData1["user_account"] = "合计";
-        $csvData1["order_number"] = "--";
+        $csvData1["pay_order_number"] = "--";
         $csvData1["pay_amount"] = $income;
         $csvData1["pay_way"] = "--";
         $csvData1["game_name"] = "--";

Application/Home/Controller/QueryController.class.php

@@ -32,7 +32,7 @@ class QueryController extends BaseController
         $serverId = trim(I('server_id', ''));
         $gamePlayerName = trim(I('game_player_name', ''));
         $userAccount = trim(I('user_account', ''));
-        $orderNumber = trim(I('order_number', ''));
+        $payOrderNumber = trim(I('pay_order_number', ''));
         $nowTime = date('Y-m-d');
         $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
         $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
@@ -71,8 +71,8 @@ class QueryController extends BaseController
         if (!empty($userAccount)) {
             $map['tab_spend.user_account'] = $userAccount;
         }
-        if (!empty($orderNumber)) {
-            $map['tab_spend.order_number'] = $orderNumber;
+        if (!empty($payOrderNumber)) {
+            $map['tab_spend.pay_order_number'] = $payOrderNumber;
         }
         if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') {
             $payWay = intval(I('pay_way'));
@@ -146,7 +146,7 @@ class QueryController extends BaseController
                 $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
 
                 //订单隐藏算法
-                $orderLen = strlen($list['order_number']);
+                $orderLen = strlen($list['pay_order_number']);
                 $strLen = 4;
                 $hideChar = '';
 
@@ -158,7 +158,7 @@ class QueryController extends BaseController
                     $hideChar .= '*';
                 }
 
-                $list['order_number'] = substr($list['order_number'], 0, $strLen) . $hideChar . substr($list['order_number'], $orderLen - $strLen);
+                $list['pay_order_number'] = substr($list['pay_order_number'], 0, $strLen) . $hideChar . substr($list['pay_order_number'], $orderLen - $strLen);
             }
         }
 
@@ -172,7 +172,7 @@ class QueryController extends BaseController
         $parameter['server_id'] = $serverId;
         $parameter['game_player_name'] = $gamePlayerName;
         $parameter['user_account'] = $userAccount;
-        $parameter['order_number'] = $orderNumber;
+        $parameter['pay_order_number'] = $payOrderNumber;
         $parameter['own_id'] = $ownId;
         $parameter['level_promote_2'] = $levelPromote[0];
         $parameter['level_promote_3'] = $levelPromote[1];
@@ -1828,7 +1828,7 @@ class QueryController extends BaseController
             $field = $fieldUC . ',' . $fieldUI;
             $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($field)
-                ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
                 ->group('uc.role_id,uc.server_id,uc.game_id')
                 ->buildSql();
@@ -1837,15 +1837,22 @@ class QueryController extends BaseController
                 ->order($orderBy);
             $total = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($fieldUC)
-                ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
                 ->find();
 
             list($records, $pagination, $count) = $this->paginate($query);
 
             foreach ($records as &$list) {
-                $list['user_account'] = encryption($list['user_account']);
-                $list['unlogin_day'] = intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
+                $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
+                $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
+                $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];
+                $list['role_name'] = empty($list['role_name']) ? '--' : $list['role_name'];
+                $list['role_level'] = empty($list['role_level']) ? '--' : $list['role_level'];
+                $list['unlogin_day'] = empty($list['play_time']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600));
+                $list['play_time'] = empty($list['play_time']) ? '--' : date('Y-m-d H:i:s', $list['play_time']);
+                $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account'];
             }
         }
 

Application/Home/View/default/Home/landingPage.html

@@ -18,6 +18,15 @@
   <title>{$game['relation_game_name']}</title>
 </head>
 <body>
+<style>
+  .layui-layer-btn0 {
+    font-size: 18px;
+  }
+  .layui-layer-btn1 {
+    font-size: 18px;
+    margin-right: 18%;
+  }
+</style>
 <input type="hidden" name="title" value="{$game['relation_game_name']}">
 <input type="hidden" name="icon" value="{$game['icon']}">
 <input type="hidden" name="desc" value="{$game['features']}">
@@ -54,11 +63,11 @@
         <div class="number">
           <span>{$game['game_score']}</span>
           <div class="start">
-            <img src="__IMG__/start1.png" alt="">
-            <img src="__IMG__/start1.png" alt="">
-            <img src="__IMG__/start1.png" alt="">
-            <img src="__IMG__/start1.png" alt="">
-            <img src="__IMG__/start.png" alt="">
+            <img src="__IMG__/start<?php echo $game['game_score'] >=1 ? 1 : ''?>.png" alt="">
+            <img src="__IMG__/start<?php echo $game['game_score'] >=2 ? 1 : ''?>.png" alt="">
+            <img src="__IMG__/start<?php echo $game['game_score'] >=3 ? 1 : ''?>.png" alt="">
+            <img src="__IMG__/start<?php echo $game['game_score'] >=4 ? 1 : ''?>.png" alt="">
+            <img src="__IMG__/start<?php echo $game['game_score'] >=5 ? 1 : ''?>.png" alt="">
           </div>
         </div>
         <div class="grade">14.48K个评分</div>
@@ -106,7 +115,7 @@
               <img src="__IMG__/start1.png" alt="">
             </div>
             <div class="strip">
-              <div style="width: 2.77rem;"></div>
+              <div style="width: <?php echo round($game['game_score']/5, 2) * 100 ?>%;"></div>
             </div>
           </div>
           <div class="start-number">
@@ -254,7 +263,7 @@
         <div class="swiper-pagination"></div>
       </div>
     </div>
-    <div class="blue-btn">点我去信任</div>
+    <div class="blue-btn" id="go_confirm">点我去信任</div>
   </div>
 </div>
 <?php
@@ -263,9 +272,21 @@
 <input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
 </body>
 </html>
+<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
 <script>
   $(function(){
+      $('#go_confirm').click(function () {
+
+        layer.confirm('请您回到手机桌面查看安装包情况，<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
+          title: "请确认游戏是否已安装？",
+          btn: ['已安装', '取消'], //按钮
+        }, function () {
+          $('.layui-layer-btn0').css("font-size", "18px");
+          window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
+        });
+      });
     $('.down-link').on('click', function () {
+        var downLink = $(this).attr('down-link');
 
         // if ($('.bn-rule').length > 0) {
       //   $('.bn-rule').css('display','block')
@@ -285,9 +306,10 @@
           return
         }
       }
-      var downLink = $(this).attr('down-link');
-      console.log(downLink);
-      location.href = downLink
+
+      $.post("/mobile.php?s=/AjaxDown/down_file/game_id/{$apply.game_id}/type/2", {}, function (res) {
+          location.href = downLink
+      });
     });
 
     $('.no-package').click(function() {

Application/Home/View/default/Query/recharge.html

@@ -127,8 +127,8 @@
         </div>
 
         <div class="form-group normal_space">
-          <input type="text" name="order_number" class="txt normal_txt" placeholder="请输入订单号"
-                 value="{:I('order_number')}">
+          <input type="text" name="pay_order_number" class="txt normal_txt" placeholder="请输入订单号"
+                 value="{:I('pay_order_number')}">
         </div>
 
         <div class="form-group normal_space">
@@ -190,7 +190,7 @@
               <volist name="listData" id="vo">
                 <tr class="num2">
                   <td title="玩家ID：{$vo.user_id}">{$vo.user_account}</td>
-                  <td>{$vo.order_number}</td>
+                  <td>{$vo.pay_order_number}</td>
                   <td>{:get_pay_way($vo['pay_way'])}</td>
                   <td>{$vo.pay_amount}</td>
                   <td>{$vo.game_name}</td>

Application/Home/View/default/Query/userRecharges.html

@@ -155,7 +155,7 @@
                 <tr data-id="{$vo.id}" class="<eq name='mod' value='1'>odd</eq>">
                   <td>{$record.user_account}</td>
                   <td>{$record.game_name}</td>
-                  <td>{:getSDKTypeName($record['sdk_version'])}</td>
+                  <td>{$record.sdk_version}</td>
                   <td>{$record.server_name}</td>
                   <td>{$record.role_name}</td>
                   <td>{$record.role_level}</td>
@@ -163,7 +163,7 @@
                   <td>{$record.recharge_count}</td>
                   <td>{$record.recharge_cost_today}</td>
                   <td>{$record.unlogin_day}</td>
-                  <td>{$record.play_time|date='Y-m-d H:i:s',###}</td>
+                  <td>{$record.play_time}</td>
                   <td>{$record.promote_account}</td>
                 </tr>
               </volist>

Application/Mobile/Controller/UserController.class.php

@@ -1000,6 +1000,7 @@ class UserController extends BaseController
         }
 
         $logininfo = $this->suser->login_info();
+        
 
         if (IS_POST) {
             $resdata['age_status'] = 0;
@@ -1016,8 +1017,8 @@ class UserController extends BaseController
                 //     $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth')));
                 // }
             }
-
-            if (C('tool_age.status') == 0) {
+            $status = M("Tool","tab_")->field("status")->where("name = 'tool_age'")->find()['status'];
+            if ($status == 0) {
                 $this->ajaxReturn(array('status' => 0, 'info' => '实名认证暂未开启！', 'url' => U('User/userauth')));
             } else {
                 $re = age_verify($_REQUEST['real_name'], $_REQUEST['idcard']);
@@ -1032,16 +1033,15 @@ class UserController extends BaseController
                 }
 
                 if ($re == 1) {
-                    $resdata['age_status'] = 2;//成年
+                    $resdata = 2;//成年
                 }
                 if ($re == 2) {
-                    $resdata['age_status'] = 3;//未成年
+                    $resdata = 3;//未成年
                 }
             }
-
-            if ($re > 0) {
-                $model = D('User')->where($map)->save(array('real_name' => $_REQUEST['real_name'], 'idcard' => $_REQUEST['idcard'], 'age_status' => $resdata));
-            }
+            // if ($re > 0) {
+            $model = D('User')->where($map)->save(array('real_name' => $_REQUEST['real_name'], 'idcard' => $_REQUEST['idcard'], 'age_status' => $resdata));
+            // }
 
             if ($model !== false) {
 
@@ -1051,6 +1051,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

@@ -14,13 +14,13 @@
             <a href="javascript:window.history.go(-1);" class="arrows"></a>
           </div>
 
-          <?php if(!empty($user['real_name'])){ ?>
+          <?php if(empty($user['real_name'])){ ?>
           <div class="name-input">
             <div class="name-inputBox">
               <img src="__IMG__/shimingrenzhengmoren.png" alt="">
               <div>真实姓名</div>
             </div>
-            <input type="text" placeholder="请输入真实姓名" style="padding: 0;color: #292929" name="real_name" id="real_name" value="王大锤">
+            <input type="text" placeholder="请输入真实姓名" style="padding: 0;color: #292929" name="real_name" id="real_name" value="">
           </div>
           <?php }else{ ?>
             <div class="name-input">
@@ -28,46 +28,60 @@
                 <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 }?>
 
 
-          <?php if(!empty($user['idcard'])){ ?>
+          <?php if(empty($user['idcard'])){ ?>
           <div class="name-input">
             <div class="name-inputBox">
               <img src="__IMG__/haoma.png" alt="">
               <div>证件号码</div>
             </div>
-            <input type="text" placeholder="请输入证件号码" style="padding: 0;color: #292929" name="idcard" id="idcard" value="350516518718718748">
+            <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>
       </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() {
+      $(".back").on("click",function(){
+        window.history.go(-1)
+      })
       $('.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();

Application/Mobile/View/User/userset.html

@@ -149,6 +149,7 @@
     var pmsg = $('.popmsg').pop();
 
     $('.portraitbtn').click(function () {
+      return false;
       //pmsg.msg('请到PC端网站或APP应用上更改');
       var pop = $('.pop').addClass('pop-head').pop();
       pop.open(800, '<div style="font-size: .36rem;margin-top: .5rem;">请到APP上更改头像</div><div class="godownbox"><a href="/media.php?s=/Index/download.html" class="btn">去下载APP</a></div>');

Data/update.sql

@@ -613,3 +613,6 @@ order_time:切分时间' WHERE `id` = 29;
 --新增风控类型
 ALTER TABLE `tab_device_bans`
 MODIFY COLUMN `type`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`;
+
+-- user表注册类型添加7虚拟
+ALTER TABLE `tab_user` MODIFY COLUMN `register_type` tinyint(2) DEFAULT '1' COMMENT '注册方式 0游客1账号 2 手机 3微信 4QQ 5百度 6微博 7虚拟'

Public/Mobile/css/common.css

@@ -9,7 +9,7 @@ html {
 	color:#333;
 	overflow-x:hidden;
 	margin: 0 auto;
-	max-width: 640px;
+	/*max-width: 640px;*/
 }
 img {
 	/*height: 100%;*/
@@ -39,7 +39,7 @@ body {
 	-webkit-highlight: none;
 	overflow:auto;
 	-webkit-tap-highlight-color: rgba(0,0,0,0);
-	max-width:640px;
+	/*max-width:640px;*/
 	margin:0 auto;
 }
 .clearfix {