Commit Graph

1540 Commits (cc4a07119423def97bc1e1b90ba8db379666c1a3)

Author SHA1 Message Date
sunke 94728492e9 时间修改
zhengchanglong b54f33ea98 Merge branch 'dev_lww' into dev
chenxiaojun 77574b4d37 推广平台->数据管理->每日概况|数据汇总--更新
chenxiaojun efb4a771b0 推广平台->数据管理->每日概况|数据汇总--更新
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 推广员统计修改
sunke 9bc0d3516e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
sunke 21ad2f0341 提现状态
“用lww 3180406491 pc官网-公司logo可点击跳首页
chenxiaojun 0c41644d7a Merge remote-tracking branch 'origin/dev' into dev
chenxiaojun 57709068fa 推广平台->财务管理->提现记录--添加撤销提现
zhengchanglong b602142a81 Merge branch 'dev_lww' into dev
chenxiaojun ca2935763b 推广平台->财务管理->提现记录--添加撤销提现
“用lww 1b2a9c7f9b pc官网修改
“用lww 595c64e831 pc官网修改
zhengyongxing 8e18e8faac 推广员统计官方渠道添加
sunke 1ccf59fa26 提现明细状态说明
zhengchanglong 1ae5fa0f20 Merge branch 'dev_lww' into dev
sunke 63dc4a15d8 导出状态修改
“用lww 6e1db7caa6 Merge remote-tracking branch 'origin/dev' into dev_lww
“用lww 0168a52b68 手机官网-页面更改
chenxiaojun 4a4a6501ce 分成比例
chenxiaojun e0c0f50c7d 分成比例
chenxiaojun 5fcad13fce 根据时间统计玩家充值
chenxiaojun 2123b29479 根据时间统计玩家充值
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
sunke 0983eb633c 设备号
sunke b1a870d773 排序
sunke 36ff63bb33 角色查询
chenxiaojun 98fe853743 推广平台->数据管理--更新
chenxiaojun 80f76c4490 推广平台->数据管理--更新
sunke 623bc0d44f 充值
chenxiaojun 67864f82a0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun a2dc77645f 推广平台->数据管理--更新
zhengyongxing 0b05701798 推广员首页统计修改
sunke 750cefcb54 充值
ELF d70bf7bf42 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 0d91f0aa5c 修改bug
chenxiaojun 391b997f18 推广平台->财务管理->提现记录--增加重新审核
chenxiaojun bd6932d8d4 推广平台->财务管理->提现记录--增加重新审核
ELF ef9cb4e2c4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 710d7028f1 修改
chenxiaojun 85eeed62f0 推广平台->数据汇总--bug更新
chenxiaojun 638a206ad6 推广平台->数据汇总--bug更新
yulingwei 8fee02fc4c 修改时间
chenxiaojun 2a93ed6ec2 推广平台->数据汇总--bug更新
chenxiaojun e24550b993 推广平台->数据汇总--bug更新
chenxiaojun e8dfa6f92e 推广平台->数据汇总--bug更新
chenxiaojun c923a58536 推广平台->数据汇总--bug更新
chenxiaojun 9b51fd6145 推广平台->数据汇总--bug更新
chenxiaojun e7f9d1b6f3 推广平台->数据汇总--bug更新
sunke ef1857d752 bug
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 849fd77ac6 优化推广员统计的方法
ELF 3ad71f99bf Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 112d7462bc 修改bug
chenxiaojun 950bd81e5e 推广平台->数据汇总->充值玩家--更新
chenxiaojun 47af5037b7 推广平台->数据汇总->充值玩家--更新
zhengyongxing 3cabc6ab95 注册修改
zhengyongxing d7550495b1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 6c2c048952 普通注册密码规则修改
chenxiaojun 4342e240c0 推广平台->数据汇总->充值玩家--添加排序功能
chenxiaojun 1a110770dc 推广平台->数据汇总->充值玩家--添加排序功能
ELF 1c2458841d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 5a98b86a07 修改bug
zhengyongxing be09214f7a 登录sdk主页跳转
zhengyongxing 479a7537a8 登录sdk主页跳转
zhengyongxing ee40286108 登录sdk主页跳转
zhengchanglong 4120344388 超级签下载页无礼包不显示礼包特权
zhengchanglong 7e01b0208c Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 7265a2961e 超级签页面UI修改
chenxiaojun 3e68880ac0 推广平台->数据汇总->充值玩家--更新
chenxiaojun 09ab8bf8ad 推广平台->数据汇总->充值玩家--更新
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
chenxiaojun 49270427ee 推广平台->数据汇总->充值玩家--更新
zhengchanglong c63873c171 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 1ed48003ac 超级签充值BUG修复
sunke bf3f7f70fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
sunke 1e090fc6dd 时间格式
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
sunke 7220083d84 公告
zhengyongxing 66776fef98 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 89b67c06a4 登录sdk,跳转至购买超级签,无需重新登陆
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
sunke a87eca6363 创建时间
sunke 7610314927 数据管理
zhengchanglong d191552c1f Merge branch 'dev_zcl' into dev
zhengchanglong ddacae349e Merge branch 'dev_lww' into dev_zcl
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
“用lww 019ae56f40 手机官网-落地页