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

955 Commits (4e1567f01380606cfefc2689dda4701ef9d49a84)

Author SHA1 Message Date
zhengchanglong 56750b3829 Merge branch 'master_hotfix' into release-1.0.0
chenzhi 652b193f71 优化玩家列表设备号赛选
zhengchanglong f640531c0b Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong dc57a5e5f4 Merge branch 'master_hotfix' into release-1.0.0
zhengyongxing f8b570c20e 支付渠道统计bug修正
chenzhi 3561a87d4a 优化玩家列表数据
liuweiwen ed0283aff6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen d31c2f28f3 游戏统计
zhengyongxing 9b4ebd6c29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 7a98ee81cb 支付渠道统计bug修正
liuweiwen 93c5e311a6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 4f96c4728d Merge remote-tracking branch 'origin/dev' into dev
liuweiwen c58f88fe7f Merge branch 'master_hotfix' into dev
liuweiwen 765188890b like 加前%导致没用索引
zhengyongxing 444c4e61f2 支付渠道统计bug修正
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
chenzhi b4972959f7 优化公会渠道为空问题
chenzhi 769cbb9e37 优化玩家列表检索方式及导出
liuweiwen 1def746be4 修改excel路径
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi d3ccc3bb5b 暂存
yulingwei d172b0ec8b Merge branch 'feature/ltv' into dev
yulingwei 2f36d3eb1c 新增bata链接和开关
liuweiwen 78e1fefbc7 推广员账号判断
liuweiwen 600ac3fd9e 添加推广员时推广公司必填
chenzhi 12966e83bd 优化玩家列表数据显示规则
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 3a3afa739c 超级签统计--搜索修改
sunke ec1cb552d0 落地页管理检索初始化
liuweiwen fb4b017515 导出搜索时间修改
tping 127be94d60 充值补单
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing bd39f880fe 平台统计修正
tping 964eea79e5 1, 平台币补单 
2，repair_pay表
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
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 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 游戏统计搜索时间范围
zhanglingsheng 087a935c45 补单记录
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
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 优化用户列表选择设备无响应问题
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 数据权限跳转提示去除，直接跳转
chenzhi 0890e39675 公会统计首页新增分页
chenzhi 85e474c299 公会统计首页新增分页
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev
zhengchanglong dba78c08cd 非管理员数据导出隐藏
chenzhi 0ef4241570 合并statistcs
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 登录记录搜索
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
liuweiwen cc1e3ccbb3 推广员账号已存在判断
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 非管理员数据加密显示
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 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 126d1ca9bc 管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
chenzhi e4b6cdea85 公会修改6
liuweiwen b8e5d719d5 修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
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 优化总览脚本
zhengyongxing e8c3f021b6 角色查询导出修改
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新
chenzhi b97a956cbc 公会统计5
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