Commit Graph

773 Commits (9e9d7422751c17e0b40628d9f2a24be68de29582)

Author SHA1 Message Date
chenzhi 3b70468942 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 9803b418b9 优化统计
chenxiaojun 49daffbbe4 推广后台->数据管理->每日概况|数据汇总->合计更新
chenxiaojun 9169a2084b 推广后台->数据管理->每日概况|数据汇总->合计更新
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计
zyx 24cdd7086b '合并代码'
chenzhi b41fbb05b7 123
sunke 021673f657 图片上传补充
chenzhi 50efce9315 更新spen root
chenzhi f6f47748bc 优化时间戳
chenxiaojun 28969fd024 管理后台->游戏管理->合作方管理->批量删除更新
chenxiaojun 19f10c574d 管理后台->游戏管理->合作方管理->批量删除更新
chenzhi b3f2069e94 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi d273c5af27 spendAPI优化
sunke 692a1bcc11 webuploader插件
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx b39efb2d18 同步代码
chenzhi 1783cb0b71 恢复
chenzhi 28e15792e4 123
chenzhi d708a6302f 123
zyx abeb6acde9 git测试
zyx 2c4e20911e Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx
# Conflicts:
#	Application/Admin/Controller/FinanceController.class.php
zyx 882041495e git测试
chenzhi bee4544f70 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi c2c92b4c95 xiuag
zyx bedd841eda 财务管理功能添加
zyx 81c137a1bc 财务管理功能添加
chenzhi 3d38e78160 123
zyx 112316c395 财务管理功能添加
chenxiaojun 20c8165888 管理后台->游戏管理->合作方管理->批量删除bug修改
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理
chenzhi a3d0c81d4b 修改
chenzhi f5ac904a49 优化扶持
zyx d7c9744872 扶持号时间格式修改
zyx ae9a01f325 管理后台代码回滚
zyx 8b4bb3baab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 1ce876c39f 管理后台测试资源bug修正
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口
chenxiaojun a04f291471 管理后台->删除溪谷入口
zyx 96effb3525 管理后台测试资源bug修正
zyx 5c435bad74 公用文件添加排序
zyx ecc93af47c 测试资源排序添加
ELF 6e1a768721 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e4f1ed99f8 修改后台登录页
Your Name 6cb3a9ad75 SDK菜单
Your Name c1a9c3918e SDK菜单
chenxiaojun 032e5de877 推广平台->注册明细->bug修复
chenxiaojun 8b2e384fb6 推广平台->注册明细->bug修复
zyx 7e37560efe 公告计数负数问题改正
zyx 56deca114f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 2f2158dbe0 详情页公告提示修正
chenxiaojun 1ec9c156cf 推广平台->数据汇总|每日概况->bug修复
chenxiaojun 27665e5b14 推广平台->数据汇总|每日概况->bug修复
ELF 6df44afb16 功能隐藏
zyx b0411e3704 详情页公告提示修正
zyx 0ffbc8aff9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 048e37fdd7 详情页公告提示修正
ELF 437909d53a 测试
chenxiaojun 37188cb085 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 36b9b51817 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
zyx 95731bba09 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 387f729773 首页公告提示修正
ELF 674dcc9e55 Merge branch 'hotfix/pc' into dev
ELF 390974a557 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 4917458099 Merge branch 'hotfix/query' into dev
ELF c6a52282d5 修改bug
zyx 5637b496e9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 36de2e17c5 扶持号js逻辑修正
zhengchanglong 954928b7f2 推广员首页优化
zyx 31039bdeab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序
zhengchanglong af68a2ef10 推官员首页优化
chenxiaojun 9ba9710670 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun af06ea8364 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun 155df3336d 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
chenxiaojun c3c2f91c30 推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
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 5ff559cf11 修改bug
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 新增线下充值审核
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 16bb3cfc13 PC官网->平台币充值简介样式修改
chenxiaojun 8db91a21ee PC官网->平台币充值简介样式修改
chenxiaojun c7979cada0 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官网->平台币充值简介修改
chenxiaojun 66e011e101 PC官网->平台币充值简介修改
tpingzhang 29883f60ac 修改重复插入问题 增加唯一索引 记录重复插入异常
jbrazz c1ab4e789c Merge branch 'featrue/fix_bug' into dev
jbrazz 9bc5127223 upt
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
chenxiaojun 641dcd5b65 推广员后台->每日概况->游戏检索bug
chenxiaojun db424fde84 推广员后台->每日概况->游戏检索bug
jbrazz 953564d291 upt
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
ELF b7964e19d0 修改bug
ELF 4d0359aaba 修改bug
ELF cd90807d58 Merge branch 'hotfix/promote' into dev
ELF b29d62a4ac Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 5bb7e9850f 推广员后台->区服排序
chenxiaojun c3d4c112d6 推广员后台->区服排序
ELF b8f93f74c6 隐藏推广员系统目录
ELF 157676f268 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 260e45f4d9 Merge branch 'hotfix/query' into dev
ELF 2816054361 修改bug
zhengchanglong ec07cedc5e Merge branch 'dev_zcl' into dev
chenzhi 5d7385e77a 登陆bug优化
zyx e23943cfdb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx bb3109f5d3 测试账号冻结状态需要的字段修改
zhengchanglong 32595840c3 Merge branch 'dev_zcl' into dev
chenzhi a54a6b8b26 优化bug
zyx 5ffc0bf9b0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev