3028 Commits (1e4b7f69d518473ddca699bc2be2d3d0ca96f003)

Author SHA1 Message Date
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
ELF b1844a0082 修改落地页 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
ELF 31723fbc0b 修改bug 5 years ago
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除 5 years ago
ELF bfd8d2d6f4 修改bug 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
chenzhi 901d780165 优化公会弹框游戏选择 5 years ago
zhengchanglong a69c7c19ab Merge branch 'dev' into release-1.0.0 5 years ago
zhengchanglong f640531c0b Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 8615caa33f 游戏统计-搜索 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
ELF aa0ec5758a 修改 5 years ago
ELF 727795050c 修改 5 years ago
ELF cd6f6e5610 修改 5 years ago
ELF eddc5eb7a6 修改 5 years ago
ELF b20e7f233b Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF a1862fd240 修改 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
ELF 4b46cd4563 修改 5 years ago
ELF 4536b77714 修改 5 years ago
ELF 18e39c5fc7 修改 5 years ago
ELF 6621467b58 修改 5 years ago
ELF 5c7d699353 修改落地页 5 years ago
ELF 0405ada382 修改落地页 5 years ago
ELF 51086b0c94 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 1de7a0f3ac 修改落地页 5 years ago
zhengyongxing 444c4e61f2 支付渠道统计bug修正 5 years ago
ELF cb74200850 修改落地页 5 years ago
ELF 2373eb5ae3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF d7b244e5d5 修改落地页 5 years ago
zhengyongxing 7ed0be2a29 支付渠道统计bug修正 5 years ago
ELF 4ae7fab2bf Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 48b18db141 修改落地页 5 years ago
chenzhi 882fec0390 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi b4972959f7 优化公会渠道为空问题 5 years ago
liuweiwen 69013539cd 修改excel路径,自动跳过excel为空的行 5 years ago
chenzhi 769cbb9e37 优化玩家列表检索方式及导出 5 years ago
liuweiwen 1def746be4 修改excel路径 5 years ago
chenzhi 469db01864 优化玩家列表说明 5 years ago
chenzhi 2433844bf2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 82afa60d12 优化玩家列表导出2 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
zhanglingsheng 39f1ea9d0c 超级签统计--样式 5 years ago
ELF 52a8785af1 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 6e55b657a4 修改落地页 5 years ago
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 12966e83bd 优化玩家列表数据显示规则 5 years ago
ELF 2b2d7c6830 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
ELF 182a241f4e 修改落地页 5 years ago
zhanglingsheng 35375a0c01 超级签统计--JS 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 263937f83e 落地页增加登录注册等静态页面 5 years ago
liuweiwen 9236c4135a Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen fb4b017515 导出搜索时间修改 5 years ago
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
tping 127be94d60 充值补单 5 years ago
zhengyongxing 5f4b02b9c5 超级签订单菜单修正 5 years ago
liuweiwen 3244238849 修改文字 5 years ago
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动
直充支出明细多条数据可滚动
5 years ago
chenzhi 34aac60bfa Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 44407cdb89 优化游戏选择公司联动 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
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 795c1983ad 优化官方渠道没有渠道查看 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
chenzhi a6ad40b45a 公会统计新增返回按钮 5 years ago
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题 5 years ago
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 9549812c41 修复第二页数据不显示问题 5 years ago
zhengyongxing 65e13bbcc5 测试白名单bug修正 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 9b7f3d1104 优化csv导出默认为不转码 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
chenzhi cceae049bb Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi d1cca460be 优化公会统计游戏搜索框 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
liuweiwen 26726f32bf 游戏统计下拉框改为select2 5 years ago
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev 5 years ago
zhengyongxing 7eb430f746 渠道统计bug修正 5 years ago
ELF da5e8b9050 修改 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
chenzhi 116dc2c86f 优化三角色说明 5 years ago
chenzhi 1f4490733a 优化推广员注册用户 5 years ago
chenzhi 0cec46ed37 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi 8c577ec4af 新增平台统计说明 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 6241fb427d 修改添加管理员密码key不同问题 5 years ago
liuweiwen 3e5dbd6571 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 20bee7bbc9 管理后台登录时间改为1小时 5 years ago
chenzhi 0890e39675 公会统计首页新增分页 5 years ago
chenzhi 85e474c299 公会统计首页新增分页 5 years ago
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口 5 years ago
chenzhi cf89e73281 优化csv导出函数 5 years ago
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev 5 years ago
zhengyongxing a2c4e3f2e3 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhengyongxing 792906e448 平台币充值功能添加 5 years ago
liuweiwen fcbd598e3c 管理后台登录时间改为1小时 5 years ago
zhengyongxing eb187fa8d8 超级签详情链接添加 5 years ago
chenzhi 629c733742 删除函数重复问题 5 years ago
zhengchanglong dba78c08cd 非管理员数据导出隐藏 5 years ago
zhengchanglong a3f2edb3e1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong a45fde72dd 非管理员数据导出隐藏 5 years ago
liuweiwen 7b4cd74a23 落地页 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengyongxing 09924a5cc3 超级签详情链接添加 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
liuweiwen 8a512aedc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen ab27c53da4 修改提示 5 years ago
zhengyongxing a7e747e639 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing ac6f980d03 角色权限返回样式调整 5 years ago
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev 5 years ago
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
zhengchanglong 42542ff640 非管理员数据加密显示 5 years ago
liuweiwen eb6c65522d 修改提示 5 years ago
zhengyongxing 17e4084192 角色权限返回调整 5 years ago
liuweiwen 1ba7f6130a Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen cc1e3ccbb3 推广员账号已存在判断 5 years ago
zhengyongxing b8859837fb 登录数据权限数据 5 years ago
liuweiwen 2b4c9b6f44 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen dfa5316ef1 推广员状态默认为待审核 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
liuweiwen e32491c108 bug修复,解决点击搜索框后下拉显示异常 5 years ago
ELF b36e1f1bc9 解决冲突 5 years ago
ELF c90851996c 修改bug 5 years ago
zhengyongxing d1a5b63be2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics 5 years ago
chenzhi d82863fdba 优化官网支付 5 years ago
chenzhi 26da0db3dd 官网支付结果优化 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 0a8865e335 菜单修正 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 5da02389ac 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 81306967d2 推广平台>数据管理>充值玩家--更新 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 73aebd513c 落地页测试 5 years ago
liuweiwen dabdbb6c98 落地页测试 5 years ago
liuweiwen b608f8587b 落地页测试 5 years ago
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计,增加判断是否有官方渠道权限 5 years ago
liuweiwen 5bebb747f7 落地页样式调整测试 5 years ago
sunke 7e68257724 充值玩家 5 years ago
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago