Commit Graph

585 Commits (25fa79ea5557b01ef77b7fea96bd8a954a3e001a)

Author SHA1 Message Date
zhanglingsheng 4915ebc70c 推广员oa关联
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei ee7bb128c0 修复
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng dcd9791f79 推广员oa关联
zhengyongxing ee65c37cb1 用户筛选条件修正
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng e59352edbf 推广员oa关联
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整
自动脚本->玩家角色充值数据统计--调整
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 988bf99086 ss
zhengyongxing 6e151dd8a4 用户导出修改
zhengyongxing 30b5e6ed46 用户玩家列表导出优化
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng c4e2d0a245 推广员OA关联
yulingwei 9a3bb4e170 修复排序问题
yulingwei b1902e5592 更新
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 466dd6cc93 upt
zhengyongxing c73ce833f4 用户导出修正
sunke 1d2ce27736 登陆日志排除下线日志
zhengyongxing cc4a071194 用户信息大数据量导出错误
chenzhi b52113622d [bug]无法获取上线推广员问题
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev
“用lww f75188f952 后台导出功能增加内存限制到512M
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计
“用lww e1b93a987b 导出数据过大,配置加大内存限制范围
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
tpingzhang a0ab440e1a 后台防沉迷配置
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang f9307ee710 后台防沉迷配置
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8bb10aea61 [bug]玩家列表累计充值
tpingzhang 704dd789eb 后台防沉迷配置
tpingzhang da794baa96 配置写到数据库
tpingzhang d176d51c5c 配置写到数据库
elf@home dc6790b404 修改
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 342ec9130e 修改
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 200d9e8667 修改bug
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12362190e6 upt
chenzhi 86b53d375c [新增]玩家列表汇总统计
chenzhi 0ca7d2f5d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ea580a52fe 隐藏推广员统计的二级页
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing ae18f1fb24 推广员统计修改
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
zhengyongxing 8e18e8faac 推广员统计官方渠道添加
chenxiaojun 5fcad13fce 根据时间统计玩家充值
chenxiaojun 2123b29479 根据时间统计玩家充值
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
yulingwei 8fee02fc4c 修改时间
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 849fd77ac6 优化推广员统计的方法
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
zhengyongxing 5c97bb7610 数据分析bug修正
zhengyongxing db40381bb1 定时器接口时间区间修正
zhengyongxing 4f27c2fb29 统计bug修正
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF c0f19228d2 修改bug
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
chenzhi df03c05651 修正统计bug
zhengyongxing 118f706440 脚本去除部分输出
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
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
chenzhi 2a417c2746 123
ELF 2254610041 修改bug
zhanglingsheng fb85d32c87 合并分支
yulingwei 38680ddb05 更新
zhengyongxing 1626123074 数据统计7日平均时长修正
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi a6f52ccdb8 优化注册管理员提示信息
zhanglingsheng a514e5b5dc 支付方式添加快捷
zhanglingsheng e07e1ff2aa 支付方式添加快捷
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
sunke b64882554a 管理后台增加资质审核检索
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
chenzhi e1739209e3 1
chenzhi 521a343fc3 123
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
sunke d2d211737f bug
sunke eac235d498 身份认证后台
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 94cc0bacbf SDK菜单链接修改
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
zhanglingsheng 21b02ca200 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng f074ce853b sdk菜单配置修改
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 2e0a8d2ad0 更新统计数据
zhanglingsheng 5b3c01e1ba Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3453de757f sdk菜单配置修改
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改
zhengyongxing 49cb4c86eb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
 Conflicts:
	Application/Home/View/default/Finance/withdrawRecord.html
zhengyongxing 97b9a06e69 推广后台bug修正
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新
zhengchanglong 0b8dfcdc89 管理后台时时实时注册查询修改
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步
chenxiaojun 6ad8277aa0 管理后台--更新
chenxiaojun 2e7ecfa53c 管理后台--更新
sunke ee8a954566 查看消费记录滚动