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

5 years ago · 485e3930f9
parent 12362190e6 6b7f65be25
commit 485e3930f9
68 changed files with 1714 additions and 962 deletions
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@ -890,5 +890,31 @@ public function  auto_rrdae(){
        }
    }

+    //根据时间统计玩家充值
+    public function userPlayDataCount()
+    {
+        $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24)));
+        $spendMap['pay_status'] = 1;
+        $spendMap['pay_game_status'] = 1;
+        $spendMap['game_player_id'] = ['gt', 0];
+        $spendMap['pay_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]];
+
+        $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count';
+        $spendCostData = M('spend', 'tab_')->field($field)
+            ->where($spendMap)
+            ->group('day,game_player_id,server_id,game_id')
+            ->select();

+        $data = [];
+        foreach ($spendCostData as $list) {
+            $save['game_id'] = $list['game_id'];
+            $save['server_id'] = $list['server_id'];
+            $save['role_id'] = $list['game_player_id'];
+            $save['recharge_cost'] = $list['recharge_cost'];
+            $save['recharge_count'] = $list['recharge_count'];
+            $save['create_time'] = strtotime($list['day']);
+            $data[] = $save;
+        }
+        M('user_play_data_count', 'tab_')->addAll($data);
+    }
 }
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -243,6 +243,7 @@ class ExportController extends Controller
                        $promoter_ids = D("Promote")->where("chain like '%/{$_REQUEST['promote_id']}/%' or id={$_REQUEST['promote_id']}")->field('id')->select();
                        if ($promoter_ids) {
                            $map['tab_user.promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))];
+                            $spendprom = " AND ss.promote_id IN (" . implode(',', array_column($promoter_ids, 'id')) . ") ";
                        }
                    }
                }
@ -308,9 +309,18 @@ class ExportController extends Controller

                $map['puid'] = array('eq',0);
                $map['is_platform'] = 0;
-                //数据
-                $xlsData = M('user', 'tab_')->field('tab_user.id,tab_user.age_status,tab_user.account,tab_user.gold_coin,tab_user.alipay,tab_user.balance,tab_user.promote_account,register_time,tab_user.lock_status,tab_user.register_way,tab_user.register_type,tab_user.register_ip,tab_user.login_time,(IFNULL(sum(b.pay_amount),0) + IFNULL(sum(ss.pay_amount),0)) AS recharge_total')
-                    ->join('left join tab_deposit AS b ON tab_user.id = b.user_id AND b.pay_status = 1')
+                if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
+                    $xlsData = M('user', 'tab_')->field('tab_user.id,tab_user.age_status,tab_user.account,tab_user.gold_coin,tab_user.alipay,tab_user.balance,tab_user.promote_account,register_time,tab_user.lock_status,tab_user.register_way,tab_user.register_type,tab_user.register_ip,tab_user.login_time,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
+                    ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
+                    ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
+                    ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
+                    ->where($map)
+                    ->group('tab_user.id')
+                    ->order($order)
+					->having($havs)
+                    ->select();
+                }else{
+                    $xlsData = M('user', 'tab_')->field('tab_user.id,tab_user.age_status,tab_user.account,tab_user.gold_coin,tab_user.alipay,tab_user.balance,tab_user.promote_account,register_time,tab_user.lock_status,tab_user.register_way,tab_user.register_type,tab_user.register_ip,tab_user.login_time,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
                    ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1')
                    ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
                    ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
@ -319,6 +329,10 @@ class ExportController extends Controller
                    ->order($order)
 					->having($havs)
                    ->select();
+                }
+                //数据
+                
+                
                if($xlsData) {
                    $ids = array_column($xlsData,'id');
                    /* 在手里 */
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@ -26,6 +26,7 @@ class MemberController extends ThinkController
                if ($promoter_ids) {
                    $maps['tab_user.promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))];
                    $hav .= "tab_user.promote_id in (" . implode(',', array_column($promoter_ids, 'id')) . ") ";
+                    $spendprom = " AND ss.promote_id IN (" . implode(',', array_column($promoter_ids, 'id')) . ") ";
                }
            }
        }
@ -176,7 +177,28 @@ class MemberController extends ThinkController
            // ->order($order)
            ->select(false);

-        $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,(a.deposit_total+IFNULL(sum(ss.pay_amount),0)) as recharge_total,check_status')
+        // $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
+        //     ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1')
+        //     ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
+        //     ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
+        //     ->page($page, $row)
+        //     ->having($havs)
+        //     ->group('a.id')
+        //     ->order($order)
+        //     ->select();
+        if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
+            $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
+            ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1'.$spendprom)
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
+            ->page($page, $row)
+            ->having($havs)
+            ->group('a.id')
+            ->order($order)
+            ->select();
+            // echo $data;die();
+        }else{
+            $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status')
            ->join('left join  tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1')
            ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false)
            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false)
@ -185,10 +207,11 @@ class MemberController extends ThinkController
            ->group('a.id')
            ->order($order)
            ->select();
+        }
+

        //计数
-        $sql = M('user', 'tab_')->field('tab_user.id,(IFNULL(sum(b.pay_amount),0) + IFNULL(sum(ss.pay_amount),0)) AS recharge_total')
-            ->join('left join tab_deposit AS b ON tab_user.id = b.user_id AND b.pay_status = 1')
+        $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
            ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1')
            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
@ -196,8 +219,22 @@ class MemberController extends ThinkController
            ->group('tab_user.id')
            ->where($hav)
            ->having($havs)->select(false);
-        $jcount = M('User', 'tab_')->field('count(a.id) as count')->table('(' . $sql . ') as a')->select();
+        //替换为新表
+        if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){
+            $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total')
+            ->join('left join  tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom)
+            ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false)
+            ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false)
+            ->where($map)
+            ->group('tab_user.id')
+            ->where($hav)
+            ->having($havs)->select(false);
+        }
+
+        $jcount = M('User', 'tab_')->field('count(a.id) as count,sum(a.recharge_total) recharge_total')->table('(' . $sql . ') as a')->select();
        $count = $jcount[0]['count'];
+        // var_dump($jcount);die();
+        $this->assign('pay_allcount', $jcount[0]['recharge_total']);

        $model = M('Model')->getByName('user');

--- a/Application/Admin/Controller/PlatformController.class.php
+++ b/Application/Admin/Controller/PlatformController.class.php
@ -387,6 +387,28 @@ class PlatformController extends ThinkController
            ->group('tp1.id')
            ->order('count desc, register_time')
            ->select();
+        unset($map['tp1.id']);
+        unset($map['tp1.chain']);
+        $map['promote_id'] = 0;
+        //官方渠道数据添加
+        $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count,		
+            count(IF(register_time ' . $today . ',1,null)) as today,
+            count(IF(register_time ' . $week . ',1,null)) as week,
+            count(IF(register_time ' . $mounth . ',1,null)) as mounth')
+            ->where($map)
+            ->find();
+        $authorityData['promote_account'] = "官方渠道";
+        $authorityData['id'] = "1";
+        if (isset($_REQUEST['promote_id'])||$authorityData['count']==0) {
+            $authorityData = [];
+        } else {
+            array_push($data, $authorityData);
+        }
+
+        //数据排序
+        $last_names = array_column($data,'count');
+        array_multisort($last_names,SORT_DESC,$data);
+
        $count = count($data);
        foreach ($data as $key => $value) {
            static $i = 0;
@ -489,6 +511,7 @@ class PlatformController extends ThinkController
                ->where("pay_time".$pay_time)
                ->find();
                $dbdata['promote_account'] = $promote[$i]['account'];
+                $dbdata['promote_id'] = $promote[$i]['id'];
            } else {
                $dbdata = $spend
                ->field(' 
@ -500,6 +523,7 @@ class PlatformController extends ThinkController
                ->where("pay_time".$pay_time)
                ->find();
                $dbdata['promote_account'] = $promote[$i]['account'];
+                $dbdata['promote_id'] = $promote[$i]['id'];
            }
            $data[] = $dbdata;
        }
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@ -304,6 +304,13 @@
                        </tr>
                    </volist>
                   </empty>
+                   <tr class="data_summary">
+                        <td colspan="3" style="text-align: center;">汇总:</td>
+                        <td colspan="99">
+                            累计充值：{$pay_allcount}
+                        </td>
+                        <td></td>
+                    </tr>
                </tbody>
            </table>
        </div>
--- a/Application/Admin/View/Platform/promote_statistics.html
+++ b/Application/Admin/View/Platform/promote_statistics.html
@ -216,20 +216,20 @@ $(function(){
            $("#search").click();
        }
    });
