Commit Graph

5687 Commits (d91d8346b92ce6680f9bb39e44bbecf4ec41752f)
 

Author SHA1 Message Date
chenxiaojun 3226b01dfb 推广平台->数据汇总|每日概况->列表名词解释调整
chenxiaojun cf5e6c849b 推广平台->数据汇总|每日概况->列表名词解释调整
chenxiaojun 456c4c925e 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
chenxiaojun 63b27d8c1d 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
zyx 4a23e1dd8a 日志管理bug修复
zyx a16c77181c 优化首页计算代码
zyx 7ead67f8cb 快捷图标代码修正
zyx c461190682 首页用户注册充值信息修正,昨日注册用户
zyx 219596843b 首页用户注册充值信息修正,昨日注册用户
zyx c6da6fb705 首页用户注册充值信息修正
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
chenxiaojun f46a76649c 推广平台->84推广员开权限
chenxiaojun 74f88da239 推广平台->84推广员开权限
ELF eb09c67dd4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 0c3cc6e0bf Merge branch 'master' of 47.111.118.107:/srv/git/platform
ELF b56230cd2b Merge branch 'hotfix/query'
ELF 5ff559cf11 修改bug
chenxiaojun 7425d67f1b 用户手机号注册规则修改
chenxiaojun 44c59bfe72 用户手机号注册规则修改
chenxiaojun 9500fbbc80 用户手机号注册规则修改
chenxiaojun c4f7a928f9 用户手机号注册规则修改
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
chenzhi 2f124bffbb coin_num
chenxiaojun df3c2d823c 推广员后台->2推广员开权限
chenxiaojun cd29b17e03 推广员后台->2推广员开权限
chenxiaojun e92790a89f 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
chenxiaojun d56bebdaa6 推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
ELF 37ef999710 修改
zyx 0112a0151c 首页用户注册充值信息修正
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段
zyx 44bb1c3e19 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a9dbe6a78 管理后台菜单bug修复
chenxiaojun 189eec168e PC官网->平台币充值简介样式修改
chenxiaojun 16bb3cfc13 PC官网->平台币充值简介样式修改
chenxiaojun 8db91a21ee PC官网->平台币充值简介样式修改
chenxiaojun c7979cada0 PC官网->平台币充值简介样式修改
chenxiaojun 553bb797a9 PC/手机官网->平台币充值简介修改
chenxiaojun 82c5bd30da PC/手机官网->平台币充值简介修改
zyx 2a52aa42ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ba6fc9634b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx c8f101f40c 管理后台添加测试资源
zhengchanglong 732777305e Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 6154654a35 SDK登录BUG修复
chenxiaojun 32ba151ac5 手机官网->平台币充值简介修改
chenxiaojun 85839b7e94 手机官网->平台币充值简介修改
chenxiaojun ecf43d6e7a PC官网->平台币充值简介修改