881 Commits (b0899f3fc92b83a05eaf363d94d034269992da38)

Author SHA1 Message Date
liuweiwen 600ac3fd9e 添加推广员时推广公司必填 5 years ago
chenzhi 12966e83bd 优化玩家列表数据显示规则 5 years ago
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng 3a3afa739c 超级签统计--搜索修改 5 years ago
sunke ec1cb552d0 落地页管理检索初始化 5 years ago
liuweiwen fb4b017515 导出搜索时间修改 5 years ago
tping 127be94d60 充值补单 5 years ago
zhengyongxing 17821039ab Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengyongxing bd39f880fe 平台统计修正 5 years ago
tping 964eea79e5 1, 平台币补单
2,repair_pay表
5 years ago
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 1291009a02 游戏统计搜索时间范围 5 years ago
zhengyongxing 1922e29542 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengyongxing 2d63204546 支付渠道统计权限注释 5 years ago
chenzhi 23306ba33b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 4ab8977f06 取消财务管理数据权限 5 years ago
zhengyongxing 80ebdc7f80 支付渠道统计添加权限 5 years ago
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索 5 years ago
liuweiwen 491f8526bb Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen aaabd0a07f 游戏统计搜索时间范围 5 years ago
zhengchanglong bf6a61f41d Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen b1e9127e9d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 7b87c7718d 游戏统计搜索时间范围 5 years ago
zhanglingsheng 087a935c45 补单记录 5 years ago
zhanglingsheng 93123b3b95 订单记录 5 years ago
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 88c1cdcd1b 解决冲突 5 years ago
tping 5af705c2f9 通知到账 5 years ago
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev 5 years ago
zhengyongxing 7eb430f746 渠道统计bug修正 5 years ago
zhengchanglong 42c508edee Merge remote-tracking branch 'origin/dev' into dev 5 years ago
ELF 67dd874ccf 修改 5 years ago
chenzhi 5f70aa78d8 优化补链记录 5 years ago
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 27b4eaded5 Merge branch 'dev_statistics' into dev 5 years ago
zhengyongxing 261adfa33c 渠道统计bug修正 5 years ago
zhengyongxing 6e5cfb72b4 渠道统计bug修正 5 years ago
zhengyongxing 4068c12480 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengyongxing 3dbab290e6 Merge branch 'dev_statistics' into dev 5 years ago
zhengyongxing e506f45ed2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
zhengyongxing 44dac56d85 渠道统计bug修正 5 years ago
chenzhi 9dcc55d472 优化用户列表选择设备无响应问题 5 years ago
liuweiwen 9ac0277f82 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen cfd032b1fa 推广员统计 5 years ago
chenzhi 7a82b930bf 优化区服选择不响应问题 5 years ago
chenzhi 8b968fc9fb 优化区服选择无效问题 5 years ago
chenzhi c0a0f44287 优化推广员注册统计->区服选择不相应bug 5 years ago
ELF 8d934c8d88 修改 5 years ago
chenxiaojun 92b0bc2c87 公会分成管理--更新 5 years ago
chenxiaojun ec273ab157 公会分成管理--更新 5 years ago
zhengyongxing 66d098a81b 数据权限跳转提示去除,直接跳转 5 years ago
chenzhi 0890e39675 公会统计首页新增分页 5 years ago
chenzhi 85e474c299 公会统计首页新增分页 5 years ago
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev 5 years ago
zhengchanglong dba78c08cd 非管理员数据导出隐藏 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengyongxing 5417e1751d 平台统计修改 5 years ago
zhengyongxing 32e362ab80 平台统计修改 5 years ago
zhengyongxing 8f1847341f Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 6255d05472 平台统计修改 5 years ago
liuweiwen 0d088037da 登录记录查询强制索引 5 years ago
liuweiwen 5b1a4db378 登录记录 5 years ago
liuweiwen 2e818c04f8 登录记录搜索 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen cc1e3ccbb3 推广员账号已存在判断 5 years ago
chenzhi 624e321b70 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 96e52b267a 修复没总览依旧显示问题 5 years ago
liuweiwen 2096c22826 注释 5 years ago
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录
改为展示这个会长及其所属推广员的登录记录
5 years ago
zhengchanglong 1ca183b547 非管理员数据加密显示 5 years ago
zhengchanglong 4d06b52b9d Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong c6b8f99b6e 非管理员数据加密显示 5 years ago
chenzhi b3e09ad5db 放行ajax,首页无权限判断 5 years ago
zhengchanglong 9a2a7df2e6 非管理员数据加密显示 5 years ago
chenzhi 700114cb4c Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
chenzhi ae3e5d4048 公会导出结束 5 years ago
zhengchanglong cc6d095a1c 非管理员数据加密显示 5 years ago
chenzhi 2651a94408 公会导出2 5 years ago
zhengyongxing 10aa8cf81c 月结统计导出添加 5 years ago
zhengchanglong 4968ace29d Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php
5 years ago
zhengchanglong dbaf93b630 非管理员数据加密显示 5 years ago
ELF b36e1f1bc9 解决冲突 5 years ago
zhengyongxing d1a5b63be2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
zhengyongxing 71df0ab08b 菜单修正 5 years ago
chenzhi ba6947987b Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
chenzhi e414013f8b 优化导出2 5 years ago
zhengyongxing b8d736c337 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
zhengyongxing 00f33befa2 平台币收回修正 5 years ago
chenxiaojun 206c2ed251 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi c5dc3b4f22 优化会长统计导出1 5 years ago
chenxiaojun 1f19360d72 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 81fb39c004 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计,增加判断是否有官方渠道权限 5 years ago
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
sunke 1699c155e8 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
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
5 years ago
chenzhi 7c81377095 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
chenzhi cb99c63223 公会统计6 5 years ago