1518 Commits (2d060e6e72d7c1b50d187a46f3d7d53038d3da0e)

Author SHA1 Message Date
chenzhi b41fbb05b7 123 5 years ago
sunke 021673f657 图片上传补充 5 years ago
chenzhi 50efce9315 更新spen root 5 years ago
chenzhi f6f47748bc 优化时间戳 5 years ago
chenxiaojun 28969fd024 管理后台->游戏管理->合作方管理->批量删除更新 5 years ago
chenxiaojun 19f10c574d 管理后台->游戏管理->合作方管理->批量删除更新 5 years ago
chenzhi b3f2069e94 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi d273c5af27 spendAPI优化 5 years ago
sunke 692a1bcc11 webuploader插件 5 years ago
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx b39efb2d18 同步代码 5 years ago
chenzhi 1783cb0b71 恢复 5 years ago
chenzhi 28e15792e4 123 5 years ago
chenzhi d708a6302f 123 5 years ago
zyx abeb6acde9 git测试 5 years ago
zyx 2c4e20911e Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx
# Conflicts:
#	Application/Admin/Controller/FinanceController.class.php
5 years ago
zyx 882041495e git测试 5 years ago
chenzhi bee4544f70 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi c2c92b4c95 xiuag 5 years ago
zyx bedd841eda 财务管理功能添加 5 years ago
zyx 81c137a1bc 财务管理功能添加 5 years ago
chenzhi 3d38e78160 123 5 years ago
zyx 112316c395 财务管理功能添加 5 years ago
chenzhi 39a593b720 spend统计 5 years ago
chenxiaojun 20c8165888 管理后台->游戏管理->合作方管理->批量删除bug修改 5 years ago
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除 5 years ago
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenzhi b968702009 平台币 5 years ago
zyx d7c9744872 扶持号时间格式修改 5 years ago
zyx ae9a01f325 管理后台代码回滚 5 years ago
zyx 8b4bb3baab Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 1ce876c39f 管理后台测试资源bug修正 5 years ago
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口 5 years ago
chenxiaojun a04f291471 管理后台->删除溪谷入口 5 years ago
zyx 96effb3525 管理后台测试资源bug修正 5 years ago
ELF 6e1a768721 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e4f1ed99f8 修改后台登录页 5 years ago
Your Name 6cb3a9ad75 SDK菜单 5 years ago
Your Name c1a9c3918e SDK菜单 5 years ago
ELF 6df44afb16 功能隐藏 5 years ago
ELF 437909d53a 测试 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zyx 7ead67f8cb 快捷图标代码修正 5 years ago
zyx c6da6fb705 首页用户注册充值信息修正 5 years ago
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev 5 years ago
jbrazz 736c0fd432 fix 5 years ago
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
5 years ago
chenzhi 2f124bffbb coin_num 5 years ago
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl 5 years ago
chenzhi e3d9d382d9 新增线下充值审核 5 years ago
ELF 37ef999710 修改 5 years ago
zhengchanglong c9fead3389 修改 tab_coin_pay_order 表字段 5 years ago
zyx 0a9dbe6a78 管理后台菜单bug修复 5 years ago
zyx 2a52aa42ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx ba6fc9634b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx c8f101f40c 管理后台添加测试资源 5 years ago
zhengchanglong 6154654a35 SDK登录BUG修复 5 years ago
zhengchanglong 4b2e492340 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 5 years ago
ELF 53e0395674 修改 5 years ago
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun a91c372a3b 修复关联游戏混服选项bug 5 years ago
chenxiaojun 76bd557efd 修复关联游戏混服选项bug 5 years ago
ELF bcc34cbd0c 打包逻辑重构 5 years ago
Your Name 22e7866644 SDK菜单添加 5 years ago
Your Name f1b5a2257d SDK用户菜单-修改 5 years ago
ELF 69a6f9612f 打包优化 5 years ago
Your Name b253d23ae3 SDK用户菜单字段名修改 5 years ago
Your Name 971906dd29 SDK用户菜单 5 years ago
Your Name 2eff781166 SDK用户菜单 5 years ago
Your Name 118340fa33 SDK用户菜单 5 years ago
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Giftbag/add.html
5 years ago
zyx 90665c3dc5 新增礼包bug修正 5 years ago
zyx 96b81a57ca 礼包添加bug修正 5 years ago
zyx f4bc470156 资源日志bug修复 5 years ago
zyx 44121ed303 新增礼包界面js bug修复 5 years ago
zyx 55cc0c91e4 新增礼包界面优化 5 years ago
zyx 63eebf5611 礼包管理新增全部,超级签选项 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
“‘ b9bd9655b7 测试资源记录及发放 5 years ago
ELF 0c34bb88d3 解决冲突 5 years ago
chenxiaojun 24b0649615 新增->游戏分包打包排序 5 years ago
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序 5 years ago
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置 5 years ago
18850253506@163.com 4a96cf7871 资料专区 5 years ago
chenxiaojun 2ca1009b32 管理员后台 游戏添加混服设置 5 years ago
chenxiaojun 6c78459b38 更新 5 years ago
chenxiaojun 8ffc9038c4 更新 5 years ago
ELF bfb7ce27f4 修改 5 years ago
ELF 0a43b4133d 修改 5 years ago
ELF 29e4b4e501 测试 5 years ago
ELF ec2c9161e9 修改bug 5 years ago
chenxiaojun fc0053c6cd 本地分包删除 5 years ago
chenxiaojun fd8c59f114 本地分包删除 5 years ago
chenxiaojun 1f1954e9f1 本地分包删除 5 years ago
chenxiaojun d906527970 本地分包删除 5 years ago
ELF f6d15eba6d 修改bug 5 years ago
ELF a0cc11336e 修改bug 5 years ago
ELF cd58cecd3f 修改bug 5 years ago
ELF 6016cd505e Merge branch 'hotfix/menu' into dev 5 years ago
ELF 261f2f7294 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 1920d6ce67 修改bug 5 years ago
ELF 2f3bec1975 修改bug 5 years ago
Your Name dac383b78d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 8702d87819 sdk chinaChar 5 years ago
ELF 1df8bd454f fixed bug 5 years ago
ELF bfadef687f 添加功能 5 years ago
ELF 75b292b906 修改 5 years ago
ELF d61f98df7b 修改内容 5 years ago
ELF 405885e99f 添加环境变量目录 5 years ago
ELF 2ffa024c4c initial 5 years ago