1093 Commits (784f416ad5f78ab6173a792ea53fac7cf7784cd3)

Author SHA1 Message Date
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
yulingwei a7f6d8b7a4 upt 5 years ago
elf@home 06486d458c 修改bug 5 years ago
elf@home 1036589f3b 修改代码 5 years ago
zhengchanglong ab46f9f6ec Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 3fbdc9daa0 管理后台->游戏订单->游戏充值--sql优化 5 years ago
chenxiaojun 83e8427c8b cs 5 years ago
ELF 1c11622eb2 修改bug 5 years ago
ELF b0b0056c43 修改bug 5 years ago
ELF e942f378c6 修改bug 5 years ago
zhanglingsheng 656e9b7231 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng fb0808445f 悬浮球加类型 5 years ago
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传 5 years ago
yulingwei 44954031bf upt 5 years ago
yulingwei 0d258c1d8d upt 5 years ago
ELF e2d75ec2c6 修改推广后台首页 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF 784de48bf9 修改bug 5 years ago
chenxiaojun c8281d2bb2 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
chenxiaojun 5afd0ffd63 管理后台->推广员->结算管理->推广提现->上传汇款证明--更新 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
ELF f1625fec2d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF afb6de56f8 添加3级变四级脚本 5 years ago
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新 5 years ago
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev 5 years ago
jbrazz 14081fe0cc Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 3f1b2d34c2 upt 5 years ago
zyx 68e57ab1f5 导出链路问题修正 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
ELF f03fec9e43 Merge branch 'feature/promote' into dev 5 years ago
jbrazz e57dfd3fae 修改设备号查询 5 years ago
jbrazz f4a46335ca upt 5 years ago
jbrazz 7396e69a61 upt 5 years ago
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz 52880f1a91 upt 5 years ago
zyx ce008b284e 月结统计bug修正 5 years ago
ELF 12016f1b34 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 679acf6cf1 修改分包 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
chenzhi 7e37f3a2df 优化迁移用户addshifttask 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz 2dd1372b78 upt 5 years ago
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5f673b346d 月结统计添加部长渠道 5 years ago
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote 5 years ago
chenzhi 9a6c75b41d Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi a653b46f0e 优化月份统计接口新增事务 5 years ago
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi c2e686c38e 123 5 years ago
chenzhi 537ed0857a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 9d09fa4665 4角色聚合 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 9e9d742275 导出添加引号 5 years ago
zhengchanglong 943564f82d Merge branch 'dev_zyx' into dev 5 years ago
zyx d5a90238ec 导出加大默认内存 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
zhengchanglong 0223ecb125 Merge branch 'dev_zyx' into dev 5 years ago
zyx 35e1b2631a 导出添加游戏订单号 5 years ago
zhengchanglong 945ea1173a Merge branch 'dev_zyx' into dev 5 years ago
zyx a307bf343e 游戏详情查看导出,按日期分成多个sheet 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7e4aaf0a2e Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 5 years ago
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
zhengchanglong 561b183bec Merge branch 'dev_zyx' into dev 5 years ago
chenzhi a9bc64a4b2 优化统计逻辑 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
zyx 4dfec50ba5 月结统计修改 5 years ago
chenzhi 0ae24bf2cd 优化财务聚合接口2 5 years ago
chenzhi 58c405e914 优化财务聚合接口 5 years ago
chenzhi 0df9045e67 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi f54305911c 优化api暂存 5 years ago
ELF 6c6b3b54aa Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 7547e867bb 三级变四级修改 5 years ago
chenzhi eacdea6f9b 暂存修改 5 years ago
chenzhi 81192f36c8 xiufu 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 18be299b4c 同步dev 5 years ago
jbrazz 48b1cdf66f upt 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
chenzhi c8da11a12e 新增平台币流水充值 5 years ago
chenzhi b4c9f60ac9 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF b4168a23f1 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 8212b4ecaf 4级推广申请资源修正 5 years ago
chenzhi 498de9ab75 同步dev 5 years ago
ELF 689cc08b69 修改 5 years ago
zhengchanglong 5b93736468 Merge branch 'dev_zyx' into dev 5 years ago
zyx 1201180f79 游戏到处删除玩家昵称栏位 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
chenzhi 02535dee01 dev 5 years ago
chenzhi 5b40ebdf91 dev 5 years ago
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi b4b4e7bc00 新增强制重新更新 5 years ago
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi c547d43330 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi d91a44184f 优化数据更新提示 5 years ago
zyx bbc75a419d bug修正,样式更新 5 years ago
zhengchanglong fd97ecf494 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi fa29554923 肯定没错 5 years ago
zhengchanglong d554815d12 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi a1f22ad756 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 2e4067e1de 测试 5 years ago
zhengchanglong 3da91ecb0f Merge branch 'dev_zyx' into dev 5 years ago
zyx e8fc252599 组长统计搜索bug修正 5 years ago
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
chenzhi 3983a086ac 优化生成数据 5 years ago
chenzhi 8796458ead 聚合新增月份 5 years ago
Your Name 7466b90d13 SDK菜单修改 5 years ago
Your Name ed3ce2b4b5 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
chenzhi af05f08689 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 4f7077a3ec 10311331 5 years ago
zyx f16bf0b606 月结统计筛选列表逻辑修正 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
zyx 63dff98660 月结统计导出bug修正 5 years ago
zyx b42f621dbc 财务管理功能提交 5 years ago
zyx da1686fe14 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
jbrazz d4c7727426 upt 5 years ago
chenzhi 185f0ca30e 优化强制更新 5 years ago
chenzhi 2983f5b93f 新增强制更新某月份 5 years ago
chenzhi e0857168f8 优化接口终结 5 years ago
chenzhi cce64d646b 1 5 years ago
zyx 82323a7138 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 54a01da982 财务管理功能完善 5 years ago
chenzhi 483ccdffa2 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 4cf967fbcd 优化数据获取 5 years ago
zyx d3de669837 '代码合并' 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenzhi 06395bcb9d 123 5 years ago
chenzhi 3b70468942 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 9803b418b9 优化统计 5 years ago
ELF 5b62b99765 三级变四级 5 years ago
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
zyx 24cdd7086b '合并代码' 5 years ago
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 dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenzhi b968702009 平台币 5 years ago
zyx d7c9744872 扶持号时间格式修改 5 years ago
zyx ae9a01f325 管理后台代码回滚 5 years ago
zyx 1ce876c39f 管理后台测试资源bug修正 5 years ago
zyx 96effb3525 管理后台测试资源bug修正 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
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 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 c8f101f40c 管理后台添加测试资源 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
ELF bcc34cbd0c 打包逻辑重构 5 years ago
Your Name 22e7866644 SDK菜单添加 5 years ago
ELF 69a6f9612f 打包优化 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 f4bc470156 资源日志bug修复 5 years ago
zyx 63eebf5611 礼包管理新增全部,超级签选项 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
“‘ b9bd9655b7 测试资源记录及发放 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
ELF bfb7ce27f4 修改 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 1920d6ce67 修改bug 5 years ago
ELF 2f3bec1975 修改bug 5 years ago
ELF 1df8bd454f fixed bug 5 years ago
ELF bfadef687f 添加功能 5 years ago
ELF 2ffa024c4c initial 5 years ago