elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,396 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

1291 Commits (f124e4b7ff3ecee95c04a7bb845881bade9a4e67)

Author SHA1 Message Date
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动 
直充支出明细多条数据可滚动
chenzhi 34aac60bfa Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 44407cdb89 优化游戏选择公司联动
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 795c1983ad 优化官方渠道没有渠道查看
tping 964eea79e5 1, 平台币补单 
2，repair_pay表
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
chenzhi a6ad40b45a 公会统计新增返回按钮
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9549812c41 修复第二页数据不显示问题
zhengyongxing 65e13bbcc5 测试白名单bug修正
zhengyongxing 1922e29542 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 2d63204546 支付渠道统计权限注释
chenzhi 23306ba33b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 4ab8977f06 取消财务管理数据权限
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
chenzhi 9b7f3d1104 优化csv导出默认为不转码
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索
liuweiwen 491f8526bb Merge remote-tracking branch 'origin/dev' into dev
liuweiwen aaabd0a07f 游戏统计搜索时间范围
zhengchanglong bf6a61f41d Merge branch 'release-1.0.0' into dev
liuweiwen b1e9127e9d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 7b87c7718d 游戏统计搜索时间范围
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev
ELF 67dd874ccf 修改
chenzhi 5f70aa78d8 优化补链记录
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Data/update.sql
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev
zhengyongxing 261adfa33c 渠道统计bug修正
zhengyongxing 6e5cfb72b4 渠道统计bug修正
zhengyongxing 4068c12480 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 3dbab290e6 Merge branch 'dev_statistics' into dev
zhengyongxing e506f45ed2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 44dac56d85 渠道统计bug修正
chenzhi 9dcc55d472 优化用户列表选择设备无响应问题
chenzhi 116dc2c86f 优化三角色说明
chenzhi 1f4490733a 优化推广员注册用户
chenzhi 0cec46ed37 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 8c577ec4af 新增平台统计说明
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cfd032b1fa 推广员统计
chenzhi 7a82b930bf 优化区服选择不响应问题
chenzhi 8b968fc9fb 优化区服选择无效问题
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug
ELF 8d934c8d88 修改
chenxiaojun 92b0bc2c87 公会分成管理--更新
chenxiaojun ec273ab157 公会分成管理--更新
zhengyongxing 66d098a81b 数据权限跳转提示去除，直接跳转
liuweiwen 3e5dbd6571 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时
chenzhi 0890e39675 公会统计首页新增分页
chenzhi 85e474c299 公会统计首页新增分页
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口
chenzhi cf89e73281 优化csv导出函数
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev
zhengyongxing a2c4e3f2e3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 792906e448 平台币充值功能添加
liuweiwen fcbd598e3c 管理后台登录时间改为1小时
zhengyongxing eb187fa8d8 超级签详情链接添加
chenzhi 629c733742 删除函数重复问题
zhengchanglong dba78c08cd 非管理员数据导出隐藏
zhengchanglong a45fde72dd 非管理员数据导出隐藏
chenzhi 0ef4241570 合并statistcs
zhengyongxing 09924a5cc3 超级签详情链接添加
zhengyongxing 5417e1751d 平台统计修改
zhengyongxing 32e362ab80 平台统计修改
zhengyongxing 8f1847341f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing 6255d05472 平台统计修改
liuweiwen 0d088037da 登录记录查询强制索引
liuweiwen 5b1a4db378 登录记录
liuweiwen 2e818c04f8 登录记录搜索
liuweiwen 8a512aedc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen ab27c53da4 修改提示
zhengyongxing a7e747e639 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ac6f980d03 角色权限返回样式调整
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong 42542ff640 非管理员数据加密显示
liuweiwen eb6c65522d 修改提示
zhengyongxing 17e4084192 角色权限返回调整
liuweiwen 1ba7f6130a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen cc1e3ccbb3 推广员账号已存在判断
zhengyongxing b8859837fb 登录数据权限数据
liuweiwen 2b4c9b6f44 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen dfa5316ef1 推广员状态默认为待审核
chenzhi 624e321b70 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 96e52b267a 修复没总览依旧显示问题
liuweiwen 2096c22826 注释
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录 
改为展示这个会长及其所属推广员的登录记录
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong 4d06b52b9d Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong c6b8f99b6e 非管理员数据加密显示
chenzhi b3e09ad5db 放行ajax,首页无权限判断
zhengchanglong 9a2a7df2e6 非管理员数据加密显示
chenzhi 700114cb4c Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi ae3e5d4048 公会导出结束
zhengchanglong cc6d095a1c 非管理员数据加密显示
chenzhi 2651a94408 公会导出2
zhengyongxing 10aa8cf81c 月结统计导出添加
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
zhengchanglong dbaf93b630 非管理员数据加密显示
liuweiwen e32491c108 bug修复，解决点击搜索框后下拉显示异常
ELF b36e1f1bc9 解决冲突
zhengyongxing d1a5b63be2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 71df0ab08b 菜单修正
chenzhi ba6947987b Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi e414013f8b 优化导出2
zhengyongxing 0a8865e335 菜单修正
zhengyongxing b8d736c337 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 00f33befa2 平台币收回修正
chenxiaojun 206c2ed251 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi c5dc3b4f22 优化会长统计导出1
chenxiaojun 1f19360d72 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 81fb39c004 管理后台>推广员管理>公会分成管理--更新
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计，增加判断是否有官方渠道权限
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
sunke 1699c155e8 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengchanglong 39b6e98f3b Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
#	Data/update.sql
chenzhi 7c81377095 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi cb99c63223 公会统计6
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮
chenxiaojun 2559aa32e9 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 6b8e277fb1 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 628ea84935 平台币收回修正
zhengyongxing 5daf1eb565 支付渠道查询修改
sunke 2f83a85690 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
liuweiwen 546a7029cd bug修复：游戏充值-》补单没权限提示内容为空的问题
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
chenzhi b743cd73e1 新增导出csv函数
chenzhi e4b6cdea85 公会修改6
liuweiwen 69e3843a56 修改文字
liuweiwen b8e5d719d5 修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
zhengyongxing ba59b41fb9 数据权限官方渠道添加
zhanglingsheng 2ec116a017 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng a9c2207ba2 行为日志
zhanglingsheng 837aec6659 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 855b567a02 行为日志
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的
chenzhi 1244156518 优化总览统计
zhengyongxing d465be8969 数据权限提交
chenzhi a877b475f5 优化总览脚本
chenzhi c6f2794a3b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f480cd6b7a 优化给推广员发放平台币时菜单问题
liuweiwen 21e90e6cb3 Merge branch 'dev_permission' into release-1.0.0
liuweiwen fe5ae6a499 搜索的推广员数据权限
zhengyongxing 153f731b55 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing e8c3f021b6 角色查询导出修改
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新
liuweiwen 4fca3e8288 修改返回按钮样式
chenzhi b97a956cbc 公会统计5
liuweiwen 511b780f72 返回跳转
zhengyongxing 7779535fb6 数据权限
liuweiwen ee98ca39bb 推广公司
liuweiwen ee2fc154a4 推广公司
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 904b707cf4 公会统计5
zhanglingsheng f3a80b73b8 行为日志显示bug
chenzhi 86db958ca7 将txt文件全部移入runtime
zhanglingsheng 043de55e0b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng c6a89f5fe1 行为日志BUG
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新
zhanglingsheng eaa5066324 行为日志bug
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 5f3e71e8a8 数据权限bug修正
zhengyongxing e7b2f57a93 数据权限bug修正
zhengyongxing ce0e9f943d 数据权限bug修正
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新
chenzhi 9104c0865c 公会统计5
zhengyongxing 3151e8b456 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ce58d63aa5 充值汇总bug修正
zhanglingsheng 7f9ec687cb 行为日志显示bug
zhengyongxing 69ad354ff7 数据权限bug修正
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
chenzhi 1450d05677 公会统计5
liuweiwen 0695a22472 导出数据权限
liuweiwen 96bf040f98 导出数据权限
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天
zhengchanglong e99e96dfb1 添加管理员生日字段默认今天
liuweiwen 62f5098df7 处理数据权限筛选时，不覆盖原有的搜索字段promote_id
liuweiwen a9a6b49148 空格
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新
sunke 4e737c3e6a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng b4f6c58e42 Merge branch 'release-1.0.0' into dev
zhanglingsheng df4f7fc511 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 375bbac885 行为日志
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新
chenzhi c05698e991 公会统计4
liuweiwen 4bf6352f9d 导出添加数据权限
chenzhi 6e97bd3bbe Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi b94fb8d794 公会统计4
sunke 5f24c670b8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
liuweiwen 31790a7e51 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限 
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
zhengyongxing 48437d25c2 数据权限导出修改
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 46c7c85b68 超级签详情样式
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev
yulingwei 63d945b4df 修改样式
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限 
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
yulingwei f33ec364c3 修复 in 问题
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev
yulingwei bc7c6b493c 修复问题
liuweiwen 4ed57dcda1 增加注释
liuweiwen 7f57b53646 渠道统计列表
liuweiwen af541bface 平台统计列表
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev
yulingwei 36b295919a 修复问题
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
zhanglingsheng 83ce328062 超级订单搜索导出
liuweiwen 279e6d4d81 Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics
zhanglingsheng c112391dea 超级订单搜索导出
liuweiwen cdbf059ee4 平台币直充明细列表，搜索，导出 
内充支出明细列表，搜索，导出
sunke 0d1e68e449 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新
zhanglingsheng cbbbf6350c 超级签统计--导出
chenzhi 28e13f4c76 公会聚合3
chenzhi 7f86924778 公会优化3
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新
yulingwei d1bc94e438 修改问题
zhanglingsheng b3a98a5f29 超级签统计
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 09ba38fc79 超级签统计
chenzhi 06742203f7 公会统计3
yulingwei cd34df0bda 修改时间统计
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev
zhengchanglong 25a4138842 扶持管理字眼改成资源管理
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php