elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,356 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '1c8f0d4464'
${ noResults }
Commit Graph

950 Commits (1c8f0d446454666560e337e806b0edfb3a8749bc)

Author SHA1 Message Date
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 5 years ago
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission 
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
 5 years ago
zhengyongxing 2b336dd560 数据文件删除 5 years ago
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
 5 years ago
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
 5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0 5 years ago
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 5df3a59df4 扶持发放添加导出功能 5 years ago
zhengyongxing 6f584f8323 数据权限功能提交 5 years ago
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
zhanglingsheng 6d2c4fc3a2 游戏充值预下单 5 years ago
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 62502f0732 游戏充值预下单 5 years ago
zhengyongxing e6c45bc494 推广补链导出修改 5 years ago
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww 
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
 5 years ago
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
 5 years ago
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链 5 years ago
zhengyongxing 8b2d04f986 管理后台新开发功能修改 5 years ago
zhengyongxing e2e685e8c3 管理后台新开发功能修改 5 years ago
chenzhi 60c7bdce34 新增补链时判断是否已结算 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 5 years ago
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 1010fe2674 推广补链新增查询条件 5 years ago
chenzhi 3d672db381 推广补链新增一系列查询条件 5 years ago
ELF c451921b92 后台添加IOS打包方式选择 5 years ago
zhanglingsheng f8498638ad 游戏充值行为日志 5 years ago
zhanglingsheng f392ad4de0 游戏充值行为日志 5 years ago
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi df50ce6352 补链csv导出 5 years ago
chenzhi 5359e67860 优化补链记录为ajax 5 years ago
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示 5 years ago
chenzhi f8cbe8d9ef 分开推广补链和补链记录 5 years ago
zhengyongxing fd187aa04f 白名单修改 5 years ago
chenzhi 70aab2f137 角色查询新增创角时间区间查询 5 years ago
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表 5 years ago
zhengyongxing fa393d9c90 管理后台新增功能添加 5 years ago
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
liuweiwen fb5d9afded 落地页视频上传和显示 5 years ago
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
 5 years ago
liuweiwen 522ba58a4d 推广公司 5 years ago
liuweiwen 59b1e3149e 管理后台-推广公司搜索 5 years ago
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi c2fb23f9a2 优化用户列表结束 5 years ago
chenzhi d948dee3df 用户列表优化3 5 years ago
chenzhi 20ff424e52 优化用户列表4 5 years ago
chenzhi 03a03fd61e 优化用户列表3 5 years ago
chenzhi d4968e4c72 优化推广员 5 years ago
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小 5 years ago
liuweiwen a7c5957201 推广公司管理 5 years ago
chenzhi 3f358bb818 优化用户列表2 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
chenzhi 4aa9ac6767 用户表优化1 5 years ago
liuweiwen d51725f1af 新增推广员时，新增推广所属公司 5 years ago
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改 5 years ago
zhengyongxing 30b3794ef4 管理后台导出数据bug修正 5 years ago
zhengyongxing 4f385a87c6 管理后台导出数据修改 5 years ago
zhengyongxing fbead8c3a1 推广补链导出修改 5 years ago
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi d48b0f1341 优化统计 5 years ago
zhengyongxing 65fd27fe36 导出修改 5 years ago
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
chenzhi dbc77d07e7 优化聚合排序 5 years ago
chenzhi cfa67f9e3e 总览统计结束 5 years ago
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev 5 years ago
zhengyongxing ba85fc8c76 游戏充值导出修正 5 years ago
chenzhi e1c29c73af 总览统计结束 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liuweiwen 6c529e7bbd 统计 5 years ago
chenzhi e763abbf92 123. 5 years ago
liuweiwen b4745a357c Merge branch 'dev' into dev_lww 5 years ago
chenzhi 68d23b469c 123 5 years ago
chenzhi 6bc0cdcf1e 123 5 years ago
zhengyongxing 059742043c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenxiaojun 7de0b54773 推广平台->数据管理->充值玩家--更新 5 years ago
chenxiaojun 781d6d408a 推广平台->数据管理->充值玩家--更新 5 years ago
ELF 8d3d0ad726 Merge branch 'master' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 4afe365e40 Merge branch 'hotfix/add_bans_type' 5 years ago
liuweiwen 56f2c422aa 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，（一句话简介）限制字数（最多30字） 5 years ago
chenxiaojun 536ee9627f 脚本：用户推广员数据刷新 5 years ago
chenxiaojun 845df466f6 脚本：用户推广员数据刷新 5 years ago
chenxiaojun 968bf2c067 脚本：用户推广员数据刷新 5 years ago
chenxiaojun 71df93a12f 推广平台->数据管理->充值玩家--更新 5 years ago
chenxiaojun 0ea1cf04ec 推广平台->数据管理-充值统计|财务管理-结算明细--合计 5 years ago
chenxiaojun a7c80b84c2 脚本：用户推广员数据刷新 5 years ago
chenxiaojun 167e056f9a 脚本：用户推广员数据刷新 5 years ago
chenxiaojun 014a0e2f34 脚本：用户推广员数据刷新 5 years ago
chenzhi 1c9ed4b2ba 优化统计 5 years ago
chenxiaojun 73ca6f1f3f 推广平台->数据管理->订单查询--更新 5 years ago
chenxiaojun 83267e230a 推广平台->数据管理->数据管理->订单查询--更新 5 years ago
chenxiaojun 6cce4d7e05 推广平台->数据管理->订单查询--更新 5 years ago
chenxiaojun 1af46a74ee 推广平台->数据管理->数据管理->订单查询--更新 5 years ago
liuweiwen 466153f51a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 16d91ec2ee 后台游戏评分限制 5 years ago
chenzhi 9962366ab9 暂存修改 5 years ago
zhengyongxing 2cc68f3086 Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev 
 Conflicts:
	Application/Admin/Controller/StatController.class.php
 5 years ago
