diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index bcb506d46..c76087014 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -596,4 +596,13 @@ function encryptStr($str) { $stars_str = $stars_str."*"; } return substr_replace($str, $stars_str, 3, $length-6); +} + +function encryptIdCard($str) { + $length = strlen($str); + $stars_str = ""; + if($length>=4){ + $stars_str = "****"; + } + return substr_replace($str, $stars_str, $length-4, 4); } \ No newline at end of file diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 7ed604212..fbc566287 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -51,6 +51,12 @@ class BehaviorLogController extends ThinkController } } $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); + + foreach($data as $k => $v) { + if(empty($v['extend'])) { + $data[$k]['extend'] = $v['order_id']; + } + } $count = M('pay_info', 'tab_')->where($map)->count(); $page = set_pagination($count, $row); if ($page) { diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index eda60dbf7..2e6b1472d 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -6981,5 +6981,84 @@ if ($key == 'model'){ return $data; } + /** + * 推广补链 + * @author 鹿文学 + */ + public function Support_list() { + + $xlsName = $_REQUEST['xlsname']; + + $model = M('user','tab_'); + + $xlsCell = array( + '一级渠道','玩家账号','游戏名称','区服','角色名','申请额度','扶持类型','备注','申请时间','可用额度','实际发放额度','状态' + ); + + if(I('promote_id')){ + $map['promote_id']=I('promote_id'); + } + if(I('game_id')){ + $map['game_id']=I('game_id'); + } + if(!empty(I('apply_type')) || I('apply_type')==='0'){ + $map['apply_type']=I('apply_type'); + } + // + if(!empty(I('apply_status')) || I('apply_status')==='0'){ + $map['apply_status']=I('apply_status'); + } + + $csvFileName = $xlsName.'.csv'; + //设置好告诉浏览器要下载excel文件的headers + header('Content-Description: File Transfer'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment; filename="'. $csvFileName .'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + $fp = fopen('php://output', 'a');//打开output流 + mb_convert_variables('GBK', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 + + $accessNum=M('test_resource','tab_')->where($map)->count(); + $perSize = 5000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + + for($i = 1; $i <= $pages; $i++) { + /* 获取频道列表 */ + $xlsData = M('test_resource','tab_') + ->field('promote_account,user_account,game_name,server_name,role_name, + apply_resource,apply_type,apply_remark,create_time,id as max_quota,verify_resource,apply_status') + ->where($map) + ->order('id desc') + ->select(); + + foreach($xlsData as $key => $value) { + + $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']); + $value['max_quota'] = max_quota($value['game_id'],$value['promote_id']); + $value['apply_type'] = $value['apply_type']==0?'新增扶持':'后续扶持'; + if($value['apply_status'] == 1) { + $value['apply_status'] = '拒绝'; + } else if ($value['apply_status'] == 2) { + $value['apply_status'] = '通过'; + } else { + $value['apply_status'] = '待审核'; + } + + mb_convert_variables('GBK', 'UTF-8', $value); + fputcsv($fp, $value); + + } + unset($xlsData);//释放变量的内存 + //刷新输出缓冲到浏览器 + ob_flush(); + flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 + } + fclose($fp); + exit(); + + } } diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html index d919416fe..50f4cca3e 100644 --- a/Application/Admin/View/Member/edit.html +++ b/Application/Admin/View/Member/edit.html @@ -113,7 +113,7 @@ 身份证号 - + 点击修改 diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index a9acb9286..2d88c9f05 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -119,7 +119,7 @@ @@ -475,12 +475,14 @@ $(function(){ }) var game_server = "{:I('server_name')}"; $("#game_type").change(function(){ + console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}) $.ajax({ url:"{:U('Ajax/getGmeServer')}", type:"post", data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ str += "" diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index 344fc096d..8c82c84d7 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -170,6 +170,7 @@
+ 导出 {$_page|default=''}
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 31add93cd..7323eb952 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1897,7 +1897,6 @@ class QueryController extends BaseController $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account']; } } - $games = get_promote_serach_game(); $this->assign('games', $games); diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 30619db53..494a43ef9 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -80,11 +80,6 @@ var videoWidth = $('.video-js').width(); $('.video-js').height(videoWidth * 0.562295082); - var myPlayer = videojs('example_video_1'); - myPlayer.ready(function(){ - this.play(); - }); - $('.down-link').on('click', function () { var dow_status = parseInt($('#dow_status').val()); if (dow_status == 0) { @@ -94,6 +89,7 @@ if ($('.bn-rule').length > 0) { $('.bn-rule').css('display','block') $('.bn-rule').css('z-index','12') + $('video').hide(); return } if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) { diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index c2429deb3..5fedd4150 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -21,6 +21,9 @@ .trunk-search .select-time .txt { width: 100px; } + .title-cursor-pointer { + cursor: pointer; + } @@ -95,13 +98,13 @@
- - - - - - - + + + + + + - - - - - - - + + diff --git a/Data/update.sql b/Data/update.sql index a2e574e6b..292053b26 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -686,7 +686,7 @@ CREATE TABLE `tab_server_union` ( KEY `create_time` (`create_time`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表'; --- 用户行为 +-- 用户行为 tping ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号'; ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称'; ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称'; @@ -703,6 +703,11 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`, ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`; +-- 苹果内购 tping +ALTER TABLE `tab_spend_distinction` +MODIFY COLUMN `extend` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '通知游戏方扩展(一般是游戏方透传)' AFTER `game_name`; + + -- 菜单(游戏充值预下单) INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);
玩家账号游戏名称平台游戏区服角色名等级充值总额 + 玩家账号游戏名称平台游戏区服角色名等级充值总额 @@ -112,7 +115,7 @@ 充值次数 + 充值次数 @@ -123,7 +126,7 @@ 昨日充值 + 昨日充值 @@ -134,7 +137,7 @@ 未登录天数 + 未登录天数 @@ -145,7 +148,7 @@ 游戏累计登录天数 + 游戏累计登录天数 @@ -156,7 +159,7 @@ 注册时间 + 注册时间 @@ -167,8 +170,8 @@ 最后登录时间推广员账号最后登录时间推广员账号

暂无数据