elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,810 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '81fb39c004'
${ noResults }
Commit Graph

879 Commits (81fb39c004589b6ce85672d17415cb86cceadb5d)

Author SHA1 Message Date
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整 5 years ago
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整 
自动脚本->玩家角色充值数据统计--调整
 5 years ago
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhengyongxing 6e151dd8a4 用户导出修改 5 years ago
zhengyongxing 30b5e6ed46 用户玩家列表导出优化 5 years ago
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
yulingwei 9a3bb4e170 修复排序问题 5 years ago
yulingwei b1902e5592 更新 5 years ago
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 466dd6cc93 upt 5 years ago
zhengyongxing c73ce833f4 用户导出修正 5 years ago
sunke 1d2ce27736 登陆日志排除下线日志 5 years ago
zhengyongxing cc4a071194 用户信息大数据量导出错误 5 years ago
chenzhi b52113622d [bug]无法获取上线推广员问题 5 years ago
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计 5 years ago
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
“用lww f75188f952 后台导出功能增加内存限制到512M 5 years ago
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计 5 years ago
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计 5 years ago
“用lww e1b93a987b 导出数据过大，配置加大内存限制范围 5 years ago
yulingwei 4071341458 更新 5 years ago
yulingwei 090d1e2f69 更新bug 5 years ago
tpingzhang a0ab440e1a 后台防沉迷配置 5 years ago
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
tpingzhang f9307ee710 后台防沉迷配置 5 years ago
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8bb10aea61 [bug]玩家列表累计充值 5 years ago
tpingzhang 704dd789eb 后台防沉迷配置 5 years ago
tpingzhang da794baa96 配置写到数据库 5 years ago
tpingzhang d176d51c5c 配置写到数据库 5 years ago
elf@home dc6790b404 修改 5 years ago
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 342ec9130e 修改 5 years ago
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录 5 years ago
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 200d9e8667 修改bug 5 years ago
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框 5 years ago
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12362190e6 upt 5 years ago
chenzhi 86b53d375c [新增]玩家列表汇总统计 5 years ago
chenzhi 0ca7d2f5d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi ea580a52fe 隐藏推广员统计的二级页 5 years ago
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing ae18f1fb24 推广员统计修改 5 years ago
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计 5 years ago
zhengyongxing 8e18e8faac 推广员统计官方渠道添加 5 years ago
chenxiaojun 5fcad13fce 根据时间统计玩家充值 5 years ago
chenxiaojun 2123b29479 根据时间统计玩家充值 5 years ago
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题 5 years ago
yulingwei 8fee02fc4c 修改时间 5 years ago
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 849fd77ac6 优化推广员统计的方法 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
 5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新 5 years ago
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei feecf9199d 电子邮箱改为选填 5 years ago
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e2a2a07f03 修改bug 5 years ago
chenzhi 8af46f08c2 优化推广员统计1 5 years ago
zhengchanglong 387be649de Merge branch 'dev-cz' into dev 5 years ago
chenzhi 256545a59a 123 5 years ago
zhengyongxing 5c97bb7610 数据分析bug修正 5 years ago
zhengyongxing db40381bb1 定时器接口时间区间修正 5 years ago
zhengyongxing 4f27c2fb29 统计bug修正 5 years ago
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl 5 years ago
zhengyongxing 08b2ba432a 统计数据修正 5 years ago
ELF 51d1d730e1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF c0f19228d2 修改bug 5 years ago
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev 
# Conflicts:
#	Data/update.sql
 5 years ago
chenzhi df03c05651 修正统计bug 5 years ago
zhengyongxing 118f706440 脚本去除部分输出 5 years ago
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
 5 years ago
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
 5 years ago