zhengyongxing 245e07fc3f 设备统计脚本bug修正 5 years ago
chenzhi c178de254b 合并dev 5 years ago
chenzhi ce20d48d57 总览-推广员聚合及展示 5 years ago
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev 5 years ago
ELF f3f497a21d Merge branch 'hotfix/oldpack' into dev 5 years ago
yulingwei fa9d40f87a 新增风控标识 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 3cfce8675e 修改每分钟打包数量 5 years ago
zhengyongxing 57ca1269d6 登录导出优化 5 years ago
chenzhi ae03347437 123 5 years ago
chenzhi 74ff06d549 优化首页折现统计数据 5 years ago
zhengyongxing 56d3718c14 用户登录记录 5 years ago
liuweiwen b61587868b 上传广告图片 5 years ago
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常 5 years ago
zhengyongxing 9e26a06ed2 统计bug修正 5 years ago
zhengyongxing e8477373ff 定时脚本bug 5 years ago
liuweiwen 3dddaf247d 后台还原游戏充值导出 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
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 14f69c408e 登录记录导出 5 years ago
zhengyongxing fd15fde141 登录记录导出修改 5 years ago
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错 5 years ago
chenzhi f09ee94952 优化补链参数 5 years ago
chenzhi dd22e6d0e9 修改补链in/out 5 years ago
chenzhi 1d4c1accde 123 5 years ago
liuweiwen 6ca5b80d18 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
yulingwei 7a767466ef 锁号优化 5 years ago
zhengyongxing 1881d11d09 绑币收回修改 5 years ago
ELF 5737c714b1 修改 5 years ago
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 728f78db09 OA关联切换正式 5 years ago
“用lww 2eadac6b53 后台-》统计-》流失分析优化 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
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8f36f7204f 优化首页显示 5 years ago
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新 5 years ago
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新 5 years ago
chenzhi 31fa9fe1f1 123 5 years ago
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 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 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
zhanglingsheng 864e2e5de1 OA 5 years ago
chenzhi cd9363f9fe 优化游戏及推广员统计 5 years ago
“用lww 68b75f258c 后台-》统计-》流失分析优化 5 years ago
zhanglingsheng 473fd31be1 OA 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
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
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改 5 years ago
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取 5 years ago
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengyongxing 4e78370f14 推广员充值统计 5 years ago
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复 5 years ago
zhengyongxing 5a80070b97 推广后台导出修改 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 d8a59b5670 更新 5 years ago
chenzhi 63c27e62ca 123 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
chenzhi 9e171f2ce2 优化统计 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 12fb156306 优化脚本 5 years ago
chenzhi e27cdc8a38 优化所有统计 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
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
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
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 4915ebc70c 推广员oa关联 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
zhengyongxing ee65c37cb1 用户筛选条件修正 5 years ago
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整 5 years ago
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整 
自动脚本->玩家角色充值数据统计--调整
 5 years ago
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhengyongxing 6e151dd8a4 用户导出修改 5 years ago
zhengyongxing 30b5e6ed46 用户玩家列表导出优化 5 years ago
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
yulingwei 9a3bb4e170 修复排序问题 5 years ago
yulingwei b1902e5592 更新 5 years ago
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 466dd6cc93 upt 5 years ago
zhengyongxing c73ce833f4 用户导出修正 5 years ago
sunke 1d2ce27736 登陆日志排除下线日志 5 years ago
zhengyongxing cc4a071194 用户信息大数据量导出错误 5 years ago
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计 5 years ago
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
“用lww f75188f952 后台导出功能增加内存限制到512M 5 years ago
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计 5 years ago
“用lww e1b93a987b 导出数据过大，配置加大内存限制范围 5 years ago
yulingwei 4071341458 更新 5 years ago
yulingwei 090d1e2f69 更新bug 5 years ago
tpingzhang a0ab440e1a 后台防沉迷配置 5 years ago
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
tpingzhang f9307ee710 后台防沉迷配置 5 years ago
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8bb10aea61 [bug]玩家列表累计充值 5 years ago
tpingzhang 704dd789eb 后台防沉迷配置 5 years ago
tpingzhang da794baa96 配置写到数据库 5 years ago
tpingzhang d176d51c5c 配置写到数据库 5 years ago
elf@home dc6790b404 修改 5 years ago
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录 5 years ago
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 200d9e8667 修改bug 5 years ago
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框 5 years ago
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12362190e6 upt 5 years ago
chenzhi 86b53d375c [新增]玩家列表汇总统计 5 years ago
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing ae18f1fb24 推广员统计修改 5 years ago
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计 5 years ago
zhengyongxing 8e18e8faac 推广员统计官方渠道添加 5 years ago
chenxiaojun 5fcad13fce 根据时间统计玩家充值 5 years ago
chenxiaojun 2123b29479 根据时间统计玩家充值 5 years ago
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题 5 years ago
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 849fd77ac6 优化推广员统计的方法 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
 5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新 5 years ago
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei feecf9199d 电子邮箱改为选填 5 years ago
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e2a2a07f03 修改bug 5 years ago
chenzhi 8af46f08c2 优化推广员统计1 5 years ago
zhengchanglong 387be649de Merge branch 'dev-cz' into dev 5 years ago
chenzhi 256545a59a 123 5 years ago
zhengyongxing 5c97bb7610 数据分析bug修正 5 years ago
zhengyongxing db40381bb1 定时器接口时间区间修正 5 years ago
zhengyongxing 4f27c2fb29 统计bug修正 5 years ago
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl 5 years ago
zhengyongxing 08b2ba432a 统计数据修正 5 years ago
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev 
# Conflicts:
#	Data/update.sql
 5 years ago
