1112 Commits (cbbbcfd8ffecb7b3352acc40ff5cfa1a2024daca)

Author SHA1 Message Date
liuweiwen 2db651ae9c Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen bc28933369 游戏订单查看-》导出通知成功数据 5 years ago
zhengyongxing e055cc27d5 ajax游戏区服搜索设备非必填 5 years ago
liuweiwen 6dbfd09e91 编辑推广员时推广公司必填 5 years ago
zhengyongxing ea80b8fd44 游戏充值统计检索条件修正 5 years ago
zhengyongxing d59e8633c6 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 2f25386518 游戏充值统计检索条件修正 5 years ago
ELF 841bf0c0b9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 9bf45ae0d3 修改 5 years ago
zhengyongxing b96e65b8fe 游戏充值统计检索条件修正 5 years ago
chenzhi f38e007d80 优化渠道的公司检索 5 years ago
chenzhi 47595c81b8 优化公会统计公司 5 years ago
chenzhi c590b948ef 优化推广员充值统计导出 5 years ago
chenzhi 0a006bbcc2 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi fd23b640ea 优化推广员充值优化代码 5 years ago
zhengyongxing 13f5128dd8 支付渠道统计导出bug修正,游戏充值充值方式检索修正 5 years ago
zhengyongxing dd86fbaddf 支付渠道统计bug修正 5 years ago
zhengyongxing b5c06df195 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing 4e3206a5c1 支付渠道统计bug修正 5 years ago
chenzhi 5e246dde2b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 85b821081f 优化推广员充值统计今日本周本月不变 5 years ago
zhanglingsheng 683fc44d94 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 9b65fbaabb 超级签统计 5 years ago
chenzhi a61e0f36b5 优化注册统计今日本周本月不变 5 years ago
zhanglingsheng befc2ef62b 超级签统计 5 years ago
zhanglingsheng 244e036a21 超级签统计 5 years ago
ELF a167c51582 Merge branch 'dev' into release-1.0.0 5 years ago
yulingwei e97b1ed22e Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 65ed103d3a 修复beta链接格式 5 years ago
liuweiwen 4c327a679a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
# Conflicts:
#	Application/Admin/Controller/ExportController.class.php
#	Application/Admin/Controller/PlatformController.class.php
5 years ago
liuweiwen e40b92a0d7 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变 5 years ago
zhengyongxing b0899f3fc9 支付渠道统计bug修正,官网与推广后台充值计入平台币 5 years ago
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng 56da5cd85a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置 5 years ago
liuweiwen 1e9409ef1a 优化-【统计】-【平台统计】-【游戏注册】、【游戏充值统计】、【注册方式统计】和【充值方式统计】的今日充值、本周充值、本月充值不根据时间筛选改变 5 years ago
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置 5 years ago
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 24c2ea0031 优化区服预告的区服选择 5 years ago
yulingwei 53b4bfa0b8 Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 30922605e2 修复 5 years ago
yulingwei a851b31cb6 Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 6671565b5e 修复问题 5 years ago
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0 5 years ago
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 931893640a 修改问题 5 years ago
chenzhi fe06fded2a 优化区服列表,隐藏操作,新增id 5 years ago
zhengyongxing c1e16ed8d4 推广员充值统计汇总为当前页面的总额,改为所有数据的总和 5 years ago
zhengyongxing 79f74dfbd4 支付渠道游戏订单导出bug修正 5 years ago
ELF ea15b6427c 修改落地页 5 years ago
ELF bf5ad7aa85 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 7f6730a562 修改留存率bug 5 years ago
zhengyongxing f8092fa9e5 支付渠道游戏订单bug修正 5 years ago
zhanglingsheng 3a7c4c9bad 超级签统计--合计 5 years ago
zhanglingsheng 6d34f317a1 超级签统计--合计金额 5 years ago
zhengchanglong 8fc5190830 Merge branch 'master_hotfix' into dev 5 years ago
zhengchanglong 56750b3829 Merge branch 'master_hotfix' into release-1.0.0 5 years ago
chenzhi 652b193f71 优化玩家列表设备号赛选 5 years ago
zhengchanglong f640531c0b Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong dc57a5e5f4 Merge branch 'master_hotfix' into release-1.0.0 5 years ago
zhengyongxing f8b570c20e 支付渠道统计bug修正 5 years ago
chenzhi 3561a87d4a 优化玩家列表数据 5 years ago
liuweiwen ed0283aff6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen d31c2f28f3 游戏统计 5 years ago
zhengyongxing 9b4ebd6c29 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengyongxing 7a98ee81cb 支付渠道统计bug修正 5 years ago
liuweiwen 93c5e311a6 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 4f96c4728d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen c58f88fe7f Merge branch 'master_hotfix' into dev 5 years ago
liuweiwen 765188890b like 加前%导致没用索引 5 years ago
zhengyongxing 444c4e61f2 支付渠道统计bug修正 5 years ago
zhengyongxing 7ed0be2a29 支付渠道统计bug修正 5 years ago
chenzhi b4972959f7 优化公会渠道为空问题 5 years ago
chenzhi 769cbb9e37 优化玩家列表检索方式及导出 5 years ago
liuweiwen 1def746be4 修改excel路径 5 years ago
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi d3ccc3bb5b 暂存 5 years ago
yulingwei d172b0ec8b Merge branch 'feature/ltv' into dev 5 years ago
yulingwei 2f36d3eb1c 新增bata链接和开关 5 years ago
liuweiwen 78e1fefbc7 推广员账号判断 5 years ago
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
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮 5 years ago
chenxiaojun 2559aa32e9 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 6b8e277fb1 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhengyongxing 628ea84935 平台币收回修正 5 years ago
zhengyongxing 5daf1eb565 支付渠道查询修改 5 years ago
sunke 2f83a85690 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计,增加判断当前管理员是否有官方渠道权限 5 years ago
chenzhi e4b6cdea85 公会修改6 5 years ago
liuweiwen b8e5d719d5 修复bug:推广员-》数据管理-》实时充值,解决昨日充值与今日充值筛选时间未生效的问题 5 years ago
zhanglingsheng 2ec116a017 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng a9c2207ba2 行为日志 5 years ago
zhanglingsheng 837aec6659 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng 855b567a02 行为日志 5 years ago
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的 5 years ago
chenzhi 1244156518 优化总览统计 5 years ago
zhengyongxing d465be8969 数据权限提交 5 years ago
chenzhi a877b475f5 优化总览脚本 5 years ago
zhengyongxing e8c3f021b6 角色查询导出修改 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi b97a956cbc 公会统计5 5 years ago
zhengyongxing 7779535fb6 数据权限 5 years ago
liuweiwen ee98ca39bb 推广公司 5 years ago
liuweiwen ee2fc154a4 推广公司 5 years ago
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 904b707cf4 公会统计5 5 years ago
zhanglingsheng f3a80b73b8 行为日志显示bug 5 years ago
chenzhi 86db958ca7 将txt文件全部移入runtime 5 years ago
zhanglingsheng 043de55e0b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
zhanglingsheng c6a89f5fe1 行为日志BUG 5 years ago
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhanglingsheng eaa5066324 行为日志bug 5 years ago
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新 5 years ago
zhengyongxing 5f3e71e8a8 数据权限bug修正 5 years ago
zhengyongxing e7b2f57a93 数据权限bug修正 5 years ago
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi 9104c0865c 公会统计5 5 years ago
zhengyongxing 3151e8b456 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing ce58d63aa5 充值汇总bug修正 5 years ago
zhanglingsheng 7f9ec687cb 行为日志显示bug 5 years ago
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
5 years ago
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
5 years ago
chenzhi 1450d05677 公会统计5 5 years ago
liuweiwen 0695a22472 导出数据权限 5 years ago
liuweiwen 96bf040f98 导出数据权限 5 years ago
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天 5 years ago
zhengchanglong e99e96dfb1 添加管理员生日字段默认今天 5 years ago
liuweiwen a9a6b49148 空格 5 years ago
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新 5 years ago
sunke 4e737c3e6a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng b4f6c58e42 Merge branch 'release-1.0.0' into dev 5 years ago
zhanglingsheng 375bbac885 行为日志 5 years ago
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi c05698e991 公会统计4 5 years ago
liuweiwen 4bf6352f9d 导出添加数据权限 5 years ago
chenzhi 6e97bd3bbe Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics 5 years ago
chenzhi b94fb8d794 公会统计4 5 years ago
sunke 5f24c670b8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
liuweiwen 31790a7e51 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 5 years ago
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
5 years ago
zhengyongxing 48437d25c2 数据权限导出修改 5 years ago
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev 5 years ago
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
5 years ago
yulingwei f33ec364c3 修复 in 问题 5 years ago
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei bc7c6b493c 修复问题 5 years ago
liuweiwen 4ed57dcda1 增加注释 5 years ago
liuweiwen af541bface 平台统计列表 5 years ago
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 36b295919a 修复问题 5 years ago