-    $(".ljzc").click(function(){
-        var id = $(this).attr('data-value');
-        var game_name = "{:I('game_name')}";
-        var server_name = "{:I('server_id')}";
-        var urlr = window.location.host;
-         layer.open({
-          type: 2,
-          title: '注册记录',
-          shadeClose: true,
-          shade: 0.8,
-          area: ['70%', '80%'],
-          content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-    });
-    });
+    // $(".ljzc").click(function(){
+    //     var id = $(this).attr('data-value');
+    //     var game_name = "{:I('game_name')}";
+    //     var server_name = "{:I('server_id')}";
+    //     var urlr = window.location.host;
+    //      layer.open({
+    //       type: 2,
+    //       title: '注册记录',
+    //       shadeClose: true,
+    //       shade: 0.8,
+    //       area: ['70%', '80%'],
+    //       content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+    //     });
+    // });
    $(".paixu").click(function(){
        var that=$(this);
        $data_order=that.attr('data-order');
--- a/Application/Admin/View/Platform/promotepay_statistics.html
+++ b/Application/Admin/View/Platform/promotepay_statistics.html
@ -120,7 +120,7 @@
                    <volist name="list_data" id="data">
                    <tr>
                        <td >{$data['promote_account']}</td>
-                        <td ><span class='ljcz' data-value='{$data["promote_id"]}'><a>{$data.count}</a></span></td>
+                        <td ><span class='ljcz' data-value="{$data['promote_id']}"><a>{$data.count}</a></span></td>
                        <!-- <td ><strong><if condition="$data.rand eq 1"><span>{$data.rand}</span><elseif condition="$data.rand eq 2"/><span>{$data.rand}</span><elseif condition="$data.rand eq 3"/><span>{$data.rand}</span><else/>{$data.rand}</if></strong></td> -->
                        <td >{$data.today}</td>
                        <td >{$data.week}</td>
@ -193,19 +193,19 @@ $(function(){
            $("#search").click();
        }
    });
-    $(".ljcz").click(function(){
-        var id = $(this).attr('data-value');
-        var game_name = "{:I('game_name')}";
-        var server_name = "{:I('server_id')}";
-         layer.open({
-          type: 2,
-          title: '游戏消费记录',
-          shadeClose: true,
-          shade: 0.8,
-          area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-    });
-    });
+    // $(".ljcz").click(function(){
+    //     var id = $(this).attr('data-value');
+    //     var game_name = "{:I('game_name')}";
+    //     var server_name = "{:I('server_id')}";
+    //      layer.open({
+    //       type: 2,
+    //       title: '游戏消费记录',
+    //       shadeClose: true,
+    //       shade: 0.8,
+    //       area: ['70%', '80%'],
+    //       content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+    // });
+    // });
    $(".paixu").click(function(){
        $ddd=$(this).attr('date-url');
        $lzhuce="{:I('lzhuce')}";
--- a/Application/Base/Repository/UserRepository.class.php
+++ b/Application/Base/Repository/UserRepository.class.php
@ -133,8 +133,13 @@ class UserRepository
        $dayList = $params['dayList'] ?? [];
        $params['time_column'] = 'create_time';
        $conditions = $this->getDayGroupConditions($params);
-        $items = M('login_daily_record', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day, count(DISTINCT user_id, game_id) as count')
+        $subQuery = M('login_daily_record', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
            ->where($conditions)
+            ->group('day,game_id')
+            ->buildSql();
+        $items = M()->field('*,sum(count) as count')
+            ->table($subQuery)
+            ->alias('a')
            ->group('day')
            ->select();

@ -294,8 +299,13 @@ class UserRepository
        $params['time_column'] = 'create_time';
        $conditions = $this->getCreateRoleConditions($params);

-        $items = M('user_play_info', 'tab_')->field('count(distinct game_id,user_id) count, FROM_UNIXTIME(create_time, "%Y-%m-%d") as day')
+        $subQuery = M('user_play_info', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
            ->where($conditions)
+            ->group('day,game_id')
+            ->buildSql();
+        $items = M()->field('*,sum(count) as count')
+            ->table($subQuery)
+            ->alias('a')
            ->group('day')
            ->select();
        return $this->assembleRecords($items, $dayList, 'count');
@ -346,10 +356,14 @@ class UserRepository
            ->where("ti.user_id = user_id and ti.game_id = game_id and ti.create_time < " . $params['begin_time'])
            ->fetchSql(true)
            ->count();
-        $items = $model->field("count(distinct game_id,user_id) count, FROM_UNIXTIME(create_time, '%Y-%m-%d') as day,
-        (" . $sql . ") as num")
+        $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT user_id) as count')
            ->where($conditions)
-            ->group("day")
+            ->group('day,game_id')
+            ->buildSql();
+        $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
+            ->table($subQuery)
+            ->alias('a')
+            ->group('day')
            ->having('num = 0')
            ->select();
        return $this->assembleRecords($items, $dayList, 'count');
@ -411,10 +425,14 @@ class UserRepository
            ->where("ti.create_device_number = create_device_number and ti.game_id = game_id and ti.create_time < " . $params['begin_time'])
            ->fetchSql(true)
            ->count();
-        $items = $model->field("count(distinct game_id,create_device_number) count, FROM_UNIXTIME(create_time, '%Y-%m-%d') as day,
-        (" . $sql . ") as num")
+        $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT create_device_number) as count')
            ->where($conditions)
-            ->group("day")
+            ->group('day,game_id')
+            ->buildSql();
+        $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
+            ->table($subQuery)
+            ->alias('a')
+            ->group('day')
            ->having('num = 0')
            ->select();
        return $this->assembleRecords($items, $dayList, 'count');
@ -476,10 +494,14 @@ class UserRepository
            ->where("ti.create_ip = create_ip and ti.game_id = game_id and ti.create_time < " . $params['begin_time'])
            ->fetchSql(true)
            ->count();
-        $items = $model->field("count(distinct game_id,create_ip) count, FROM_UNIXTIME(create_time, '%Y-%m-%d') as day,
-        (" . $sql . ") as num")
+        $subQuery = $model->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day,count(DISTINCT create_ip) as count')
            ->where($conditions)
-            ->group("day")
+            ->group('day,game_id')
+            ->buildSql();
+        $items = M()->field("*,sum(count) as count,(" . $sql . ") as num")
+            ->table($subQuery)
+            ->alias('a')
+            ->group('day')
            ->having('num = 0')
            ->select();
        return $this->assembleRecords($items, $dayList, 'count');
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@ -1053,7 +1053,7 @@ function is_check_account($account){
        $map[$field]=$game_id;
        $data=M('game','tab_')->where($map)->find();
        if(empty($data)){return '';}
-        return $data['dratio'];
+        return $data['ratio'];
    }

   /**
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@ -412,17 +412,21 @@ class DownloadController extends BaseController {
        $initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
        $begTime = strtotime($initBegTime);
        $endTime = strtotime($initEndTime);
-        
+        $gameId = intval(I('game_id', 0));
+        $status = intval(I('status', 0));
        $map['chain'] = ['like', $this->loginPromote['chain'] . $this->loginPromote['id'] . '/%'];
        $ids = M('promote', 'tab_')->where($map)->getField('id', true);
        $ids[] = $this->loginPromote['id'];
        $ids = implode(',', $ids);
        $map = [];
        $map['promote_id'] = ['in', $ids];
+        $map['pay_status'] = 1;
        if (!empty($payOrderNumber)) {
            $map['pay_order_number'] = $payOrderNumber;
        }
-        
+        if (!empty($gameId)) {
+            $map['game_id'] = $gameId;
+        }
        if (!empty($begTime) && empty($endTime)) {
            $map['pay_time'] = ['egt', $begTime];
        } elseif (empty($begTime) && !empty($endTime)) {
@ -430,6 +434,22 @@ class DownloadController extends BaseController {
        } elseif (!empty($begTime) && !empty($endTime)) {
            $map['pay_time'] = ['between', [$begTime, $endTime + 86399]];
        }
+
+        if (isset($_GET['status'])) {
+            if ($status == -2) {
+                $map['selle_status'] = 0;
+            } else {
+                $withdrawMap['promote_id'] = $this->loginPromote['id'];
+                $withdrawMap['status'] = $status;
+                $withdrawIds = M('withdraw', 'tab_')->where($withdrawMap)->getField('id', true);
+
+                if (empty($withdrawIds)) {
+                    $map = '1 = 2';
+                } else {
+                    $map['withdraw_id'] = ['in', $withdrawIds];
+                }
+            }
+        }
         $conditions = json_encode($map,TRUE);
         $addtime = time();
         $data = [
@ -1485,7 +1505,7 @@ class DownloadController extends BaseController {
            array_push($ids,PID);
            
        }
-        array_push($ids,$queryPromote['id']);
+       //array_push($ids,$queryPromote['id']);
        if (!empty($ids)) {
            $map['promote_id'] = ['in',$ids];
            
@ -1530,7 +1550,7 @@ class DownloadController extends BaseController {
            if (($playTimeEnd - $playTimeBegin) > 31 * 24 * 3600) {
              $this->error('时间范围不能超过31天');
            }
-            $map['play_time'] = ['between', [$playTimeBegin, $playTimeEnd]];
+            $map['create_time'] = ['between', [$playTimeBegin, $playTimeEnd]];
        }
        if ($isSelf) {
            $map['promote_id'] = $queryPromote['id'];
@ -1759,6 +1779,7 @@ class DownloadController extends BaseController {
        $xlsCell = array(
 		array('account','玩家账号'),
        array('promote_account','推广账号'),
+        array('device_number','设备IMIE/IDFA'),
 		array('register_time','注册时间'),
 		array('register_ip','注册ip'),
        array('login_time','登陆时间'),
@ -1766,7 +1787,7 @@ class DownloadController extends BaseController {
 	    );
        $model = M('user','tab_');
        
-        $data = $model->field('account,promote_account,register_time,register_ip,login_time,login_ip')->where($map)->select();
+        $data = $model->field('account,device_number,promote_account,register_time,register_ip,login_time,login_ip')->where($map)->order('tab_user.id desc')->select();
        //var_dump($data);
        $xlsData = [];
        foreach ($data as $key1 => $value1) {
@ -1788,12 +1809,14 @@ class DownloadController extends BaseController {
 		array('server_name','区服'),
        array('role_name','游戏昵称'),
        array('role_level','等级'),
+        array('create_time','创建时间'),
 	     );
        $model = M('user_play_info','tab_');
-        $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level')->where($map)->select();
+        $data = $model->field('user_account,promote_account,game_name,server_name,role_name,role_level')->where($map)->order('create_time desc')->select();
        $xlsData = [];
        foreach ($data as $key1 => $value1) {
           $value1['user_account'] = $this->encryption($value1['user_account']);
+           $value1['create_time'] = date('Y-m-d H:i:s',$value1['create_time']);
           $xlsData[] = $value1;
        }
        $this->exportExcel($xlsName, $xlsCell, $xlsData,$id);
@ -1832,7 +1855,7 @@ class DownloadController extends BaseController {
        $begTime = strtotime($initBegTime);
        $endTime = strtotime($initEndTime);
        $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime;
+        $params['end_time'] = $endTime -1;
         if(!empty($map['apply_time'][1])) {
             $begTime = $map['apply_time'][1][0];
             $endTime = $map['apply_time'][1][1];
@ -2120,6 +2143,11 @@ class DownloadController extends BaseController {
         foreach ($data as $key => $value) {
            $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']);
            $value['user_account'] = $this->encryption($value['user_account']);
+            if($value['check_status'] == 1) {
+                $value['check_status'] = "正常";
+            }else {
+                $value['check_status'] = "拉黑";
+            }
            //获取累计发放
            $where = array(
                "user_id"=>$value['user_id'],
@ -2202,9 +2230,9 @@ class DownloadController extends BaseController {
            $data[$key]['create_time'] = date('Y-m-d H:m:i',$value['create_time']);
            $data[$key]['user_account'] = $this->encryption($value['user_account']);
            if($value['check_status'] == 1) {
-                $data[$key]['check_status'] = "冻结";
-            }else {
                $data[$key]['check_status'] = "启用";
+            }else {
+                $data[$key]['check_status'] = "冻结";
            }
        }
         $xlsData = $data;
@ -2575,7 +2603,7 @@ class DownloadController extends BaseController {
         if(!empty($map['end_time'])) {
             $params['end_time'] = $map['end_time'];
         }else {
-             $params['begin_time'] = $endTime;
+             $params['begin_time'] = $endTime - 1;
         }
         $params['dayList'] = $map["dayList"];
         $summaryData = [];
@ -2728,15 +2756,21 @@ class DownloadController extends BaseController {
             
       );
       $subMap = [];
+       if(!empty($map['game_id'])) {
        $subMap['game_id'] = $map['game_id'];
+       }
+       if(!empty($map['server_id'])) {
        $subMap['server_id'] = $map['server_id'];
+       }
       $costBegin = $map['costbegin'];
       $costEnd = $map['costend'];
       unset($map['costbegin']);
       unset($map['costend']);
-       $roleIds = M('user_play_data_count', 'tab_')->group('role_id')->getField('role_id', true);
-       $map['role_id'] = ['in', $roleIds];
+       
       $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
+        $roleIdMap = $subMap;
+       $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
+       $map['role_id'] = ['in', $roleIds];
        if ($costBegin != '' || $costEnd != '') {
            $having = '';
            if ($costBegin != '' && $costEnd != '') {
@ -2774,23 +2808,29 @@ class DownloadController extends BaseController {
        ->buildSql();
        unset($map['begintime']);
        unset($map['endtime']);
-        $roles = M('user_play_info', 'tab_')
-            ->field("*,$sqlCost as cost,$sqlCount as count,$sqlTodayCost as today_cost")
+        $subQuery = M('user_play_info', 'tab_')
+                ->field("*,$sqlCost as recharge_cost,$sqlCount as recharge_count,$sqlTodayCost as recharge_cost_today")
                ->where($map)
+                ->having('recharge_cost > 0')
+                ->order('play_time desc')
+                ->buildSql();
+        $roles = M()->field(' * ')
+                ->table($subQuery)
+                ->alias('a')
                ->order('play_time desc')
                ->select();
         foreach ($roles as $role) {
                $records[] = [
-                    'user_account' => $role['user_account'],
+                    'user_account' => encryption($role['user_account']),
                    'game_name' => $role['game_name'],
                    'role_name' => $role['role_name'],
                    'role_id' => $role['role_id'],
                    'role_level' => $role['role_level'],
                    'server_id' => $role['server_id'],
                    'server_name' => $role['server_name'],
-                    'recharge_cost' => $role['cost'],
-                    'recharge_count' => $role['count'],
-                    'recharge_cost_today' => $role['cost_today'],
+                    'recharge_cost' => empty($role['recharge_cost']) ? 0 : $role['recharge_cost'],
+                    'recharge_count' => empty($role['recharge_count']) ? 0 : $role['recharge_count'],
+                    'recharge_cost_today' => empty($role['recharge_cost_today']) ? 0 : $role['recharge_cost_today'],
                    'play_time' => $role['play_time'],
                    'play_ip' => $role['play_ip'],
                    'promote_id' => $role['promote_id'],
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@ -15,6 +15,7 @@ class FinanceController extends BaseController
 {
    //提现状态
    public static $withdrawStatus = [
+        -2 => '已撤销',
        -1 => '审核未通过',
        0 => '待审核',
        1 => '汇款中',
@ -200,7 +201,7 @@ class FinanceController extends BaseController
                $map['pay_order_number'] = $payOrderNumber;
            }
            if (isset($_GET['status'])) {
-                if ($status == -2) {
+                if ($status == -99) {
                    $map['selle_status'] = 0;
                } else {
                    $withdrawMap['promote_id'] = $this->loginPromote['id'];
@ -277,8 +278,7 @@ class FinanceController extends BaseController
        //是否是会长
        $this->purview();
        //验证安全密码
-        $metaTitle = '结算明细';
-        $modelList = ['财务管理', $metaTitle];
+        $modelList = [];
        $res = $this->verifyPasswordView($modelList, false);
        if ($res == false) {
            $data['status'] = 0;
@ -329,6 +329,7 @@ class FinanceController extends BaseController
        $add['status'] = 0;
        $add['widthdraw_number'] = $this->produceWithdrawNumber();
        $add['settlement_end_time'] = $thisDay - 1;
+        $add['spend_ids'] = '';

        M()->startTrans();//开启事物
        $withdrawId = M('withdraw', 'tab_')->add($add);
@ -399,12 +400,10 @@ class FinanceController extends BaseController
        }
        if (isset($_GET['status']) && $_GET['status'] !== '') {
            $status = intval($_GET['status']);
-            if (!isset(FinanceController::$withdrawStatus[$status])) {
-                $this->error('参数异常');
-            }
-
+            if (isset(FinanceController::$withdrawStatus[$status])) {
                $map['status'] = $status;
            }
+        }

        $data = $model->field('id,widthdraw_number,create_time,settlement_end_time,sum_money,status,respond,transfer_proof')
            ->where($map)
@ -420,8 +419,15 @@ class FinanceController extends BaseController
                $list['create_time'] = date('Y-m-d H:i:s', $list['create_time']);
                $list['settlement_end_time'] = date('Y-m-d H:i:s', $list['settlement_end_time']);
                $list['status_name'] = FinanceController::$withdrawStatus[$list['status']];
-                if ($list['status'] == -1) {
+                switch ($list['status']) {
+                    case -2:
+                        $list['status_name'] = '<span style="color: #bbbaba;">' . $list['status_name'] . '</span>';
+                        break;
+                    case -1:
                        $list['status_name'] = '<span style="color: red;">' . $list['status_name'] . '</span>';
+                        break;
+                    default:
+                        break;
                }
            }
        }
@ -567,13 +573,12 @@ class FinanceController extends BaseController
    }

    //审核拒绝 重新审核
-    public function renewReview($id)
+    public function renewReview()
    {
        //是否是会长
        $this->purview();
        //验证安全密码
-        $metaTitle = '结算明细';
-        $modelList = ['财务管理', $metaTitle];
+        $modelList = [];
        $res = $this->verifyPasswordView($modelList, false);
        if ($res == false) {
            $data['status'] = 0;
@ -581,6 +586,94 @@ class FinanceController extends BaseController
            $this->ajaxReturn($data);
        }

-        $id = intval($id);
+        $id = intval(I('id', 0));
+        $data = M('withdraw', 'tab_')->find($id);
+        if (empty($data) || $data['status'] != -1) {
+            $data['status'] = 0;
+            $data['msg'] = '数据异常';
+            $this->ajaxReturn($data);
+        }
+        if ($data['promote_id'] != $this->loginPromote['id']) {
+            $data['status'] = 0;
+            $data['msg'] = '权限异常';
+            $this->ajaxReturn($data);
+        }
+
+        $save['status'] = 0;
+        $save['id'] = $id;
+        $res = M('withdraw', 'tab_')->save($save);
+        if ($res === false) {
+            $data['status'] = 0;
+            $data['msg'] = '提交失败';
+        } else {
+            $data['status'] = 1;
+            $data['msg'] = '提交成功';
+        }
+        $this->ajaxReturn($data);
+    }
+
+    //撤销提现
+    public function cancelWithdraw()
+    {
+        //是否是会长
+        $this->purview();
+        //验证安全密码
+        $modelList = [];
+        $res = $this->verifyPasswordView($modelList, false);
+        if ($res == false) {
+            $data['status'] = 0;
+            $data['msg'] = '权限异常';
+            $this->ajaxReturn($data);
+        }
+
+        $id = intval(I('id', 0));
+        $data = M('withdraw', 'tab_')->find($id);
+        if (empty($data) || !in_array($data['status'], [-1, 0])) {
+            $data['status'] = 0;
+            $data['msg'] = '数据异常';
+            $this->ajaxReturn($data);
+        }
+        if ($data['promote_id'] != $this->loginPromote['id']) {
+            $data['status'] = 0;
+            $data['msg'] = '权限异常';
+            $this->ajaxReturn($data);
+        }
+
+        $spendMap['withdraw_id'] = $id;
+        $spendIds = M('Spend', 'tab_')->where($spendMap)->getField('id', true);
+        if (empty($spendIds)) {
+            $data['status'] = 0;
+            $data['msg'] = '数据异常';
+            $this->ajaxReturn($data);
+        }
+        $spendIds = implode(',', $spendIds);
+        $time = time();
+        $withdrawSave['id'] = $id;
+        $withdrawSave['status'] = -2;
+        $withdrawSave['spend_ids'] = $spendIds;
+        $withdrawSave['last_up_update_time'] = $time;
+
+        M('withdraw', 'tab_')->startTrans();//开启事物
+        $withdrawRes = M('withdraw', 'tab_')->save($withdrawSave);
+        if ($withdrawRes === false) {
+            M('withdraw', 'tab_')->rollback();//事物回滚
+            $data['status'] = 0;
+            $data['msg'] = '撤销失败';
+            $this->ajaxReturn($data);
+        }
+
+        $spendSave['selle_status'] = 0;
+        $spendSave['withdraw_id'] = 0;
+        $spendRes = M('spend', 'tab_')->where($spendMap)->save($spendSave);
+        if ($spendRes === false) {
+            M('withdraw', 'tab_')->rollback();//事物回滚
+            $data['status'] = 0;
+            $data['msg'] = '撤销失败';
+        } else {
+            M('withdraw', 'tab_')->commit();//事物提交
+            $data['status'] = 1;
+            $data['msg'] = '撤销成功';
+        }
+        $this->ajaxReturn($data);
    }
 }
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@ -180,14 +180,14 @@ class PromoteController extends BaseController
        $month_add_user_money = $this->pay_total(3, 1, $promoteId);

        $yesterday_start = mktime(0, 0, 0, date('m'), date('d') - 1, date('Y'));
-        $yesterday_end = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
+        $yesterday_end = mktime(0, 0, 0, date('m'), date('d'), date('Y'))-1;
        //计算昨天用户的统计数据，当日用户充值数据
        $pay_time = " between {$yesterday_start} and {$yesterday_end}";
        $createTime = ['between', array($yesterday_start, $yesterday_end - 1)];
-        $yesterdaySpendData = $this->caculateSpend($pay_time, [], $createTime);
+//        $yesterdaySpendData = $this->caculateSpend($pay_time, []);
+//        var_dump($yesterdaySpendData);die();

        $todayAddSpendData = $this->caculateSpend($pay_time, [], [], 1);
-//        var_dump($todayAddSpendData);die();

        $mounthAddSpendData = $this->caculateSpend($pay_time, [], [], 2);

@ -209,7 +209,7 @@ class PromoteController extends BaseController
        $this->assign('data', $data);
 //        $this->assign('yesterdayData',$yesterdayData);
        $this->assign('spendData', $spendData);
-        $this->assign('yesterdaySpendData', $yesterdaySpendData);
+//        $this->assign('yesterdaySpendData', $yesterdaySpendData);
        $this->assign('todayAddSpendData', $todayAddSpendData);
        $this->assign('mounthAddSpendData', $mounthAddSpendData);

@ -240,99 +240,131 @@ class PromoteController extends BaseController

    private function caculateSpend($pay_time, $condition, $create = [], $type = 0)
    {
+        $map1['promote_id'] = $map['promote_id'] = array('egt', 0);
        $spend = M('Spend', 'tab_');
+        $map1['pay_status'] = $map['pay_status'] = 1;
        $today = total(1);
+        $yesterday = total(5);
        $week = total(2);
        $mounth = total(3);
-        $yesterday = total(5);
+        unset( $map['create_time']);

-        $map1['promote_id'] = $map['promote_id'] = array('gt', 0);
-        $map1['pay_status'] = $map['pay_status'] = 1;
-        $map1['pay_way'] = $map['pay_way'] = array('gt', 0);
-        $userId = [];
-        $this->getLoginPromote();
+        $promote_id = get_pid();

        $promoteId = M("promote", "tab_")
-            ->where(array('chain' => ['like', $this->loginPromote['chain'] . $this->loginPromote['id'] . '/%']))
-            ->getField('id', true);
-        $promoteId[] = $this->loginPromote['id'];
+            ->field("id")
+            ->where(array('chain' => ['like', '/'.$promote_id . '/%'],'id'=>$promote_id,'_logic'=>'or'))
+            ->select();
+        $promoteId = implode(',',array_column($promoteId,'id'));
+
        $whereUser['promote_id'] = ['IN', $promoteId];

        if ($type == 1) {
+            $pay_time = total(1);
            $start = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
            $end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1;
            $whereUser['register_time'] = ['between', array($start, $end - 1)];
            $userId = M('user', 'tab_')->field('id')->where($whereUser)->select();

        } else if ($type == 2) {
+            $pay_time = total(3);
            $start = mktime(0, 0, 0, date('m'), 1, date('Y'));
            $end = mktime(0, 0, 0, date('m') + 1, 1, date('Y')) - 1;
            $whereUser['register_time'] = ['between', array($start, $end - 1)];
            $userId = M('user', 'tab_')->field('id')->where($whereUser)->select();
        }
+//        if ($userId) {
+//            var_dump($userId);
+//        }

-        $userId = implode(',', array_column($userId, 'id'));
        if ($userId) {
+
+            $userId = implode(',', array_column($userId, 'id'));
+//            var_dump($userId);
            $map1['user_id'] = $map['user_id'] = ['IN', $userId];
        } else if (!$userId && $type != 0) {
-            return array('today' => 0, 'mounth' => 0);
-        }
-
-        if ($create) {
-            $map['create_time'] = $create;
-        }
-
-
-        $bindrecharge_data = M('bind_recharge', 'tab_')
-            ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, 
-               floor(sum(IF(create_time ' . $pay_time . ',real_amount,0))*100)  as scount,
-			   floor(sum(IF(create_time ' . $today . ',real_amount,0))*100)  as today,
-			   floor(sum(IF(create_time ' . $week . ',real_amount,0))*100) as week,
-			   floor(sum(IF(create_time ' . $mounth . ',real_amount,0))*100)   as mounth')
-            ->where($map1)
-            ->group('promote_id')
-            ->select(false);
-
-        $deposit_data = M('deposit', 'tab_')
-            ->field('max(id) as id,promote_account,promote_id,create_time as ordertime,date_format(FROM_UNIXTIME(create_time),"%Y-%m-%d") AS time, 
-               floor(sum(IF(create_time ' . $pay_time . ',pay_amount,0))*100)  as scount,
-			   floor(sum(IF(create_time ' . $today . ',pay_amount,0))*100)  as today,
-			   floor(sum(IF(create_time ' . $week . ',pay_amount,0))*100)  as week,
-			   floor(sum(IF(create_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
-            ->where($map1)
-            ->group('promote_id')
-            ->select(false);
-
-        $spendData = $spend
-            ->field('max(id) as id,promote_account,promote_id,pay_time as ordertime,date_format(FROM_UNIXTIME(pay_time),"%Y-%m-%d") AS time, 
-                   floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100)  as scount,
+            return array('sum_mounth' => 0, 'sum_today' => 0);
+        }
+
+        //获取所有会长
+        $promote_map = "`chain` =  '%/{$promote_id}/%' OR id = {$promote_id}";
+
+        $promote =  M("promote","tab_")->field("id,account")->where($promote_map)->select();
+        $data =array();
+        for ($i=0; $i < count($promote); $i++) {
+            # code...
+            $proid =  M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select();
+            $str = '';
+            for($k=0; $k<count($proid); $k++){
+                # code...
+                $str .= ($proid[$k]['id'].",");
+            }
+            $str .= "{$promote[$i]['id']}";
+            $map['promote_id'] = array("in",$str);
+            if (isset($_REQUEST['game_name'])) {
+                $map['game_name'] = $_REQUEST['game_name'];
+                if (isset($_REQUEST['server_id'])) {
+                    $map['server_name'] = $_REQUEST['server_id'];
+                    unset($_REQUEST['server_id']);
+                }
+                $dbdata = $spend
+                    ->field('
+                   floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count,
                   floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100)  as today,
+                   floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100)  as yesterday,
                   floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100)  as week,
                   floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
                    ->where($map)
-            ->union(' (' . $bindrecharge_data . ') ')
-            ->union(' (' . $deposit_data . ') ')
-            ->group('promote_id')
-            ->select(false);
-
-        $promote_id = get_pid();
-        $promote_map = "tp1.`id` = {$promote_id}";
-
-        $data = $spend->field('sum(a.scount) AS count,sum(a.today) AS today,sum(a. WEEK) AS WEEK,sum(a.mounth) AS mounth')
-            ->join("INNER JOIN (SELECT tp2.*, tp1.id AS pid, tp1.account as promote_account FROM tab_promote tp1 LEFT JOIN tab_promote tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp1.id = tp2.id where $promote_map ) AS t ON promote_id = t.id")
-            ->where($condition)->table('(' . $spendData . ') as a')->group()->order('count desc,a.ordertime')->find();
+                    ->where("pay_time".$pay_time)
+                    ->find();
+                $dbdata['promote_account'] = $promote[$i]['account'];
+            } else {
+                $dbdata = $spend
+                    ->field(' 
+                   floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count,
+                   floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100)  as today,
+                   floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100)  as yesterday,
+                   floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100)  as week,
+                   floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100)  as mounth')
+                    ->where($map)
+                    ->where("pay_time".$pay_time)
+                    ->find();
+                $dbdata['promote_account'] = $promote[$i]['account'];
+            }
+            $data[] = $dbdata;
+        }
+//        if ($userId) {
+//            echo $spend->_sql();die();
+//        }
+        foreach ($data as $key => $value) {
+            $value['count'] ?: 0;
+            $value['today'] ?: 0;
+            $value['week'] ?: 0;
+            $value['mounth'] ?: 0;
+            static $i = 0;
+            $i++;
+            $data[$key]['rand'] = $i;
+            $data[$key]['count'] = $value['count'] / 100;
+            $data[$key]['today'] = $value['today'] / 100;
+            $data[$key]['yesterday'] = $value['yesterday'] / 100;
+            $data[$key]['week'] = $value['week'] / 100;
+            $data[$key]['mounth'] = $value['mounth'] / 100;
+        }
+        $total = $this->data_total($data);

-        $spendData1 = $spend->field('sum(a.scount) AS count,sum(a.today) AS today,sum(a. WEEK) AS WEEK,sum(a.mounth) AS mounth')
-//            ->join("INNER JOIN (SELECT tp2.*, tp1.id AS pid, tp1.account as promote_account FROM tab_promote tp1 LEFT JOIN tab_promote tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') ) AS t ON promote_id = t.id")
-            ->where($condition)->table('(' . $spendData . ') as a')->group()->order('count desc,a.ordertime')->find();
+        return $total;
+//

-        $data['rand'] = 1;
-        $data['count'] = $data['count'] / 100;
-        $data['today'] = $spendData1['today'] / 100;
-        $data['week'] = $spendData1['week'] / 100;
-        $data['mounth'] = $spendData1['mounth'] / 100;
+    }

-        return $data;
+    public function data_total($data)
+    {
+        $total['sum_count'] = array_sum(array_column($data, 'count'));
+        $total['sum_today'] = array_sum(array_column($data, 'today'));
+        $total['yesterday'] = array_sum(array_column($data, 'yesterday'));
+        $total['sum_week'] = array_sum(array_column($data, 'week'));
+        $total['sum_mounth'] = array_sum(array_column($data, 'mounth'));
+        return $total;
    }

    private function pay_total($type = 0, $newadd = 1, $promoteId = "")
@ -867,6 +899,7 @@ class PromoteController extends BaseController
        $realName = I('real_name', '');
        $status = I('status', 'all');
        $promoteType = I('promote_type', 0);
+        $parentId = I('parent_id', 0);
        $loginer = $this->getLoginPromote();

        $map = [];
@ -892,6 +925,9 @@ class PromoteController extends BaseController
        if ($realName) {
            $map['real_name'] = ['like', '%' . $realName . '%'];
        }
+        if ($parentId) {
+            $map['parent_id'] = $parentId;
+        }
        if ($status != 'all') {
            $map['status'] = ['eq', $status];
        }
@ -899,10 +935,8 @@ class PromoteController extends BaseController
        list($records, $pagination, $count) = $this->paginate($query);

        foreach ($records as $key => $value) {
-
            $records[$key]['idcard'] = encryption($value['idcard']);
            $records[$key]['mobile_phone'] = encryption($value['mobile_phone']);
-
        }

        $ids = array_column($records, 'id');
@ -941,6 +975,23 @@ class PromoteController extends BaseController
            $promoteTypeName = '推广员';
        }

+        $parentMap = [];
+        $parentMap['chain'] = ['like', $loginer['chain'] . $loginer['id'] . '/%'];
+        $isGetParents = true;
+        if ($loginer['level'] == 1 && $promoteType == 1) {
+            $parentMap['level'] = 2;
+        } elseif ($loginer['level'] == 1 && $promoteType == 2) {
+            $parentMap['level'] = 3;
+        } elseif ($loginer['level'] == 2 && $promoteType == 2) {
+            $parentMap['level'] = 3;
+        } else {
+            $isGetParents = false;
+        }
+        $parents = null;
+        if ($isGetParents) {
+            $parents = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where($parentMap)->select();
+        }
+        $this->assign('parents', $parents);
        $this->assign('promoteTypeName', $promoteTypeName);
        $this->assign('hasChildList', $hasChildList);
        $this->assign('hasPlayerList', $hasPlayerList);
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@ -1066,7 +1066,7 @@ class QueryController extends BaseController
            $params['server_id'] = $serverId;
        }
        $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime;
+        $params['end_time'] = $endTime - 1;

        $summaryData = [];
        $dayList = $this->getDayList($begTime, $endTime);
@ -1227,7 +1227,7 @@ class QueryController extends BaseController
        }

        $params['begin_time'] = $begTime;
-        $params['end_time'] = $endTime;
+        $params['end_time'] = $endTime - 1;

        $data = M('Apply', 'tab_')->alias('a')
            ->field('a.game_id,a.game_name,a.sdk_version')
@ -1769,9 +1769,10 @@ class QueryController extends BaseController
                $map['promote_id'] = $queryPromote['id'];
            }

-            $roleIds = M('user_play_data_count', 'tab_')->group('role_id')->getField('role_id', true);
-            $map['role_id'] = ['in', $roleIds];
            $subMap['create_time'] = ['between', [$begTime, $endTime - 1]];
+            $roleIdMap = $subMap;
+            $roleIds = M('user_play_data_count', 'tab_')->where($roleIdMap)->group('role_id')->getField('role_id', true);
+            $map['role_id'] = ['in', $roleIds];
            if ($costBegin != '' || $costEnd != '') {
                $having = '';
                if ($costBegin != '' && $costEnd != '') {
@ -1833,7 +1834,7 @@ class QueryController extends BaseController
                ->having('recharge_cost > 0')
                ->order('play_time desc')
                ->buildSql();
-            $query = M()->field(' * ')
+            $query = M()->field('*')
                ->table($subQuery)
                ->alias('a')
                ->order($orderBy);
@ -2133,31 +2134,4 @@ class QueryController extends BaseController

        $this->ajaxReturn($data);
    }
-
-    public function userPlayDataCount()
-    {
-        $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24)));
-        $spendMap['pay_status'] = 1;
-        $spendMap['pay_game_status'] = 1;
-        $spendMap['game_player_id'] = ['gt', 0];
-        $spendMap['pay_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]];
-
-        $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count';
-        $spendCostData = M('spend', 'tab_')->field($field)
-            ->where($spendMap)
-            ->group('day,game_player_id,server_id,game_id')
-            ->select();
-
-        $data = [];
-        foreach ($spendCostData as $list) {
-            $save['game_id'] = $list['game_id'];
-            $save['server_id'] = $list['server_id'];
-            $save['role_id'] = $list['game_player_id'];
-            $save['recharge_cost'] = $list['recharge_cost'];
-            $save['recharge_count'] = $list['recharge_count'];
-            $save['create_time'] = strtotime($list['day']);
-            $data[] = $save;
-        }
-        M('user_play_data_count', 'tab_')->addAll($data);
-    }
 }
--- a/Application/Home/Controller/SafeController.class.php
+++ b/Application/Home/Controller/SafeController.class.php
@ -443,38 +443,13 @@ class SafeController extends BaseController{

    public function safeDocument() {
        $time = time();
-        $today = date('Y-m-d');
-        $username = $_REQUEST['username'];
-        $tsession =S($today);
-        if(S($username)) {
-            $code = S($username);
-        }else {
-            if(!empty($tsession)) {
-                $num = $tsession + 1;
-            }else {
-                $num = 1;
-            }
-            $promoteRs = M('promote','tab_')->where(['account'=>$username])->getField('create_time',true);
-            $code = date('Ymd',$promoteRs[0])."_".$num;
-        }
+        $loginPromote = $this->getLoginPromote();
+        $sn = date('Ymd') . '-' . strtoupper(substr(md5($loginPromote['id']), 8, 16));

        $endTime = date('Y-m-d',strtotime('+1 year'));
        $this->assign('time',date('Y-m-d',$time));
        $this->assign('endTime',$endTime);
-        $this->assign('code',$code);
-        $this->assign('username',$username);
+        $this->assign('sn',$sn);
        $this->display();
    }
-
-    public function ajaxAgree() {
-        $username = $_REQUEST['username'];
-        $code = $_REQUEST['code'];
-        $today = date('Y-m-d');
-        if(empty(S($username))) {
-            S($username, $code);
-            $t = S($today);
-            S($today,$t+1);
-        }
-        $this->ajaxReturn(['code'=>10000]);
-    }
 }   
--- a/Application/Home/View/default/Finance/settlementDtl.html
+++ b/Application/Home/View/default/Finance/settlementDtl.html
@ -103,8 +103,8 @@
        <div class="form-group normal_space">
          <select id="status" name="status" class="reselect select_gallery" style="min-width:200px;width: 175px;">
            <option value="" title="请选择状态">请选择状态</option>
-            <option value="-2" title="未提现"
-            <if condition="I('status') eq -2">selected</if>
+            <option value="-99" title="未提现"
+            <if condition="I('status') eq -99">selected</if>
            >未提现 </option>
            <?php foreach (promoteWithdrawStatus() as $key => $value) :?>
            <option value="{$key}" title="{$value}"
--- a/Application/Home/View/default/Finance/withdrawRecord.html
+++ b/Application/Home/View/default/Finance/withdrawRecord.html
@ -136,6 +136,10 @@
          <div class="btn btn-role btn-role-border <if condition='$status eq 2'>highlight</if>" status="2">
            <p>已汇款</p>
          </div>
+
+          <div class="btn btn-role btn-role-border <if condition='$status eq -2'>highlight</if>" status="-2">
+            <p>已撤销</p>
+          </div>
        </div>
      </div>
      <div class="page-list apply-app_apply-list query-recharge-list">
@ -174,9 +178,12 @@
                      <if condition="$vo['status'] eq 2">
                          <a data-href="{:U('download/Remittancecer',['id'=>$vo['id']])}" class="ajax-get">汇款证明</a>
                        <elseif condition="$vo['status'] eq -1"/>
-                        <a href="{:U('settlementOrder', array('id'=>$vo['id']))}" style="color: #0bb20c;">重新审核</a>
+                        <span class="renew-review" data-id="{$vo['id']}" style="color: #0bb20c;cursor: pointer;">重新审核</span>
+                      </if>
+                      <a href="{:U('settlementOrder', array('id'=>$vo['id']))}">结算单</a>
+                      <if condition="$vo['status'] eq -1 or $vo['status'] eq 0">
+                        <span class="cancel-withdraw" data-id="{$vo['id']}" style="color: red;cursor: pointer;">撤销提现</span>
                      </if>
-                      <a href="{:U('renewReview', array('id'=>$vo['id']))}">结算单</a>
                    </td>
                  </tr>
                </volist>
@ -269,6 +276,59 @@
          });

          $(".select_gallery").select2();
+
+          $('.renew-review').click(function () {
+             var id = parseInt($(this).attr('data-id'));
+
+              $.ajax({
+                  type: 'post',
+                  url: '{:U("renewReview")}',
+                  dataType: 'json',
+                  data: {id:id},
+                  success: function (data) {
+                      if (data.status == 1) {
+                          layer.msg(data.msg, {icon: 1});
+                          setTimeout(function(){
+                              window.location.reload();
+                          },2000);
+                      } else {
+                          layer.msg(data.msg, {icon: 5});
+                      }
+                  },
+                  error: function (result) {
+                      layer.msg('网络异常', {icon: 5});
+                  }
+              });
+          });
+
+          $('.cancel-withdraw').click(function () {
+              var id = parseInt($(this).attr('data-id'));
+              var msg = "确定要撤销提现吗？";
+              layer.confirm(msg, {
+                  title: '提示',
+                  btn: ['确定', '取消'],
+              }, function () {
+                  $.ajax({
+                      type: 'post',
+                      url: '{:U("cancelWithdraw")}',
+                      dataType: 'json',
+                      data: {id:id},
+                      success: function (data) {
+                          if (data.status == 1) {
+                              layer.msg(data.msg, {icon: 1});
+                              setTimeout(function(){
+                                  window.location.reload();
+                              },2000);
+                          } else {
+                              layer.msg(data.msg, {icon: 5});
+                          }
+                      },
+                      error: function (result) {
+                          layer.msg('网络异常', {icon: 5});
+                      }
+                  });
+              });
+          });
      });
  </script>

--- a/Application/Home/View/default/Promote/children.html
+++ b/Application/Home/View/default/Promote/children.html
@ -31,6 +31,16 @@
              <option value="2" <if condition="I('status') === '2'">selected</if>>冻结中</option>
            </select>
          </div>
+          <?php if($parents):?>
+          <div class="form-group fr normal_space">
+            <select name="parent_id" class="reselect select_gallery" style="width: 220px;" >
+              <option value="0">请选择上级</option>
+              <?php foreach($parents as $parent):?>
+              <option value="<?=$parent['id']?>" <?php if(I('parent_id')==$parent['id']):?>selected<?php endif;?>><?=$parent['account']?>(<?=$parent['real_name']?>)</option>
+              <?php endforeach;?>
+            </select>
+          </div>
+          <?php endif;?>
          <div class="form-group fr normal_space">
            <input type="text" name="real_name" class="txt normal_txt" id="uid" placeholder="请输入姓名" value="{:I('real_name')}">
          </div>
--- a/Application/Home/View/default/Promote/index.html
+++ b/Application/Home/View/default/Promote/index.html
@ -6,15 +6,15 @@
    <div class="page-overview promote-index-overview index-overview clearfix poll">
        <ul>
            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi1.png"/></span></div> <div class="text text2"><p>推广总用户</p><span>{$data.count}</span></div> </li>
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi2.png"/></span></div> <div class="text text1"><p>推广总充值</p><span>￥{$spendData.count}</span></div> </li>
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi3.png"/></span></div> <div class="text text3"><p>当日新增用户充值</p><span>￥{$todayAddSpendData.today}</span></div> </li>
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>当月新增用户充值</p><span>￥{$mounthAddSpendData.mounth}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi2.png"/></span></div> <div class="text text1"><p>推广总充值</p><span>￥{$spendData.sum_count}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi3.png"/></span></div> <div class="text text3"><p>当日新增用户充值</p><span>￥{$todayAddSpendData.sum_today}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>当月新增用户充值</p><span>￥{$mounthAddSpendData.sum_mounth}</span></div> </li>
        </ul>
        <ul style="margin-top: 10px">
            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi1.png"/></span></div> <div class="text text2"><p>昨日注册用户</p><span>{$data.yesterday}</span></div> </li>
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi2.png"/></span></div> <div class="text text1"><p>昨日充值金额</p><span>￥{$yesterdaySpendData.count}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi2.png"/></span></div> <div class="text text1"><p>昨日充值金额</p><span>￥{$spendData.yesterday}</span></div> </li>
            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi3.png"/></span></div> <div class="text text3"><p>今日注册用户</p><span>{$data.today}</span></div> </li>
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>今日充值金额</p><span>￥{$spendData.today}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>今日充值金额</p><span>￥{$spendData.sum_today}</span></div> </li>
        </ul>
    </div>
    <div class="index-tab-list">
--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@ -172,7 +172,7 @@
        </div>
        <div class="pagenation clearfix">
             <?php if ($loginer['level'] !== 4) :?>
-            <a id="sch-btn" data-href="{:U('download/userRecharge_data_export',array_merge(['xlsname'=>'ceshi'],I('post.')))}" class="ajax-get">导出</a>
+            <a id="sch-btn" data-href="{:U('download/userRecharge_data_export',array_merge(['xlsname'=>'ceshi'],I('get.')))}" class="ajax-get">导出</a>
            <?php endif ;?>
          {$pagination}
        </div>
--- a/Application/Home/View/default/Query/userRoles.html
+++ b/Application/Home/View/default/Query/userRoles.html
@ -60,7 +60,7 @@
            <label> ~ </label>
            <input type="text" class="txt integer-input" name="role_level_end" style="width: 50px" value="{:I('role_level_end')}" >
          </div>
-          <div class="form-group">
+          <div class="form-group normal_space">
            <input type="submit" class="submit" id='submit' url="{:U('Query/userRoles','model='.$model['name'],false)}"
                   value="查询">
          </div>
@ -107,7 +107,7 @@
        </div>
        <div class="pagenation clearfix">
            <?php if ($loginer['level'] !== 4) :?>
-            <a id="sch-btn" data-href="{:U('download/userRoles_data_export',array_merge(['xlsname'=>'ceshi'],I('post.')))}" class="ajax-get">导出</a>
+            <a id="sch-btn" data-href="{:U('download/userRoles_data_export',array_merge(['xlsname'=>'ceshi'],I('get.')))}" class="ajax-get">导出</a>
            <?php endif ;?>
          {$pagination}
        </div>
--- a/Application/Home/View/default/Safe/safeDocument.html
+++ b/Application/Home/View/default/Safe/safeDocument.html
@ -51,7 +51,7 @@ and open the template in the editor.
             <div class="title"><h2>游戏推广服务框架协议</h1></div>
             <div class="text">
                 <p>本协议由以下双方于<span>{$time}</span>签订:</p>
-                 <p>合同编号：{$code}</p>
+                 <p>合同编号：{$sn}</p>
                 <p style="font-weight: bold">甲方：海南万盟天下科技有限公司</p>
                 <p>注册地址：海南省海口市南海大道26号海口国家高新区创业孵化中心A楼5层A1-1268室</p>
                 <p>联系电话：13067391751</p>
@ -237,8 +237,6 @@ and open the template in the editor.
               
             </div>
              <button  id="ag" style="width:120px;height:40px;background: #26C7DB;color:white;border:none" >同意</button>
-              <input type="hidden" id='us' value="{$username}"/>
-              <input type="hidden" id='code' value="{$code}"/>
                 <br><br><br><br>
                  <br><br><br><br>
        </div>
@ -247,21 +245,11 @@ and open the template in the editor.
  

       $(function() {
-        var username = document.getElementById('us').value;
-        var code = document.getElementById('code').value;
           $("#ag").on('click',function(event) {
-                $.ajax({
-                    type:"POST",
-                    url:"{:U('Safe/ajaxAgree')}",
-                    data:{'username':username,'code':code},
-                    dataType:'json',
-                    success:function(res) {
                window.localStorage.setItem('checked','checked');
-                        window.history.back(-1); 
-                  }
+                window.location.href = "/index.php?s=/Home/Safe/modifyBaseInfo.html"
            });
       })
-       })
        
    </script>
 </html>
--- a/Application/Media/View/default/Article/article/detail1.html
+++ b/Application/Media/View/default/Article/article/detail1.html
@ -239,7 +239,7 @@
 					<div class="foot_link">
 						<a href="/media.php?s=/Article/news1/type/supervise.html">家长监护</a>
 						<a href="/media.php?s=/Service/index.html">客服帮助</a>
-						<a href="#">国浩律所</a>
+<!--						<a href="#">国浩律所</a>-->
 					</div>
 					<div class="foot_serial">
 						<span>备案号：琼ICP备19000556号-1</span>
--- a/Application/Media/View/default/Index/business.html
+++ b/Application/Media/View/default/Index/business.html
@ -68,8 +68,8 @@
        </div>
    </div>
    <!-- 侧导航 -->
-    <div class="side_tabbar">
+    <a class="side_tabbar" style="z-index: 1" href="http://wpa.qq.com/msgrd?v=3&amp;uin={:C('PC_SET_SERVER_QQ')}&amp;site=qq&amp;menu=yes" target="_blank">
        <img src="__IMG__/index_about/qrcode.png" alt="">
-    </div>
+    </a>

 </block>
--- a/Application/Media/View/default/Index/hezuo.html
+++ b/Application/Media/View/default/Index/hezuo.html
@ -1,4 +1,3 @@
-<extend name="Public/base" />
 <block name="body" >

    <script src="__JS__/jquery.min.js"></script>
@ -8,6 +7,25 @@
    <link rel="stylesheet" type="text/css" href="__CSS__/foot.css" />
    <link rel="stylesheet" type="text/css" href="__CSS__/collaborate.css" />

+    <div class="heard">
+        <div class="heard_logo" onclick="location.href='{:U(\'index\')}'">
+            <img src="__IMG__/logo.png" alt="">
+        </div>
+        <div class="heard_tabbar">
+            <ul>
+                <li>
+                    <a class="<if condition='$Think.const.CONTROLLER_NAME eq Index && $Think.const.ACTION_NAME eq index'>active</if>" href="{:U('Index/index')}"><span>关于天下</span><i></i></a>
+                </li>
+                <li>
+                    <a class="<if condition='$Think.const.CONTROLLER_NAME eq Index && $Think.const.ACTION_NAME eq business'>active</if>" href="{:U('Index/business')}"><span>{:C('PC_BUSINESS_PART')?C('PC_BUSINESS_PART'):'产品服务'}</span><i></i></a>
+                </li>
+                <li>
+                    <a class="<if condition='$Think.const.CONTROLLER_NAME eq Index && $Think.const.ACTION_NAME eq hezuo'>active</if>" href="{:U('Index/hezuo')}"><span>{:C('PC_BUSINESS_PART')?C('PC_BUSINESS_PART'):'商务合作'}</span><i></i></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+
    <div class="collaborate_swiper">
        <img src="__IMG__/lunbo2.png" alt="">
    </div>
@ -17,14 +35,14 @@
            <div class="del">万盟天下一直坚持开放诚信高效的业务合作，欢迎各位业界同仁前来联系，互利共赢。</div>
        </div>
        <div class="collaborate_info">
-            <div class="title">媒体合作</div>
+            <div class="title">商务合作</div>
            <div class="del">万盟天下一直希望通过广泛的市场及品牌合作，为用户提供更全面的产品与服务。</div>
        </div>
        <div class="collaborate_info">
-            <div class="title" style="margin-bottom: 25px">联系方式</div>
-            <p style="margin-bottom: 25px">公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号</p>
-            <p style="margin-bottom: 25px">联系人： 雷女士</p>
-            <p style="margin-bottom: 25px">联系电话： 13067391751</p>
+            <div class="title">联系方式</div>
+            <p >公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号</p>
+            <p>联系人： 雷女士</p>
+            <p>联系电话： 13067391751</p>
            <p>邮政编码：350004</p>
        </div>
        <!-- 地图展示 -->
@ -55,11 +73,13 @@
    </div>

    <!-- 侧导航 -->
-    <div class="side_tabbar" style="z-index: 2;-webkit-transform: translateZ(0);">
+    <a class="side_tabbar" style="z-index: 1" href="http://wpa.qq.com/msgrd?v=3&amp;uin={:C('PC_SET_SERVER_QQ')}&amp;site=qq&amp;menu=yes" target="_blank">
        <img src="__IMG__/index_about/qrcode.png" alt="">
-    </div>
+    </a>

    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
    <script src="__JS__/collaborate.js" type="text/javascript"></script>
-
+    <!-- WPA start -->
+    <script id="qd28857862714ea9ff78fbe4007a9d7ba302bde88b51" src="https://wp.qiye.qq.com/qidian/2885786271/4ea9ff78fbe4007a9d7ba302bde88b51" charset="utf-8" async defer></script>
+    <!-- WPA end -->
 </block>
--- a/Application/Media/View/default/Public/base.html
+++ b/Application/Media/View/default/Public/base.html
@ -95,7 +95,7 @@
 <body>

  <div class="heard">
-      <div class="heard_logo">
+      <div class="heard_logo" onclick="location.href='{:U(\'index\')}'">
          <img src="__IMG__/logo.png" alt="">
      </div>
      <div class="heard_tabbar">
@ -165,6 +165,10 @@ $(function() {
 });

 </script>
+
+  <!-- WPA start -->
+  <script id="qd28857862714ea9ff78fbe4007a9d7ba302bde88b51" src="https://wp.qiye.qq.com/qidian/2885786271/4ea9ff78fbe4007a9d7ba302bde88b51" charset="utf-8" async defer></script>
+  <!-- WPA end -->
 </body>
 </html>
 <block name='script'></block>
--- a/Application/Media/View/default/Recharge/pay.html
+++ b/Application/Media/View/default/Recharge/pay.html
@ -120,7 +120,7 @@
             <input type="hidden" name="apitype" value="alipay" id="apitype">

            <div class="price-input">其他
-              <input type="number" onkeyup="this.value = this.value.replace(/[^0-9]/g, &#39;&#39;); get_game_coin2();">
+              <input type="text" onkeyup="this.value = this.value.replace(/[^0-9]/g, &#39;&#39;); get_game_coin2();">
              元
            </div>
          </div>
@ -139,14 +139,15 @@
            <if condition="get_tool_status('alipay') eq 1">
            <div class="wayBg" data-type="alipay">
              <img src="__IMG__/zhifubaozhifu.png" alt="">
-              支付宝
+              <span>支付宝</span>
+
            </div>
            </if>

            <if condition="get_tool_status('weixin') eq 1 or get_tool_status('wei_xin') eq 1 or get_tool_status('weixin_gf') eq 1">
            <div class="" data-type="weixin">
              <img src="__IMG__/weixin.png" alt="">
-              微信支付
+              <span>微信支付</span>
            </div>
            </if>

@ -181,7 +182,7 @@
          <div class="foot_link">
            <a>家长监护</a>
            <a>客服帮助</a>
-            <a href="#">国浩律所</a>
+<!--            <a href="#">国浩律所</a>-->
          </div>
          <div class="foot_serial">
            <span>备案号：琼ICP备19000556号-1</span>
--- a/Application/Mobile/Controller/UserController.class.php
+++ b/Application/Mobile/Controller/UserController.class.php
@ -176,7 +176,6 @@ class UserController extends BaseController
            }

            $res = $this->suser->login($account, $password);
-            file_put_contents(dirname(__FILE__) . '/login_res_text.txt', json_encode([$res]));
            if ($res > 0) {
                $data = $this->bindingPromote($promoteId, $account);
            } else {
@ -931,9 +930,9 @@ class UserController extends BaseController
        $map['id'] = $logininfo['user_id'];
        $user = M("user", "tab_")->where($map)->field("id,phone")->find();
        if (!$user['phone']) {
-            $where['account'] = $phone;
+//            $where['account'] = $phone;
            $where['phone'] = $phone;
-            $where['_logic'] = 'OR';
+//            $where['_logic'] = 'OR';
            $is_user = M("user", "tab_")->where($where)->field("id")->find();
            if ($is_user) {
                echo json_encode(array('status' => 0, 'msg' => '手机号已存在，请更换手机号'));
--- a/Application/Mobile/View/Index/business.html
+++ b/Application/Mobile/View/Index/business.html
@ -1,6 +1,10 @@
 <extend name="Public/bases" />
 <block name="body" >
-
+    <style>
+        body {
+            background: #f5f5f5;
+        }
+    </style>
  <link rel="stylesheet" type="text/css" href="__CSS__/business.css">
  <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
  <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
@ -23,9 +27,9 @@
      </div>
      <div class="bazaar">
        <div class="title">联系方式</div>
-        <div class="address">公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号</div>
-        <div>联系人： 雷女士</div>
-        <div>联系电话： 13067391751</div>
+        <div class="address" style="margin-bottom: 4px;line-height: 0.4rem">公司地址：福建省福州市鼓楼区福大怡山文化创意园11号楼103号</div>
+        <div style="margin-bottom: 4px;">联系人： 雷女士</div>
+        <div style="margin-bottom: 4px;">联系电话： 13067391751</div>
        <div>邮政编码：350004</div>
      </div>
      <div class="map-box" >
@ -40,6 +44,33 @@
      <div>海南万盟天下科技有限公司</div>
    </div>
  </div>
-
+    <!-- 底部导航 -->
+    <div class="foot_tabbar">
+        <div class="foot_tabbar_box">
+            <div class="foot_info ">
+                <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+                    <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+                    <span>首页</span>
+                </a>
+            </div>
+            <div class="foot_info ">
+                <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+                    <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+                    <span>企业简介</span></a>
+            </div>
+            <div class="foot_info ">
+                <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+                    <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+                    <span>招商合作</span>
+                </a>
+            </div>
+            <div class="foot_info ">
+                <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+                    <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+                    <span>我的</span>
+                </a>
+            </div>
+        </div>
+    </div>
 </block>

--- a/Application/Mobile/View/Index/index.html
+++ b/Application/Mobile/View/Index/index.html
@ -54,5 +54,33 @@
    </div>
  </div>

+  <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>
 </block>
 <script type="text/javascript" src="__JS__/home.js"></script>
--- a/Application/Mobile/View/Index/introduce.html
+++ b/Application/Mobile/View/Index/introduce.html
@ -1,9 +1,16 @@
 <extend name="Public/bases" />
+
+
 <block name="body" >
  <link rel="stylesheet" type="text/css" href="__CSS__/enterprise.css">
  <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
  <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
  <script type="text/javascript" src="__JS__/getRem.js"></script>
+  <style>
+    body {
+      background: #f5f5f5;
+    }
+  </style>
  <div class="enterprise">
    <div class="enterprise_box">
      <div class="heard_img"><img src="__IMG__/new/lunbo.png" alt=""></div>
@ -22,5 +29,32 @@
      <div>海南万盟天下科技有限公司</div>
    </div>
  </div>
-
+  <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>
 </block>
--- a/Application/Mobile/View/Public/bases.html
+++ b/Application/Mobile/View/Public/bases.html
@ -84,34 +84,6 @@

    <block name="footer">

-        <!-- 底部导航 -->
-        <div class="foot_tabbar">
-            <div class="foot_tabbar_box">
-                <div class="foot_info ">
-                    <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
-                        <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
-                        <span>首页</span>
-                    </a>
-                </div>
-                <div class="foot_info ">
-                    <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
-                        <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
-                        <span>企业简介</span></a>
-                </div>
-                <div class="foot_info ">
-                    <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
-                        <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
-                        <span>招商合作</span>
-                    </a>
-                </div>
-                <div class="foot_info ">
-                    <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
-                        <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
-                        <span>我的</span>
-                    </a>
-                </div>
-            </div>
-        </div>
    </block>
 	<div class="float_contact_position " style="display: none;">
  <div class="float_contact ">
@ -186,6 +158,9 @@
            </ul>
        </div>
    </div>
+
+
+
 	<block name="script"></block>
 <script>
    $(function(){
@ -215,4 +190,7 @@

    })
 </script>
+    <!-- WPA start -->
+    <script id="qd288578627107e96659d49fc082e6aeda0ca5a619f9" src="https://wp.qiye.qq.com/qidian/2885786271/07e96659d49fc082e6aeda0ca5a619f9" charset="utf-8" async defer></script>
+    <!-- WPA end -->
 </html>
--- a/Application/Mobile/View/User/forget.html
+++ b/Application/Mobile/View/User/forget.html
@ -1,56 +1,50 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title></title>
-    <meta name="keywords" content="" />
-    <meta name="description" content="" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="applicable-device" content="mobile">
-    <link href="__CSS__/iconfont.css" rel="stylesheet" >
-    <link href="__CSS__/common.css" rel="stylesheet" >
-    <link href="__CSS__/unlr.css" rel="stylesheet" >
-    <script src="__JS__/jquery-1.11.1.min.js"></script>
-    
-  </head>
-  <body class="unlr">
-    <header class="header forget-header">
-      <div class="">
-        <a href="{:U('login')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption">找回密码</h1>
+<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">
+  <style>
+    body {
+      background: white;
+    }
+  </style>
+  <div class="name">
+    <!-- 子页公共头部 -->
+    <div class="subpage-heard">找回密码
+      <a href="javascript:window.history.go(-1);" class="arrows"></a>
    </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
-        <div class="t-form forget-form">
-          <form action="{:U('forget')}" method="post" class="forget-box">
-            <div class="form-group clearfix">
-              <div class="input-group clearfix">
-                <input type="text" name="mobile" id="mobile" class="txt" placeholder="请输入手机号码">
-                <a href="javascript:;" class="getcode jsgetcode">获取验证码</a>
+    <div class="remove-info">
+
+      <div class="name-input">
+        <div class="name-inputBox">
+          <img src="__IMG__/shoujibangding.png" alt="">
+          <div>手机号</div>
        </div>
-              <div class="input-group clearfix">
-                <input type="text" id="code" name="code" class="txt" placeholder="请输入验证码">
+        <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>
-            <div class="btn-group">
-              <input type="button" class="submit" value="下一步">
+        <div class="code g-btn jsgetcode" id="sendSafeCode">获取验证码</div>
      </div>
+      <div class="save submit">下一步</div>
      <div>
-              <p class="forget-notice">
+        <p class="forget-notice" style="font-size: 0.28rem;text-align: center;line-height: 0.4rem;">
          通过手机号找回密码只适用于手机号注册的账号<br>用户名注册的账号可
-                <a href="http://wpa.qq.com/msgrd?v=3&amp;uin={:C('APP_QQ')}&amp;site=qq&amp;menu=yes" target="_blank">联系客服</a>
+          <a href="http://wpa.qq.com/msgrd?v=3&amp;uin={:C('APP_QQ')}&amp;site=qq&amp;menu=yes"
+             target="_blank" style="color: #21B1EB;">联系客服</a>
        </p>
      </div>
-          </form>
    </div>
-      </section>
-    </section>
+  </div>
+
  <div class="popmsg pop-dialog"></div>
  <script src="__JS__/pop.lwx.min.js"></script>
  <script src="__JS__/common.js"></script>
@ -110,11 +104,13 @@
          dataType:"json",
          data:{phone:$.trim($('#mobile').val()),code:$("#code").val()},
          success:function(result){
-              pmsg.msg(result.info);
            if(result.status == 1){
+              pmsg.msg("验证成功");
              setTimeout(function () {
                window.location.href = result.url;
              }, 2000);
+            } else {
+              pmsg.msg(result.msg);
            }
          },
          error:function(){
@ -124,5 +120,4 @@
      })
    });
  </script>
-  </body>
-</html>
+</block>
--- a/Application/Mobile/View/User/forget1.html
+++ b/Application/Mobile/View/User/forget1.html
@ -1,48 +1,40 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <title></title>
-    <meta name="keywords" content="" />
-    <meta name="description" content="" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="applicable-device" content="mobile">
-    <link href="__CSS__/iconfont.css" rel="stylesheet" >
-    <link href="__CSS__/common.css" rel="stylesheet" >
-    <link href="__CSS__/unlr.css" rel="stylesheet" >
-    <script src="__JS__/jquery-1.11.1.min.js"></script>
-    
-  </head>
-  <body class="unlr">
-    <header class="header forget-header">
-      <div class="">
-        <a href="{:U('forget')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption">设置新密码</h1>
-      </div>
-    </header>
-    <div class="occupy"></div>
+<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">
  <section class="trunker">
    <section class="container">
-        <div class="t-form forget-form">
-          <form action="" class="forget-box">
-            <div class="form-group clearfix">
-              <div class="input-group clearfix">
-                <input type="password" id="new_pwd" name="new_pwd" class="txt" placeholder="6-12个字符" minlength="6" maxlength="12">
+      <form id="form"  action="" method="post" onsubmit="return false" class="">
+        <div class="name">
+          <!-- 子页公共头部 -->
+          <div class="subpage-heard">设置新密码
+            <a href="javascript:window.history.go(-1);" class="arrows"></a>
          </div>
-              <div class="input-group clearfix">
-                <input type="password" id="new_pwd_confirm" name="new_pwd_confirm" class="txt" placeholder="再次输入新密码" maxlength="12">
+          <div class="name-info">
+
+            <div class="name-input">
+              <div class="name-inputBox">
+                <img src="__IMG__/xiugaimima.png" alt="">
+                <div>新密码</div>
              </div>
+              <input type="password" placeholder="请输入新密码" style="padding: 0" name="new_pwd" id="new_pwd" value="" >
+            </div>
+
+            <div class="name-input">
+              <div class="name-inputBox">
+                <img src="__IMG__/xiugaimima.png" alt="">
+                <div>确认密码</div>
+              </div>
+              <input type="password" placeholder="请输入确认密码" style="padding: 0" name="new_pwd_confirm" id="new_pwd_confirm" value="">
            </div>
-            <div class="btn-group">
            <input type="hidden" id="phone" name="phone" value="{:I('phone')}">
-              <input type="button" class="submit" value="完成">
+            <div class="save submit">保存修改</div>
          </div>
-          </form>
        </div>
+      </form>
    </section>
  </section>
  <div class="popmsg pop-dialog"></div>
@ -53,6 +45,7 @@
      var pmsg = $('.popmsg').pop();
      $(".submit").click(function(){
        var new_pwd = $.trim($("#new_pwd").val());
+        var phone = $.trim($("#phone").val());
        var new_pwd_confirm = $.trim($("#new_pwd_confirm").val());
        if(new_pwd.length < 6 || new_pwd.length > 12){
          pmsg.msg('密码长度6-12个字符');
@ -67,7 +60,10 @@
          url:"{:U('forget1')}",
          type:"POST",
          dataType:"json",
-            data:{phone:$("#phone").val(),new_pwd:new_pwd},
+          data:{
+            phone:phone,
+            new_pwd:new_pwd
+          },
          success:function(result){
            pmsg.msg(result.info);
            if(result.status == 1){
@ -84,5 +80,4 @@

    });
  </script>
-  </body>
-</html>
+</block>
--- a/Application/Mobile/View/User/index.html
+++ b/Application/Mobile/View/User/index.html
@ -21,7 +21,7 @@
        <div class="platform_box">
          <div class="platform_info">
            <div class="del">我的平台币</div>
-            <img src="__IMG__/new/yiwen.png" alt="">
+<!--            <img src="__IMG__/new/yiwen.png" alt="">-->
            <div class="price">{$user['balance']}</div>
            <?php $recharge = $user['id'] ? U('recharge') : U('login');?>
            <a class="recharge" href="{$recharge}">充值</a>
@ -59,7 +59,34 @@
    </div>
  </div>

-
+  <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>

    <div class="popmsg pop-dialog"></div>
    <script src="__JS__/pop.lwx.min.js"></script>
--- a/Application/Mobile/View/User/userauth.html
+++ b/Application/Mobile/View/User/userauth.html
@ -1,52 +1,62 @@
 <extend name="Public/bases" />
 <block name="body" >
  <link href="__CSS__/user.css" rel="stylesheet" >
-  <body class="">
-    <header class="header">
-      <div class="">
-        <a href="{:U('User/userset')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption">实名认证</h1>
-      </div>
-    </header>
-    <div class="occupy"></div>
+  <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">
  <section class="trunker">
    <section class="container">
-        <if condition='$user["age_status"] lt 2'>
-        <form id='form' action="" method="post" class="">
-          <div class="t-table user-auth-list">
+      <form id="form"  action="" method="post" onsubmit="return false" class="">
+        <div class="name">
+          <!-- 子页公共头部 -->
+          <div class="subpage-heard">实名认证
+            <a href="javascript:window.history.go(-1);" class="arrows"></a>
+          </div>

-            <ul class="table clearfix">
-              <li class="table-row">
-                <span class="table-cell">真实姓名</span>
-                <span class="table-cell">
-                  <input type="text" class="txt" id='real_name' name="real_name" value="{$user['real_name']}" placeholder="请如实填写" minlength="2">
-                </span>
-              </li>
-              <li class="table-row">
-                <span class="table-cell">证件号码</span>
-                <span class="table-cell">
-                  <input type="text" class="txt" id='idcard' name="idcard" value="{$user['idcard']}" placeholder="请填写身份证号" maxlength="18">
-                </span>
-              </li>
-            </ul>
+          <?php if(!empty($user['real_name'])){ ?>
+          <div class="name-input">
+            <div class="name-inputBox">
+              <img src="__IMG__/shimingrenzhengmoren.png" alt="">
+              <div>真实姓名</div>
            </div>
-          <div class="btnbox user-set-btnbox">
-            <input type="button" class="btn jssubmit" value="提交">
+            <input type="text" placeholder="请输入真实姓名" style="padding: 0;color: #292929" name="real_name" id="real_name" value="王大锤">
          </div>
-        </form>
-        <elseif condition="$user['third_authentication'] eq 1" />
-              <span class="user-auth-list-title">您已进行过支付宝实名认证</span>
-        <else/>
-        <form action="" method="post" class="">
-          <div class="t-table user-auth-list">
-            <span class="user-auth-list-title">您已进行过实名认证</span>
-            <ul class="table clearfix">
-              <li class="table-row"><span class="table-cell">真实姓名</span><span class="table-cell">{:substr_cut($user['real_name'],'*')}</span></li>
-              <li class="table-row"><span class="table-cell">证件号码</span><span class="table-cell">{:substr_replace($user['idcard'],'****************',1,16)}</span></li>
-            </ul>
+          <?php }else{ ?>
+            <div class="name-input">
+              <div class="name-inputBox">
+                <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']}">
+            </div>
+          <?php }?>
+
+
+          <?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">
+          </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']}">
+          </div>
+          <?php }?>
+
+
+            <div class="save jssubmit">保存修改</div>
+          </div>
+
        </div>
      </form>
-      </if>
    </section>
  </section>
  <div class="popmsg pop-dialog"></div>
@ -83,7 +93,6 @@
          return false;
        }

- 
        $.ajax({
          cache:true,
          type:'post',
@ -92,11 +101,10 @@
          dataType:'json',
          success:function(result){
            pmsg.msg(result.info);
-              if(result.url !=''){
+            if(result.url !='' && result.status){
              setTimeout(function () {
                window.location.href = result.url;
              }, 2000);
-                
            }
          },
          error:function(){
@ -108,5 +116,4 @@

    });
  </script>
-  </body>
 </block>
--- a/Application/Mobile/View/User/usergift.html
+++ b/Application/Mobile/View/User/usergift.html
@ -134,7 +134,7 @@
          $('#moreBtn').removeClass('ms-none');loads = false;
        } else {
          $('.loading').removeClass('hidden').addClass('ms-none');
-          pmsg.msg('已经到底了~');
+          // pmsg.msg('已经到底了~');
        }
      })
    });
--- a/Application/Mobile/View/User/usernick.html
+++ b/Application/Mobile/View/User/usernick.html
@ -1,26 +1,28 @@
 <extend name="Public/bases" />
 <block name="body" >
 <link href="__CSS__/user.css" rel="stylesheet" >
-<header class="header">
-  <div class="">
-    <a href="{:U('User/userset')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-    <h1 class="caption">修改昵称</h1>
-    <a href="javascript:;" class="hbtn addbtn jssubmit">保存</a>
-  </div>
-</header>
-<div class="occupy"></div>
+  <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">
 <section class="trunker">
  <section class="container">
    <form id="form"  action="" method="post" onsubmit="return false" class="">
-      <div class="t-table user-auth-list">
-        <ul class="table clearfix">
-          <li class="table-row">
-            <span class="table-cell">昵称</span>
-            <span class="table-cell">
-              <input type="text" class="txt" id="nickname" name="nickname" value="{$user['nickname']}" placeholder="请输入昵称">
-            </span>
-          </li>
-        </ul>
+      <div class="name">
+        <!-- 子页公共头部 -->
+        <div class="subpage-heard">修改名字
+          <a href="javascript:window.history.go(-1);" class="arrows"></a>
+        </div>
+        <div class="name-info">
+          <div class="name-input">
+            <div class="name-inputBox">
+              <img src="__IMG__/mingzibianji.png" alt="">
+              <div>昵称</div>
+            </div>
+            <input type="text" placeholder="请输入昵称" style="padding: 0" name="nickname" id="nickname" value="{$user['nickname']}">
+          </div>
+          <div class="save jssubmit">保存修改</div>
+        </div>
      </div>
    </form>
  </section>
--- a/Application/Mobile/View/User/userpassword.html
+++ b/Application/Mobile/View/User/userpassword.html
@ -1,41 +1,46 @@
 <extend name="Public/bases" />
 <block name="body" >
-<link href="__CSS__/user.css" rel="stylesheet" >
-<body class="">
-    <header class="header">
-      <div class="">
-        <a href="{:U('User/userset')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption">修改密码</h1>
-      </div>
-    </header>
-    <div class="occupy"></div>
+    <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">
    <section class="trunker">
        <section class="container">
-        <form id='form' action="" method="post">
-          <div class="t-table user-auth-list">
-            <ul class="table clearfix">
-              <li class="table-row">
-                <span class="table-cell">原始密码</span>
-                <span class="table-cell">
-                  <input type="password" class="txt" id="old_pwd" name="old_pwd" placeholder="请输入原始密码" maxlength="12">
-                </span>
-              </li>
-              <li class="table-row">
-                <span class="table-cell">新密码</span>
-                <span class="table-cell">
-                  <input type="password" class="txt" id="new_pwd" name="new_pwd" placeholder="请填写新密码" maxlength="12">
-                </span>
-              </li>
-              <li class="table-row">
-                <span class="table-cell">确认密码</span>
-                <span class="table-cell">
-                  <input type="password" class="txt" id="com_pwd" name="com_pwd" placeholder="请再次确认密码" maxlength="12">
-                </span>
-              </li>
-            </ul>
+            <form id="form"  action="" method="post" onsubmit="return false" class="">
+                <div class="name">
+                    <!-- 子页公共头部 -->
+                    <div class="subpage-heard">修改密码
+                        <a href="javascript:window.history.go(-1);" class="arrows"></a>
+                    </div>
+                    <div class="name-info">
+
+                        <div class="name-input">
+                            <div class="name-inputBox">
+                                <img src="__IMG__/xiugaimima.png" alt="">
+                                <div>原始密码</div>
+                            </div>
+                            <input type="text" placeholder="请输入原始密码" style="padding: 0" name="old_pwd" id="old_pwd" value="">
+                        </div>
+
+                        <div class="name-input">
+                            <div class="name-inputBox">
+                                <img src="__IMG__/xiugaimima.png" alt="">
+                                <div>新密码</div>
+                            </div>
+                            <input type="text" placeholder="请输入新密码" style="padding: 0" name="new_pwd" id="new_pwd" value="">
+                        </div>
+
+                        <div class="name-input">
+                            <div class="name-inputBox">
+                                <img src="__IMG__/xiugaimima.png" alt="">
+                                <div>确认密码</div>
+                            </div>
+                            <input type="text" placeholder="请输入确认密码" style="padding: 0" name="com_pwd" id="com_pwd" value="">
+                        </div>
+
+                        <div class="save jssubmit">保存修改</div>
                    </div>
-          <div class="btnbox user-set-btnbox">
-            <input type="button" class="btn jssubmit" value="完成">
                </div>
            </form>
        </section>
@ -80,5 +85,4 @@
            });
        });
    </script>
-  </body>
 </block>
--- a/Application/Mobile/View/User/userphone.html
+++ b/Application/Mobile/View/User/userphone.html
@ -1,39 +1,63 @@
 <extend name="Public/bases" />
-<block name="body" >
+<block name="body">
  <link href="__CSS__/user.css" rel="stylesheet" >
-  <body class="">
-    <header class="header">
-      <div class="">
-        <a href="{:U('User/userset')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption"><empty name="user.phone">绑定手机<else/>解除绑定</empty></h1>
+  <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">
+  <style>
+    body {
+      background: white;
+    }
+  </style>
+  <div class="name">
+    <!-- 子页公共头部 -->
+    <div class="subpage-heard"><empty name="user.phone">绑定手机<else/>解除绑定</empty>
+      <a href="javascript:window.history.go(-1);" class="arrows"></a>
    </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
+    <div class="remove-info">
+
      <form id='form' action="" method="post" class="">
-          <div class="t-table user-auth-list">
-            <ul class="table clearfix">
-              <li class="table-row">
-                <span class="table-cell">手机号</span>
-                <span class="table-cell">
-                  <input type="text" class="txt" id='phone' name="phone" value="{$user['phone']}" placeholder="请输入正确格式" <if condition="$user['phone'] neq ''"> readonly = "readonly" class="w-input" <else/> class="w-input cheackinput"</if>>
-                </span>
-              </li>
-              <li class="table-row">
-                <span class="table-cell">短信验证码</span>
-                <span class="table-cell">
-                  <input type="text" class="w-input cheackinput" name="scode" id="scode"><input type="button" class="g-btn" id="sendSafeCode" value="获取短信验证码">
-                </span>
-              </li>
-            </ul>
+
+      <?php if(!empty($user['phone'])){ ?>
+      <div class="remove-input">
+        <div class="remove-inputBox">
+          <img src="__IMG__/shoujibangding.png" alt="">
+          <div>手机号</div>
        </div>
-          <div class="btnbox user-set-btnbox">
-            <input type="button" class="btn jssubmit" value="提交">
+        <div style="color: #292929">{$user['phone']}</div>
+        <input type="hidden" name="phone" id="phone" value="{$user['phone']}">
+      </div>
+      <?php }else{ ?>
+
+      <div class="name-input">
+        <div class="name-inputBox">
+          <img src="__IMG__/shoujibangding.png" alt="">
+          <div>手机号</div>
        </div>
+        <input type="text" placeholder="请输入手机号" style="padding: 0" name="phone" id="phone" value="{$user['phone']}">
+      </div>
+
+
+      <?php }?>
+
+
+      <div class="remove-input">
+        <div class="remove-inputBox">
+          <img src="__IMG__/mingzibianji.png" alt="">
+          <div>验证码</div>
+          <input type="text" placeholder="请输入验证码" id="scode" name="scode" value="">
+        </div>
+        <div class="code g-btn" id="sendSafeCode">获取验证码</div>
+      </div>
+      <div class="save jssubmit">保存修改</div>
+
      </form>
-      </section>
-    </section>
+
+    </div>
+  </div>
+
  <div class="popmsg pop-dialog"></div>
  <script src="__JS__/pop.lwx.min.js"></script>
  <script>
@ -76,8 +100,8 @@
            $(e).removeClass('g-btn').addClass('g-btntn');
            var a = setInterval(function() {
              r--;
-                          $(e).val('成功'+r + '秒后重发'),
-                          0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).val('获取短信验证码'), clearInterval(a))
+              $(e).text('成功'+r + '秒后重发'),
+              0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a))
            },1e3)
          }
        };
@ -121,5 +145,4 @@

    });
  </script>
-  </body>
 </block>
--- a/Application/Mobile/View/User/userset.html
+++ b/Application/Mobile/View/User/userset.html
@ -77,7 +77,7 @@
        </div>
        <div>{$user.account}</div>
      </div>
-      <div class="setting-info arror">
+      <div class="setting-info arror" onclick="location.href='{:U(\'usernick\')}'">
        <div class="left">
          <img src="__IMG__/user/mingzibianji.png" alt="">
          <span>昵称</span>
@ -86,7 +86,7 @@
      </div>
      <div class="setting-info arror">
        <div class="left">
-          <img src="__IMG__/user/mingzibianji.png" alt="">
+          <img src="__IMG__/xingbie2.png" alt="">
          <span>性别</span>
        </div>
        <a href="{:U('User/usersex')}" class="right"><if condition="$user['sex'] == 0">男<else/>女</if></a>
@ -138,6 +138,35 @@
      </div>
    </div>
  </div>
+  <!-- 底部导航 -->
+  <div class="foot_tabbar">
+    <div class="foot_tabbar_box">
+      <div class="foot_info ">
+        <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>active</if>">
+          <img src="__IMG__/new/shouye<if condition='CONTROLLER_NAME eq Index and ACTION_NAME eq index'>1</if>.png" alt="">
+          <span>首页</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/introduce')}" class="<if condition='ACTION_NAME eq introduce'>active</if>">
+          <img src="__IMG__/new/qiyechaxun<if condition='ACTION_NAME eq introduce'>1</if>.png" alt="">
+          <span>企业简介</span></a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('Index/business')}" class="<if condition='ACTION_NAME eq business'>active</if>">
+          <img src="__IMG__/new/hezuo<if condition='ACTION_NAME eq business'>1</if>.png" alt="">
+          <span>招商合作</span>
+        </a>
+      </div>
+      <div class="foot_info ">
+        <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>active</if>">
+          <img src="__IMG__/new/geren<if condition='CONTROLLER_NAME eq User'>1</if>.png" alt="">
+          <span>我的</span>
+        </a>
+      </div>
+    </div>
+  </div>
+

  <div class="popmsg pop-dialog" style="font-size: .28rem;"></div>
 </body>
--- a/Application/Mobile/View/User/usersex.html
+++ b/Application/Mobile/View/User/usersex.html
@ -1,39 +1,62 @@
-<extend name="Public/bases" />
-<block name="body" >
-  <link href="__CSS__/user.css" rel="stylesheet" >
-  <body class="">
-    <header class="header">
-      <div class="">
-        <a href="{:U('User/userset')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-        <h1 class="caption">修改性别</h1>
-        <a href="javascript:;" class="hbtn addbtn jssubmit">保存</a>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>修改性别</title>
+    <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__/foot_tabbar.css">
+    <link rel="stylesheet" type="text/css" href="__CSS__/step1.css">
+    <link href="__CSS__/common.css" rel="stylesheet" >
+    <link rel="stylesheet" type="text/css" href="__CSS__/gender.css">
+    <style>
+        body {
+            background: white;
+        }
+    </style>
+</head>
+<body>
+
+
+<div class="name">
+    <!-- 子页公共头部 -->
+    <div class="subpage-heard">修改性别
+        <a href="javascript:window.history.go(-1);" class="arrows"></a>
+    </div>
+
+    <form action="" id="form">
+    <div class="gender-info">
+        <div class="gender-input">
+            <div class="gender-inputBox">
+                <img src="__IMG__/xingbie2.png" alt="">
+                <div>性别</div>
+            </div>
+            <div class="gender-sel">
+                <div class="radio">
+                    <span>男</span>
+                    <input id="radio-1" name="sex" type="radio" value="0" class="<if condition='$sex == 0'>on</if>" checked>
+                    <label for="radio-1" class="radio-label"></label>
+                </div>
+
+                <div class="radio">
+                    <span>女</span>
+                    <input id="radio-2" name="sex" type="radio" value="1" class="<if condition='$sex == 1'>on</if>">
+                    <label  for="radio-2" class="radio-label"></label>
+                </div>
+            </div>
        </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
-        <form id='form' action="" method="post" class="">
-          <div class="t-table user-auth-list">
-            <ul class="table clearfix">
-              <li class="table-row">
-                <span class="table-cell">性别</span>
-                <span class="table-cell">
-                  <label class="input-radio">
-                    <input type="radio" name="sex" class="radio sex <if condition='$sex == 0'>on</if>" value="0" checked><i class="iconfont icon-male"></i><span>男</span>
-                  </label>
-                  <label class="input-radio">
-                    <input type="radio" name="sex" class="radio sex <if condition='$sex == 1'>on</if>"  value="1"><i class="iconfont icon-female"></i><span>女</span>
-                  </label>
-                </span>
-              </li>
-            </ul>
    </div>
    </form>
-      </section>
-    </section>
-    <div class="popmsg pop-dialog"></div>
-    <script src="__JS__/pop.lwx.min.js"></script>
-    <script>
+
+    <div class="save jssubmit">保存修改</div>
+</div>
+
+<div class="popmsg pop-dialog"></div>
+<script src="__JS__/pop.lwx.min.js"></script>
+<script>
    $(function() {
        $('input[name=sex]').click(function() {
            var that = $(this);
@ -64,7 +87,8 @@
                }
            })
        });
+
    });
-    </script>
-  </body>
-</block>
+</script>
+</body>
+</html>
--- a/Data/update.sql
+++ b/Data/update.sql
@ -524,7 +524,26 @@ CREATE TABLE `tab_user_play_data_count` (
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;

 ALTER TABLE `tab_user_play_data_count`
-ADD INDEX `search`(`game_id`, `server_id`, `role_id`) USING BTREE,
+ADD INDEX `search`(`game_id`, `server_id`, `role_id`, `create_time`) USING BTREE,
 ADD INDEX `create_time`(`create_time`) USING BTREE;
 ADD INDEX `recharge_cost`(`recharge_cost`) USING BTREE,
 ADD INDEX `recharge_count`(`recharge_count`) USING BTREE;
+
+--身份证认证信息
+CREATE TABLE `tab_idcard_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(80) NOT NULL COMMENT '姓名',
+  `id_card` varchar(20) NOT NULL COMMENT '身份证号码',
+  `user_id` int(11) NOT NULL COMMENT '用户id',
+  `ip` varchar(40) DEFAULT '0' COMMENT 'ip地址',
+  `num` int(11) DEFAULT '1' COMMENT '认证次数',
+  `status` tinyint(2) DEFAULT '0' COMMENT '0 认证失败 1 认证成功',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='身份证认证信息';
+
+--提现表添加最后更新时间
+ALTER TABLE `tab_withdraw`
+ADD COLUMN `last_up_update_time` int(10) NOT NULL DEFAULT 0 COMMENT '最后更新时间',
+ADD COLUMN `spend_ids` longtext NOT NULL COMMENT '充值订单id';
+
--- a/Public/Media/css/index.css
+++ b/Public/Media/css/index.css
@ -55,6 +55,7 @@
    top: 4.23rem;
    width: 2.70rem;
    height: 3.70rem;
+    z-index: 9;
 }
 .side_tabbar img{
    width: 100%;
--- a/Public/Media/images/index_about/qrcode.png
+++ b/Public/Media/images/index_about/qrcode.png
--- a/Public/Media/js/recharge.js
+++ b/Public/Media/js/recharge.js
@ -1,4 +1,5 @@
 $(function() {
+
   //钱的数量选择
    $(".select-box-soon>div:not(.price-input)").click(function(){
       $(this).addClass("selectBg").siblings("div").removeClass("selectBg");
@ -22,7 +23,7 @@ $(function() {
        $(".way-show>div>span").text(way);
        $("#apitype").val($(this).data('type'));
    });
-
+    $(".way-select>div").eq(0).trigger('click');
    $(".recharge-btn").click(function () {
        var that = $('#recharge_form');
        if($.trim($("#toaccount2").val()).length == 0){
--- a/Public/Mobile/css/business.css
+++ b/Public/Mobile/css/business.css
@ -35,7 +35,7 @@ body{
    margin-top: 0.5rem;
    font-size: 0.24rem;
    font-family:PingFang SC;
-    font-weight:bold;
+    font-weight:500;
    color:rgba(41,41,41,1);
    line-height:0.4rem;
    text-indent: 2em;
@ -43,12 +43,13 @@ body{
 .bazaar{
    margin-top: 0.34rem;
    font-family:PingFang SC;
-    font-weight:bold;
+    font-weight:500;
    color:rgba(41,41,41,1);
    font-size: 0.24rem;
 }
 .bazaar .title{
    font-size:0.32rem;
+    font-weight: 700;
 }
 .bazaar .info{
    font-size:0.24rem;
--- a/Public/Mobile/css/common.css
+++ b/Public/Mobile/css/common.css
@ -445,15 +445,18 @@ share_icon
 	height:100vh;
 }
 .pop-dialog span {
-	background:rgba(0,0,0,.6);
-	top:50%;
-	color:#FFF;
-	display:inline-block;
-	line-height:2;
-	position:relative;
-	padding:.5rem 2rem;
-	word-break:break-all;
-	max-width:60vw;border-radius: 5px;
+	background: rgba(0,0,0,.6);
+	top: 50%;
+	color: #FFF;
+	display: inline-block;
+	line-height: 2;
+	position: relative;
+	word-break: break-all;
+	max-width: 2rem;
+	font-size: 0.32rem;
+	border-radius: 5px;
+	display: block;
+	margin: auto;
 }
 .pop-table {
 	display:table;
--- a/Public/Mobile/css/enterprise.css
+++ b/Public/Mobile/css/enterprise.css
@ -35,7 +35,7 @@ body{
    margin-top: 0.5rem;
    font-size: 0.24rem;
    font-family:PingFang SC;
-    font-weight:bold;
+    font-weight: 500;
    color:rgba(41,41,41,1);
    line-height:0.4rem;
 }
@ -45,7 +45,7 @@ body{
 }
 .introduce>div:last-child{
    font-family:"宋体";
-    font-weight:bold;
+    font-weight:700;
    color:#389AED;
    margin-bottom: 1rem;
    font-style: oblique;
--- a/Public/Mobile/css/gender.css
+++ b/Public/Mobile/css/gender.css
@ -0,0 +1,90 @@
+.gender-info{
+    width: 100%;
+}
+.gender-input {
+    padding: 0.15rem 0.3rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #F5F5F5;
+    height: 0.78rem;
+}
+.gender-inputBox {
+    display: flex;
+    align-items: center;
+    font-size:0.28rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(41,41,41,1)
+}
+.gender-inputBox>img{
+    width: 0.3rem;
+    height: 0.3rem;
+    margin-right: 0.23rem;
+}
+.gender-sel{
+    display: flex;
+    align-items: center;
+}
+.radio {
+    color: #292929;
+    font-size: 0.28rem;
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    margin-left: 0.82rem;
+  }
+  .radio>span{
+      margin-right: 0.2rem;
+  }
+  .radio input[type="radio"] {
+    position: absolute;
+    opacity: 0;
+  }
+  .radio input[type="radio"] + .radio-label:before {
+    margin-top: 0.12rem;
+    content: '';
+    background: #f4f4f4;
+    border-radius: 100%;
+    border: 1px solid #b4b4b4;
+    display: inline-block;
+    width: 0.28rem;
+    height: 0.28rem;
+    position: relative;
+    top: -0.2em;
+    /* margin-right: 1rem; */
+    vertical-align: top;
+    cursor: pointer;
+    text-align: center;
+    -webkit-transition: all 250ms ease;
+    transition: all 250ms ease;
+  }
+  .radio input[type="radio"]:checked + .radio-label:before {
+    background-color: #3197EE;
+    box-shadow: inset 0 0 0 4px #f4f4f4;
+  }
+  .radio input[type="radio"]:focus + .radio-label:before {
+    outline: none;
+    border-color: #3197EE;
+  }
+  .radio input[type="radio"]:disabled + .radio-label:before {
+    box-shadow: inset 0 0 0 4px #f4f4f4;
+    border-color: #b4b4b4;
+    background: #b4b4b4;
+  }
+  .radio input[type="radio"] + .radio-label:empty:before {
+    margin-right: 0;
+  }
+  .save{
+    width:5rem;
+    height:0.8rem;
+    background:rgba(33,177,235,1);
+    border-radius:0.4rem;
+    font-size:0.32rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(255,255,255,1);
+    line-height: 0.8rem;
+    text-align: center;
+    margin: 0.3rem auto 0 auto;
+}
--- a/Public/Mobile/css/home.css
+++ b/Public/Mobile/css/home.css
@ -56,7 +56,7 @@ body{
    height: 100%;
 }
 .swiper-pagination{
-   bottom: 6px !important;
+   bottom: 5px !important;
 }
 .swiper-pagination-bullet {
    width: 0.4rem;
@ -75,7 +75,7 @@ body{
    margin-top: 0.15rem;
    width: 100%;
    background-color: #fff;
-    height: 3.6rem;
+    height: 3.75rem;
 }
 .hot .hot_box{
    padding: 0.3rem;
@ -111,7 +111,7 @@ body{
    margin-top: 0.15rem;
    width: 100%;
    background-color: #fff;
-    height: 3.3rem;
+    height: 3.45rem;
    margin-bottom: 0.45rem;
 }
 .recharge_box{
--- a/Public/Mobile/css/my.css
+++ b/Public/Mobile/css/my.css
@ -128,21 +128,20 @@
    padding: 0.3rem 0.3rem 0.3rem 0.32rem;
    display: flex;
    align-items: center;
+    justify-content: space-between;
 }
 .platform_info .del{
-    font-size: 0.28rem;
+    font-size: 0.32rem;
    color: #292929;
 }
 .platform_info img{
    width: 0.3rem;
    height: 0.3rem;
-    margin-left: 0.15rem;
    margin-right: 0.68rem;
 }
 .platform_info .price{
    font-size: 0.4rem;
    color: #389AED;
-    margin-right: 1rem;
 }
 .platform_info .recharge{
    background: url(../images/new/selected.png) no-repeat;
--- a/Public/Mobile/css/myBag.css
+++ b/Public/Mobile/css/myBag.css
@ -15,11 +15,15 @@
 .not-play>img{
    width: 3rem;
    height: 2.1rem;
+    position: relative;
+    bottom: 100px;
 }
 .not-play>span{
    font-size: 0.28rem;
    margin-top: 0.28rem;
    color: #A9A9A9;
+    position: relative;
+    bottom: 100px;
 }
 .myBag-box{
    margin-top: 0.3rem;
@ -27,7 +31,6 @@
 }
 .myBag-info{
    width: 100%;
-    height: 3.6rem;
    background:rgba(255,255,255,1);
    box-shadow:0px 0px 0.1rem 0px rgba(0, 0, 0, 0.15);
    border-radius:0.2rem;
--- a/Public/Mobile/css/name.css
+++ b/Public/Mobile/css/name.css
@ -0,0 +1,48 @@
+.name-info{
+    width: 100%;
+}
+.name-input {
+    padding: 0.15rem 0.3rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #F5F5F5;
+    height: 0.78rem;
+}
+.name-inputBox {
+    display: flex;
+    align-items: center;
+    font-size:0.28rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(41,41,41,1)
+}
+.name-inputBox>img{
+    width: 0.3rem;
+    height: 0.3rem;
+    margin-right: 0.23rem;
+}
+.name-input>input{
+    font-size:0.28rem;
+    font-family:PingFang SC;
+    font-weight:400;
+    color:rgba(169,169,169,1);
+    outline: 0;
+    border: 0;
+    height: 0.5rem;
+    width: 4rem;
+    text-align: right;
+}
+.save{
+    width:5rem;
+    height:0.8rem;
+    background:rgba(33,177,235,1);
+    border-radius:0.4rem;
+    font-size:0.32rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(255,255,255,1);
+    line-height: 0.8rem;
+    text-align: center;
+    margin: 0.3rem auto 0 auto;
+}
--- a/Public/Mobile/css/recharge.css
+++ b/Public/Mobile/css/recharge.css
@ -64,7 +64,7 @@
    display: flex;
    align-items: center;
    justify-content: space-between;
-    border-bottom: 1px solid #F5F5F5;
+    /*border-bottom: 1px solid #F5F5F5;*/
 }
 .flat-info>span{
    font-size:0.24rem;
@ -98,12 +98,13 @@
    color: #A9A9A9;
 }
 .recharge-payment{
-    margin-top: 0.15rem;
+    margin-top: 0.3rem;
    width: 6.9rem;
    height: 3.76rem;
    background:rgba(255,255,255,1);
    box-shadow:0px 0px 0.1rem 0px rgba(26,26,26,0.15);
    border-radius:0.2rem;
+    margin-left: 0.1rem;
 }
 .recharge-payment .title{
    padding: 0.32rem 0.29rem;
--- a/Public/Mobile/css/remove.css
+++ b/Public/Mobile/css/remove.css
@ -0,0 +1,61 @@
+.remove-info{
+    width: 100%;
+}
+.remove-input {
+    padding: 0.15rem 0.3rem;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid #F5F5F5;
+    height: 0.78rem;
+    font-size: 0.28rem;
+}
+.remove-inputBox {
+    display: flex;
+    align-items: center;
+    font-size:0.28rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(41,41,41,1)
+}
+.remove-inputBox>img{
+    width: 0.3rem;
+    height: 0.3rem;
+    margin-right: 0.23rem;
+}
+.remove-inputBox>input{
+    width: 1.8rem;
+    height: 0.5rem;
+    border: 0;
+    outline: 0;
+    padding: 0;
+    font-size: 0.28rem;
+    margin-left: 0.33rem;
+}
+.code{
+    width:1.84rem;
+    height:0.6rem;
+    background:rgba(33,177,235,1);
+    border-radius:0.3rem;
+    font-size:0.15rem;
+    font-family:PingFang SC;
+    font-weight:400;
+    color:rgba(255,255,255,1);
+    text-align: center;
+    line-height: 0.6rem;
+}
+
+.save{
+    width:5rem;
+    height:0.8rem;
+    background:rgba(33,177,235,1);
+    border-radius:0.4rem;
+    font-size:0.32rem;
+    font-family:PingFang SC;
+    font-weight:500;
+    color:rgba(255,255,255,1);
+    line-height: 0.8rem;
+    text-align: center;
+    margin: 0.3rem auto 0 auto;
+    margin-bottom: 10px;
+}
--- a/Public/Mobile/css/reset.css
+++ b/Public/Mobile/css/reset.css
@ -30,7 +30,7 @@ h1,h2,h3,h4,h5,h6,span,strong,i{font-size:100%;font-weight:normal;margin: 0;padd
 /* 子页公共头部 */

 .subpage-heard{
-	padding:0.7rem 0.3rem 0.28rem;
+	padding:0.7rem 0 0.28rem 0;
 	display: flex;
 	align-items: center;
 	justify-content: center;
@ -46,7 +46,7 @@ h1,h2,h3,h4,h5,h6,span,strong,i{font-size:100%;font-weight:normal;margin: 0;padd
 	flex-direction: row;
 	align-items: center;
 	top: 0.92rem;
-	left: 0.3rem;
+	left: 0.1rem;
  }
 .arrows::after{
 	position: absolute;
--- a/Public/Mobile/css/step1.css
+++ b/Public/Mobile/css/step1.css
@ -108,7 +108,7 @@
    margin-right: 0;
  }
  .login-btn{
-    margin-top: 0.38rem;
+    margin-top: 0.6rem;
    width: 5.5rem;
    height: 0.8rem;
    background-color: #389AED;
--- a/Public/Mobile/css/user/myPlay.css
+++ b/Public/Mobile/css/user/myPlay.css
@ -14,11 +14,15 @@
 .not-play>img{
    width: 3rem;
    height: 2.1rem;
+    position: relative;
+    bottom: 100px;
 }
 .not-play>span{
    font-size: 0.28rem;
    margin-top: 0.28rem;
    color: #A9A9A9;
+    position: relative;
+    bottom: 100px;
 }
 .myPlay-box{
    padding: 0 0.3rem;
--- a/Public/Mobile/css/user/setting.css
+++ b/Public/Mobile/css/user/setting.css
@ -4,7 +4,6 @@ body{ background-color: #F5F5F5;}
    font-family:PingFang SC;
 }
 .setting-box{
-    margin-top: 0.2rem;
    background-color: #fff;
 }
 .setting-info{
--- a/Public/Mobile/images/haoma.png
+++ b/Public/Mobile/images/haoma.png
--- a/Public/Mobile/images/mingzibianji.png
+++ b/Public/Mobile/images/mingzibianji.png
--- a/Public/Mobile/images/shimingrenzhengmoren.png
+++ b/Public/Mobile/images/shimingrenzhengmoren.png
--- a/Public/Mobile/images/shouji.png
+++ b/Public/Mobile/images/shouji.png
--- a/Public/Mobile/images/shoujibangding.png
+++ b/Public/Mobile/images/shoujibangding.png
--- a/Public/Mobile/images/user/shoujibangding.png
+++ b/Public/Mobile/images/user/shoujibangding.png
--- a/Public/Mobile/images/user/xingbie.png
+++ b/Public/Mobile/images/user/xingbie.png
--- a/Public/Mobile/images/xingbie2.png
+++ b/Public/Mobile/images/xingbie2.png
--- a/Public/Mobile/images/xiugaimima.png
+++ b/Public/Mobile/images/xiugaimima.png