chenzhi 2a417c2746 123 5 years ago
ELF 2254610041 修改bug 5 years ago
zhanglingsheng fb85d32c87 合并分支 5 years ago
yulingwei 38680ddb05 更新 5 years ago
zhengyongxing 1626123074 数据统计7日平均时长修正 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
 5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Data/update.sql
 5 years ago
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化 5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
chenzhi 6e522e08cd Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi a6f52ccdb8 优化注册管理员提示信息 5 years ago
zhanglingsheng a514e5b5dc 支付方式添加快捷 5 years ago
zhanglingsheng e07e1ff2aa 支付方式添加快捷 5 years ago
chenzhi 360cf3f3ba 优化前端展示 5 years ago
chenzhi 04c5f17790 优化脚本 5 years ago
sunke b64882554a 管理后台增加资质审核检索 5 years ago
chenzhi 37d8f72c6d 优化首页展示 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
chenzhi e1739209e3 1 5 years ago
chenzhi 521a343fc3 123 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
sunke d2d211737f bug 5 years ago
sunke eac235d498 身份认证后台 5 years ago
zhengchanglong d95fd1b1a7 Merge branch 'dev_zcl' into dev 5 years ago
zhanglingsheng d0a0068039 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 94cc0bacbf SDK菜单链接修改 5 years ago
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
zhanglingsheng 21b02ca200 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng f074ce853b sdk菜单配置修改 5 years ago
yulingwei 82bdfadb7d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 2e0a8d2ad0 更新统计数据 5 years ago
zhanglingsheng 5b3c01e1ba Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3453de757f sdk菜单配置修改 5 years ago
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
zhengyongxing 49cb4c86eb Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 
 Conflicts:
	Application/Home/View/default/Finance/withdrawRecord.html
 5 years ago
zhengyongxing 97b9a06e69 推广后台bug修正 5 years ago
chenxiaojun f7d0109ee7 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 5caf75afb9 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
zhengchanglong 0b8dfcdc89 管理后台时时实时注册查询修改 5 years ago
chenxiaojun e96bd42ef6 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 25b319f87c 管理后台->游戏--去除CP分成比例同步 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
sunke ee8a954566 查看消费记录滚动 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 9075730d83 管理后台->游戏订单->游戏充值--更新 5 years ago
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整 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 5a2e6c2b63 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
ELF 905efbfd9a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF 9fde84f6ca Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c8f072f983 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 2a6d9b7571 推广员名称 5 years ago
chenxiaojun 9d3dfd622b 推广平台->退出登录--更新 5 years ago
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e58b20b576 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
ELF e27c5a5266 修改bug 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
chenxiaojun 467b193037 推广平台->退出登录--更新 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
chenxiaojun 773ffb5160 管理后台->游戏编辑--更新推广充值CPS比例时同步未提现订单的分成比例 
推广平台->数据管理->每日概况|数据汇总--检索日期间隔调整为31天
推广平台->财务管理->结算中心->提现--权限更新
 5 years ago
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
ELF 84b36e2d78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF 784de48bf9 修改bug 5 years ago
jbrazz 8be3ee9560 upt 5 years ago
jbrazz 31948423e0 upt 5 years ago
jbrazz 20c168a537 三级改四级配置 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 c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制 5 years ago
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新 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 0787c976ef 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
ELF 6bf4e10916 Merge branch 'hotfix/oa' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name a9a95765e2 OA获取信息-手机系统变更消息推送 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
jbrazz ea4c861559 upt 5 years ago
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 0a819757cb 测试资源时间bug修正 5 years ago
zyx 0ce8984c13 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx ce008b284e 月结统计bug修正 5 years ago
jbrazz b21df0a8f4 upt 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
jbrazz db1ea1370a upt 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
Your Name f642fb2c90 游戏充值订单添加CP订单号字段 5 years ago
jbrazz 74be3407b1 upt 5 years ago
ELF a8bc52df33 修改 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 78e23d19b2 Merge branch 'dev_zyx' into dev 5 years ago
zyx 8fd435a324 月结统计，游戏查看名称修改 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
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
chenzhi 18be299b4c 同步dev 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 f0559c3576 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/View/Finance/index.html
 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
chenzhi c8da11a12e 新增平台币流水充值 5 years ago
zyx b6080180ab 测试资源bug修正 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
zyx fcbf41fa65 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏 5 years ago
chenzhi dcc5939692 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi b4b4e7bc00 新增强制重新更新 5 years ago
zyx a97ce09429 Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 414f471ac1 提示栏文字调整 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 7167366949 提示栏文字调整 5 years ago
zyx 064a3d0098 搜索框样式调整 5 years ago
zyx 6f77f576d1 标签位置调整 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 62311eb40d 月结统计bug修正 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
chenzhi 3983a086ac 优化生成数据 5 years ago
chenzhi 8796458ead 聚合新增月份 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
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
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 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 b78c6228b0 Merge branch 'hotfix/fix_bug' into dev 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 fe8a60093f 新增渠道模板提交 5 years ago
zyx d3de669837 '代码合并' 5 years ago
jbrazz 8859c847f6 upt 5 years ago
jbrazz 459b722c1c upt 5 years ago
zhengchanglong 5c8573df37 修改月份列表 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 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