206 Commits (e8f6e310d10f28d6a2e3bd5851229c23f9874fe1)

Author SHA1 Message Date
zyx 4dfec50ba5 月结统计修改 5 years ago
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev 5 years ago
zyx f44a11a915 月结统计提示语修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev 5 years ago
zyx 9539b38e86 月结统计提示语修改 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev 5 years ago
zyx cfa33d3e42 月结统计提示语修改 5 years ago
jbrazz a8125bf377 upt 5 years ago
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi f9397efebf 修改总流水统计方式 5 years ago
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev 5 years ago
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏 5 years ago
zyx 414f471ac1 提示栏文字调整 5 years ago
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7167366949 提示栏文字调整 5 years ago
zyx 064a3d0098 搜索框样式调整 5 years ago
zyx 6f77f576d1 标签位置调整 5 years ago
zyx bbc75a419d bug修正,样式更新 5 years ago
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev 5 years ago
zyx 62311eb40d 月结统计bug修正 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
Your Name dce059abe5 SDK菜单修改 5 years ago
Your Name 7466b90d13 SDK菜单修改 5 years ago
Your Name ed3ce2b4b5 SDK菜单修改 5 years ago
Your Name c3762b420c SDK菜单修改 5 years ago
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name c90c397dd9 SDK菜单修改 5 years ago
zyx 2adc07ec4a 组长月结统计页面文字修正 5 years ago
zyx 4803bd4a1b 组长月结统计页面修正 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
zyx 63dff98660 月结统计导出bug修正 5 years ago
zyx 1d59721ee2 月结统计导出bug修正 5 years ago
zyx b42f621dbc 财务管理功能提交 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev 5 years ago
jbrazz d4c7727426 upt 5 years ago
zyx 54a01da982 财务管理功能完善 5 years ago
zyx fe8a60093f 新增渠道模板提交 5 years ago
zyx d3de669837 '代码合并' 5 years ago
jbrazz 8859c847f6 upt 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
zyx 24cdd7086b '合并代码' 5 years ago
sunke 021673f657 图片上传补充 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 112316c395 财务管理功能添加 5 years ago
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除 5 years ago
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口 5 years ago
chenxiaojun a04f291471 管理后台->删除溪谷入口 5 years ago
ELF e4f1ed99f8 修改后台登录页 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
zyx 0a9dbe6a78 管理后台菜单bug修复 5 years ago
zyx c8f101f40c 管理后台添加测试资源 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 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
Your Name b253d23ae3 SDK用户菜单字段名修改 5 years ago
Your Name 971906dd29 SDK用户菜单 5 years ago
Your Name 118340fa33 SDK用户菜单 5 years ago
zyx 90665c3dc5 新增礼包bug修正 5 years ago
zyx 96b81a57ca 礼包添加bug修正 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 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