chenzhi df03c05651 修正统计bug 5 years ago
zhengyongxing 118f706440 脚本去除部分输出 5 years ago
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
 5 years ago
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
 5 years ago
chenzhi 2a417c2746 123 5 years ago
ELF 2254610041 修改bug 5 years ago
zhanglingsheng fb85d32c87 合并分支 5 years ago
yulingwei 38680ddb05 更新 5 years ago
zhengyongxing 1626123074 数据统计7日平均时长修正 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化 5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
chenzhi a6f52ccdb8 优化注册管理员提示信息 5 years ago
chenzhi 360cf3f3ba 优化前端展示 5 years ago
chenzhi 04c5f17790 优化脚本 5 years ago
chenzhi 37d8f72c6d 优化首页展示 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
chenzhi e1739209e3 1 5 years ago
chenzhi 521a343fc3 123 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 94cc0bacbf SDK菜单链接修改 5 years ago
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2e0a8d2ad0 更新统计数据 5 years ago
zhanglingsheng 3453de757f sdk菜单配置修改 5 years ago
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei a7f6d8b7a4 upt 5 years ago
elf@home 06486d458c 修改bug 5 years ago
elf@home 1036589f3b 修改代码 5 years ago
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化 5 years ago
chenxiaojun 83e8427c8b cs 5 years ago
ELF 1c11622eb2 修改bug 5 years ago
ELF b0b0056c43 修改bug 5 years ago
ELF e942f378c6 修改bug 5 years ago
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng fb0808445f 悬浮球加类型 5 years ago
sunke 1f34a3a0ce 平台币明细，sdk菜单图片上传 5 years ago
yulingwei 44954031bf upt 5 years ago
yulingwei 0d258c1d8d upt 5 years ago
ELF e2d75ec2c6 修改推广后台首页 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例 
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF 784de48bf9 修改bug 5 years ago
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF afb6de56f8 添加3级变四级脚本 5 years ago
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新 5 years ago
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev 5 years ago
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 3f1b2d34c2 upt 5 years ago
zyx 68e57ab1f5 导出链路问题修正 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
ELF f03fec9e43 Merge branch 'feature/promote' into dev 5 years ago
jbrazz e57dfd3fae 修改设备号查询 5 years ago
jbrazz f4a46335ca upt 5 years ago