2018 Commits (2fb77092cf6dab79c77f8e024273bfb02a8df1f6)

Author SHA1 Message Date
chenxiaojun 820f80f066 ios13.1 5 years ago
chenxiaojun acf2ff1310 ios13.1 5 years ago
zhengyongxing ad8dd94e32 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
liaojinling d5dc2396f2 修改 5 years ago
liaojinling ca4f1954e4 修改bug 5 years ago
liaojinling 1204b1a0e8 修改 5 years ago
liaojinling 3cfce8675e 修改每分钟打包数量 5 years ago
liaojinling 5b743b5455 修改 5 years ago
liaojinling 9a25fd0a04 修改bug 5 years ago
liaojinling fe6dd1ddff 改成旧的打包方式 5 years ago
chenxiaojun 1fc9f3b6b2 手机注册 5 years ago
chenxiaojun ce01823c6b 日志 5 years ago
chenxiaojun ca8c4e331f 手机注册 5 years ago
chenxiaojun f9b9694a4a 日志 5 years ago
chenxiaojun 1e534d8c5e 手机注册 5 years ago
chenxiaojun 28cd4aeeda 日志 5 years ago
chenxiaojun 676ab5dcd2 手机注册 5 years ago
chenxiaojun c384a88c48 手机注册 5 years ago
chenxiaojun 3754e5504a 手机注册 5 years ago
chenzhi 5413551650 优化官网支付 5 years ago
chenzhi 777a7c8344 官网支付结果优化 5 years ago
chenzhi 98249f462a 优化官网支付 5 years ago
zhengyongxing 55918dfc24 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 57ca1269d6 登录导出优化 5 years ago
liuweiwen 8d5297bd99 落地页 5 years ago
liuweiwen e834c37cb3 落地页 5 years ago
liuweiwen dd43bed0ee Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen ffadabf078 落地页 5 years ago
chenzhi 5d178571cc 优化官网支付显示 5 years ago
chenzhi b9ab5330c0 优化官网支付缩放问题 5 years ago
liuweiwen 8a7b1a9768 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenzhi 15ce00396f 优化官网支付 5 years ago
liuweiwen 43c1f7832a 落地页 5 years ago
chenxiaojun c91bab8bed 推广平台->游戏管理--自动复制修改 5 years ago
chenxiaojun 324e880056 推广平台->游戏管理--自动复制修改 5 years ago
zhengyongxing 56d3718c14 用户登录记录 5 years ago
liuweiwen b61587868b 上传广告图片 5 years ago
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常 5 years ago
liuweiwen 8fd70a94e7 落地页 5 years ago
liuweiwen f11150be0c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 9568f390ba 新版落地页 5 years ago
zhengyongxing 9e26a06ed2 统计bug修正 5 years ago
zhengyongxing e8477373ff 定时脚本bug 5 years ago
sunke b012ec2baf 增加合计下载 5 years ago
liuweiwen 3dddaf247d 后台还原游戏充值导出 5 years ago
liuweiwen 95d55a37d7 pc热门游戏显示从推荐改为热门 5 years ago
liuweiwen b764260647 后台上传官网附件 5 years ago
liuweiwen 790b49c95b Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 192ad84897 后台-》平台币充值导出时间 5 years ago
chenzhi 81e56063c7 优化取消补链提示 5 years ago
zhengyongxing 9abca632ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/Controller/ExportController.class.php
5 years ago
chenxiaojun 757526ea05 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
chenxiaojun ce86f56cc5 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 14f69c408e 登录记录导出 5 years ago
ELF c6ce82ab0e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF ef60ca85cf 修改 5 years ago
liuweiwen a150015972 pc官网 热门游戏,多款游戏全部显示 5 years ago
zhengyongxing fd15fde141 登录记录导出修改 5 years ago
liuweiwen a21f2c218c pc官网 官网】----【账户充值】点击家长监护/客服帮助,无反馈 5 years ago
liuweiwen bdc5d99f6e pc官网 客服中心,搜索框,字体异常 5 years ago
liuweiwen 935cb50c2b Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen b61fdf2e97 手机官网绑定手机页面发送验证码样式调整 5 years ago
chenzhi d64b627883 游戏充值新增文字说明 5 years ago
liuweiwen f33ad199f7 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen a71b46eb6f pc官网充值支付方式写死 5 years ago
ELF 8efc96c899 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF a91a5d5759 修改 5 years ago
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错 5 years ago
chenzhi 8b718c47c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ef25027213 补链新增切分时间 5 years ago
ELF 7dfaaa2740 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 128c11f5b8 修改 5 years ago
chenxiaojun cb88256e14 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
chenxiaojun b989f74605 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
chenxiaojun 3ef1c503cb 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
chenxiaojun 2515ee98eb 推广平台->数据管理->充值玩家--时间检索范围限制 5 years ago
chenxiaojun 1f52ff15ac 推广平台->数据管理->充值玩家--添加说明 5 years ago
chenxiaojun 375c9904af 推广平台->数据管理->充值玩家--添加说明 5 years ago
ELF bd01623520 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 895cd1e861 修改 5 years ago
chenzhi f09ee94952 优化补链参数 5 years ago
ELF 9009458057 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 25fa79ea55 修改玩家迁移 5 years ago
chenzhi dd22e6d0e9 修改补链in/out 5 years ago
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
sunke 0a7096623b 隐藏需求 5 years ago
ELF efd32351db 修改 5 years ago
ELF 901c2eb137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e1df740572 修改 5 years ago
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev 5 years ago
yulingwei 7a767466ef 锁号优化 5 years ago
zhengyongxing 34d424887d 绑定币 5 years ago
liuweiwen f3baedb948 删除换行 5 years ago
“用lww 88e5ec6db9 pc官网地图 5 years ago
zhengyongxing 1881d11d09 绑币收回修改 5 years ago
ELF 4fc5b08289 修改 5 years ago
chenzhi fb0170048f ssg回调测试结束 5 years ago
ELF 24c512a083 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 5737c714b1 修改 5 years ago
chenzhi f4cd306f94 ssg打印2 5 years ago
ELF cd060a42a4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3d3062dd8c OA 5 years ago
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi db6558bc76 ssg打印参数 5 years ago
zhanglingsheng 728f78db09 OA关联切换正式 5 years ago
ELF a69892850b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengchanglong 87ee527a01 平台币充值费率修改 5 years ago
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 793c1501ba 修改 5 years ago
sunke 99db894808 时间 5 years ago
chenxiaojun 6d487e341d 推广平台->游戏管理->专服管理|混服管理->我的游戏--名词解释修改 5 years ago
chenxiaojun 06ad29c552 推广平台->游戏管理->专服管理|混服管理->我的游戏--名词解释修改 5 years ago
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8f36f7204f 优化首页显示 5 years ago
sunke 9df85a49d4 测试资源 5 years ago
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新 5 years ago
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新 5 years ago
zhengyongxing 1caece3034 充值汇总修改,用户导出修改 5 years ago
chenzhi af593e4326 优化首页折线统计统计方式 5 years ago
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
zhanglingsheng ede4cdd96e 短信配置 5 years ago
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3f8168c11a 添加新短信 5 years ago
yulingwei 0965c480a3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei e8ed8f808b 修改修复脚本 5 years ago
zhengyongxing 7d70f856ce 用户玩家列表优化 5 years ago
chenzhi 8a7c6219ca 新需求 充值-游戏充值新增两个字段显示 5 years ago
ELF f251d4d1da Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 31a5971439 修改bug 5 years ago
sunke f2265a3cb7 起止时间 5 years ago
zhanglingsheng def0b2e374 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 864e2e5de1 OA 5 years ago
ELF 0e782cb98c 修改bug 5 years ago
ELF 3c909b4a57 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF b0c2193f68 调试 5 years ago
zhanglingsheng 104451ab10 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 473fd31be1 OA 5 years ago
ELF 3895d5b015 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 9a2ec81bec 修改 5 years ago
zhanglingsheng 86f05872d2 OA 5 years ago
yulingwei 82556627f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 4e56f9e325 更新 5 years ago
zhanglingsheng a900e5ed66 OA关联 5 years ago
chenzhi 4f1bd88dc2 取消首页速度测试 5 years ago
ELF b720644b02 修改 5 years ago
ELF 1f167778a7 调试 5 years ago
ELF 88385b2f87 调试 5 years ago
ELF 1e976d620b 调试 5 years ago
ELF b08c7748c9 调试 5 years ago
ELF d1833dc406 调试 5 years ago
ELF a0acd65859 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 494098abc1 修改分包 5 years ago
chenzhi b610845d20 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 4af962e5a6 首页测试 5 years ago
zhengyongxing 6dee3f5939 平台币统计导出 5 years ago
zhengyongxing 93043b3abe 平台统计导出 5 years ago
zhengyongxing 96df83ebfb Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
sunke 02dcfbc77e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
sunke 13e8c81342 渠道提交方式 5 years ago
chenzhi fa82decb46 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 1e1ddfafb8 [bug]修改推广后台平台币充值手续费 5 years ago
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改 5 years ago
sunke 0644f66520 游戏game_id 5 years ago
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取 5 years ago
chenxiaojun 41e976e9da 推广平台->数据管理->充值玩家|团队/推广员业绩--检索bug修复 5 years ago
chenxiaojun 611d13c1c6 推广平台->数据管理->充值玩家|团队/推广员业绩--检索bug修复 5 years ago
sunke 918a487141 bug 5 years ago
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengyongxing 4e78370f14 推广员充值统计 5 years ago
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengchanglong d661c3154a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengchanglong 6d9abcc574 平台币充值费率修改 5 years ago
chenzhi 3cde3f0a12 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题 5 years ago
zhengyongxing 5a80070b97 推广后台导出修改 5 years ago
chenzhi 3500cce032 [bug]角色查询 区服不显示 5 years ago
chenzhi 9e0f9990d7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi bb09ef9005 [bug]角色查询区服不显示 5 years ago
zhengyongxing 2ae543ad7e 用户导出修改 5 years ago
zhanglingsheng 3e8cfab9d0 OA-关联-导出 5 years ago
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ceb50f20b6 优化用户列表数据 5 years ago
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng de3f6196e6 oa关联 5 years ago
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 507e579755 用户列表统计 5 years ago
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新 5 years ago
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新 5 years ago
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 086c95b826 用户导出修改 5 years ago
zhengyongxing 8f1d59aa39 平台币充值bug 5 years ago
yulingwei 501ed6c494 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei d8a59b5670 更新 5 years ago
sunke ebfd596a4d 订单初始化时间 5 years ago
sunke f0d28e81c4 导出数据 5 years ago
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新 5 years ago
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新 5 years ago
yulingwei c3955dceb8 更新脚本 5 years ago
yulingwei d95540c92c 登录日志修复脚本 5 years ago
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 3ee50bcfc0 upt 5 years ago
ELF 390f22894a 修改运维脚本 5 years ago
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 80b7142317 修改运维脚本 5 years ago
sunke b1e14f14f1 订单查询导出优化 5 years ago
yulingwei 7c3a3bc0c6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2ab47c0864 充值方式修改 5 years ago
sunke ccfcd2c7a3 backSuccessExport 5 years ago
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ce21545360 oa-关联 5 years ago
yulingwei c03fee5af6 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12fb156306 优化脚本 5 years ago
sunke 5b53fb6287 exit 5 years ago
yulingwei be33c5c471 更新 5 years ago
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei bcc0b964b0 upt 5 years ago
zhanglingsheng e9e66fa8a0 oa关联 5 years ago
zhanglingsheng 0a9efe02ca oa关联 5 years ago
elf@home 8d6c547468 支持分片文件上传 5 years ago
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4590988f95 oa 5 years ago
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei b9bc2a7162 更新 5 years ago
zhengyongxing 6fcdfd2f31 用户导出 5 years ago
zhengyongxing d45000e3cd Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengyongxing 777352f1bf 平台币充值bug 5 years ago
sunke 96bf61ada0 冲值玩家promoteid 5 years ago
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 1966e0a2e8 更新 5 years ago
zhengyongxing fc126c0bbf 平台币充值bug 5 years ago
zhengyongxing d6b50146ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenxiaojun 945250b01a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhengyongxing fb6177d187 平台币充值bug 5 years ago
chenxiaojun e49bce3deb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun b27e7e3854 更新 5 years ago
sunke 02ea000f2a charge 5 years ago
chenxiaojun ee095e3068 推广平台->游戏管理->充值玩家--调整 5 years ago
zhengchanglong 965ad46dce 充值汇总导出BUG修复 5 years ago
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 7a873a9d98 平台币发放bug修正 5 years ago
zhanglingsheng 668e4d097c 推广员oa关联 5 years ago
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4915ebc70c 推广员oa关联 5 years ago
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei ee7bb128c0 修复 5 years ago
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng dcd9791f79 推广员oa关联 5 years ago