Commit Graph

1048 Commits (61b5fb48b628e434d6b82c0de83fa535a8581df7)

Author SHA1 Message Date
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
jbrazz 8be3ee9560 upt
jbrazz 31948423e0 upt
jbrazz 20c168a537 三级改四级配置
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
jbrazz f4a46335ca upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz ea4c861559 upt
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a819757cb 测试资源时间bug修正
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
ELF 831456b333 解决冲突
jbrazz 9300280f78 merge feture/ylw
jbrazz db1ea1370a upt
jbrazz 5e9cfb023f uypt
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
jbrazz 74be3407b1 upt
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
zyx 602e53e82f 合并分支dev_zyx财务部分的代码
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev
zyx 8fd435a324 月结统计,游戏查看名称修改
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev
zyx 4dfec50ba5 月结统计修改
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev
zyx f44a11a915 月结统计提示语修改
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev
zyx 9539b38e86 月结统计提示语修改
jbrazz 48b1cdf66f upt
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev
zyx cfa33d3e42 月结统计提示语修改
jbrazz a8125bf377 upt
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi f9397efebf 修改总流水统计方式
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出
zyx b6080180ab 测试资源bug修正
jbrazz 48de85a3c3 upt
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏
zyx 414f471ac1 提示栏文字调整
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev
zyx 7167366949 提示栏文字调整
zyx 064a3d0098 搜索框样式调整
zyx 6f77f576d1 标签位置调整
zyx bbc75a419d bug修正,样式更新
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev
zyx 62311eb40d 月结统计bug修正
zyx 515ffa25b9 月结统计bug修正
Your Name dce059abe5 SDK菜单修改
Your Name 7466b90d13 SDK菜单修改
Your Name ed3ce2b4b5 SDK菜单修改
Your Name c3762b420c SDK菜单修改
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name c90c397dd9 SDK菜单修改
zyx 2adc07ec4a 组长月结统计页面文字修正
zyx 4803bd4a1b 组长月结统计页面修正
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev
zyx 63dff98660 月结统计导出bug修正
zyx 1d59721ee2 月结统计导出bug修正
zyx b42f621dbc 财务管理功能提交
zyx ee5dccfaeb 财务管理功能代码完善
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev
jbrazz d4c7727426 upt
zyx 54a01da982 财务管理功能完善
zyx fe8a60093f 新增渠道模板提交
zyx d3de669837 '代码合并'
jbrazz 8859c847f6 upt
jbrazz 459b722c1c upt
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计
zyx 24cdd7086b '合并代码'
sunke 021673f657 图片上传补充
sunke 692a1bcc11 webuploader插件
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
zyx 112316c395 财务管理功能添加
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口
chenxiaojun a04f291471 管理后台->删除溪谷入口
ELF e4f1ed99f8 修改后台登录页
ELF 437909d53a 测试
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序
zyx 7ead67f8cb 快捷图标代码修正
zyx c6da6fb705 首页用户注册充值信息修正
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev
jbrazz 736c0fd432 fix
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
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi e3d9d382d9 新增线下充值审核
zyx 0a9dbe6a78 管理后台菜单bug修复
zyx c8f101f40c 管理后台添加测试资源
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
chenxiaojun a91c372a3b 修复关联游戏混服选项bug
chenxiaojun 76bd557efd 修复关联游戏混服选项bug
ELF bcc34cbd0c 打包逻辑重构
Your Name 22e7866644 SDK菜单添加
Your Name f1b5a2257d SDK用户菜单-修改
Your Name b253d23ae3 SDK用户菜单字段名修改
Your Name 971906dd29 SDK用户菜单
Your Name 118340fa33 SDK用户菜单
zyx 90665c3dc5 新增礼包bug修正
zyx 96b81a57ca 礼包添加bug修正
zyx 63eebf5611 礼包管理新增全部,超级签选项
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正
“‘ b9bd9655b7 测试资源记录及发放
ELF 0c34bb88d3 解决冲突
chenxiaojun 24b0649615 新增->游戏分包打包排序
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置
18850253506@163.com 4a96cf7871 资料专区
chenxiaojun 2ca1009b32 管理员后台 游戏添加混服设置
chenxiaojun 6c78459b38 更新
chenxiaojun 8ffc9038c4 更新
ELF bfadef687f 添加功能
ELF 75b292b906 修改
ELF d61f98df7b 修改内容
ELF 405885e99f 添加环境变量目录
ELF 2ffa024c4c initial