1509 Commits (e596d11cee6d40aa09bff62efbfefd5e6e541858)

Author SHA1 Message Date
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
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
chenzhi 12966e83bd 优化玩家列表数据显示规则 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 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
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
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 a45fde72dd 非管理员数据导出隐藏 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
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 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 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 546a7029cd bug修复:游戏充值-》补单没权限提示内容为空的问题 5 years ago
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计,增加判断当前管理员是否有官方渠道权限 5 years ago
chenzhi b743cd73e1 新增导出csv函数 5 years ago
chenzhi e4b6cdea85 公会修改6 5 years ago
liuweiwen 69e3843a56 修改文字 5 years ago
liuweiwen b8e5d719d5 修复bug:推广员-》数据管理-》实时充值,解决昨日充值与今日充值筛选时间未生效的问题 5 years ago
zhengyongxing ba59b41fb9 数据权限官方渠道添加 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
chenzhi c6f2794a3b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 5 years ago
chenzhi f480cd6b7a 优化给推广员发放平台币时菜单问题 5 years ago
liuweiwen 21e90e6cb3 Merge branch 'dev_permission' into release-1.0.0 5 years ago
liuweiwen fe5ae6a499 搜索的推广员数据权限 5 years ago
zhengyongxing 153f731b55 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx 5 years ago
zhengyongxing e8c3f021b6 角色查询导出修改 5 years ago
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新 5 years ago
liuweiwen 4fca3e8288 修改返回按钮样式 5 years ago
chenzhi b97a956cbc 公会统计5 5 years ago
liuweiwen 511b780f72 返回跳转 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
zhengyongxing ce0e9f943d 数据权限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
zhengyongxing 69ad354ff7 数据权限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 62f5098df7 处理数据权限筛选时,不覆盖原有的搜索字段promote_id 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 df4f7fc511 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0 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
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 46c7c85b68 超级签详情样式 5 years ago
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 63d945b4df 修改样式 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 7f57b53646 渠道统计列表 5 years ago
liuweiwen af541bface 平台统计列表 5 years ago
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei 36b295919a 修复问题 5 years ago
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复 5 years ago
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj 5 years ago
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics 5 years ago
zhanglingsheng 83ce328062 超级订单搜索导出 5 years ago
liuweiwen 279e6d4d81 Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics 5 years ago
zhanglingsheng c112391dea 超级订单搜索导出 5 years ago
liuweiwen cdbf059ee4 平台币直充明细列表,搜索,导出
内充支出明细列表,搜索,导出
5 years ago
sunke 0d1e68e449 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng cbbbf6350c 超级签统计--导出 5 years ago
chenzhi 28e13f4c76 公会聚合3 5 years ago
chenzhi 7f86924778 公会优化3 5 years ago
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新 5 years ago
yulingwei d1bc94e438 修改问题 5 years ago
zhanglingsheng b3a98a5f29 超级签统计 5 years ago
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 09ba38fc79 超级签统计 5 years ago
chenzhi 06742203f7 公会统计3 5 years ago
yulingwei cd34df0bda 修改时间统计 5 years ago
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev 5 years ago
zhengchanglong 25a4138842 扶持管理字眼改成资源管理 5 years ago
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev 5 years ago
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
5 years ago
yulingwei 9f156f7be4 ltv优化 5 years ago
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源 5 years ago
chenzhi 929d5500c0 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics 5 years ago
chenzhi 33bf8c1ea7 公会统计2 5 years ago
chenxiaojun 8fd8ae006a 管理后台>推广员管理>公会分成管理--更新 5 years ago
sunke bafd5cf8d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/codemanage 5 years ago
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增 5 years ago
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增 5 years ago
liuweiwen 53a235379a 游戏订单查看-导出excell 5 years ago
liuweiwen 750572bc21 游戏订单查看增加开始时间与结束时间搜索 5 years ago
liuweiwen 39e3350dd9 游戏订单查看 5 years ago
sunke 60f2c62fe6 下载链接管理后台 5 years ago
chenxiaojun 8261512ba3 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
liuweiwen ead339046f 游戏统计 5 years ago
liuweiwen c0fac39c18 游戏统计 5 years ago
liuweiwen 5d6716b239 游戏统计 5 years ago
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi ff04347526 公会统计1 5 years ago
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing 5040b78473 登录日志修改 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 31af192402 解决冲突 5 years ago
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
liuweiwen b3fcf58932 推广员编辑推广公司 5 years ago
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen df1b878485 推广公司 5 years ago
liuweiwen d64d18144a 推广公司录入 5 years ago
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
chenzhi da79ff4441 优化角色权限2 5 years ago
zhengyongxing deaeed6027 数据授权修改内容提交 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhanglingsheng a15e62988b 游戏预充值-导出 5 years ago
chenzhi 1623f3ae65 优化多会长统计1 5 years ago
zhanglingsheng 621776246a SDK菜单添加隐藏 5 years ago
zhanglingsheng eaf1cb3f17 游戏区服联动修改 5 years ago
liuweiwen 6b1bbe4c20 数据授权修改 5 years ago
zhanglingsheng 47628f2981 游戏充值预下单 5 years ago
zhanglingsheng fb425d3e91 游戏充值预下单 5 years ago
zhengyongxing 21412df14e Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission 5 years ago
zhengyongxing 3aa3c3f66b 数据授权修改 5 years ago
zhanglingsheng e949a4a60b 游戏充值预下单 5 years ago
zhanglingsheng 95f7acd6ff 游戏充值预下单 5 years ago
zhanglingsheng 65e1ddbd93 游戏充值预下单 5 years ago
zhengchanglong 732ba257ec 修改身份证加密显示方式 5 years ago
zhengchanglong f88a5c7f6e Merge branch 'dev' into release-1.0.0 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 5 years ago
liuweiwen de7d34576d 添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
5 years ago
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission 5 years ago
liuweiwen 42ccd44de3 Merge branch 'dev_lww' into dev_permission
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/MendController.class.php
#	Application/Admin/Controller/PromoteController.class.php
#	Application/Admin/Model/MemberModel.class.php
5 years ago
zhengyongxing 2b336dd560 数据文件删除 5 years ago
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission
 Conflicts:
	Data/update.sql
5 years ago
liuweiwen 1212d3249e 添加数据权限
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0 5 years ago
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id 5 years ago
zhengchanglong 6851933966 新建分支 5 years ago
zhengyongxing d545c22c3b 数据管理功能提交 5 years ago
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing 5df3a59df4 扶持发放添加导出功能 5 years ago
zhengyongxing 6f584f8323 数据权限功能提交 5 years ago
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug 5 years ago
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
zhanglingsheng 6d2c4fc3a2 游戏充值预下单 5 years ago
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 62502f0732 游戏充值预下单 5 years ago
zhengyongxing e6c45bc494 推广补链导出修改 5 years ago
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
chenzhi db6131a135 暂存 5 years ago
zhengyongxing 46538019d4 管理后台新开发功能修改 5 years ago
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0 5 years ago
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev 5 years ago
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段 5 years ago
liuweiwen e30f2f9601 Merge branch 'dev' into dev_lww
# Conflicts:
#	Application/Admin/Controller/FileController.class.php
#	Application/Admin/Controller/GameController.class.php
#	Application/Admin/View/Game/edit.html
#	Application/Home/Controller/HomeController.class.php
#	Application/Home/View/default/Home/landingPage.html
#	Public/Home/css/index2.css
5 years ago
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链 5 years ago
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
zhengyongxing 8b2d04f986 管理后台新开发功能修改 5 years ago
zhengyongxing e2e685e8c3 管理后台新开发功能修改 5 years ago
chenzhi 60c7bdce34 新增补链时判断是否已结算 5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新 5 years ago
chenzhi 1ccbd03a0f 超级签新增支付方式 5 years ago
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng ad97083c9f 行为日志文案 5 years ago
chenzhi 0c62e80e67 优化总览表格高度 5 years ago
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 5 years ago
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
liuweiwen 188abdcbdd 落地页视频置顶判断 5 years ago
zhengyongxing 7b12780d9c 管理后台新开发功能修改 5 years ago
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi 1010fe2674 推广补链新增查询条件 5 years ago
chenzhi 3d672db381 推广补链新增一系列查询条件 5 years ago
ELF c451921b92 后台添加IOS打包方式选择 5 years ago
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 14644b44a2 落地页图片改为使用游戏截图 5 years ago
zhanglingsheng f8498638ad 游戏充值行为日志 5 years ago
zhanglingsheng f392ad4de0 游戏充值行为日志 5 years ago
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi df50ce6352 补链csv导出 5 years ago
liuweiwen c31ae44f79 落地页去掉App购买 5 years ago
chenzhi 5359e67860 优化补链记录为ajax 5 years ago
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示 5 years ago
liuweiwen 04bd089bd9 上传视频格式提示 5 years ago
chenzhi f8cbe8d9ef 分开推广补链和补链记录 5 years ago
zhengyongxing fd187aa04f 白名单修改 5 years ago
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 70aab2f137 角色查询新增创角时间区间查询 5 years ago
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表 5 years ago
zhengyongxing fa393d9c90 管理后台新增功能添加 5 years ago
liuweiwen 563b672c21 加提示 5 years ago
liuweiwen 14258a01a9 前端判断上传视频的大小与格式 5 years ago
liuweiwen a1bdc4b936 提示 5 years ago
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
liuweiwen b0748243b9 编辑游戏-》上传视频 5 years ago
liuweiwen fb5d9afded 落地页视频上传和显示 5 years ago
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
5 years ago
chenzhi 768c03c78d 优化总览导出为前端导出 5 years ago
liuweiwen 522ba58a4d 推广公司 5 years ago
liuweiwen 59b1e3149e 管理后台-推广公司搜索 5 years ago
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi c2fb23f9a2 优化用户列表结束 5 years ago
chenzhi d948dee3df 用户列表优化3 5 years ago
liuweiwen 3c6ca71bb6 解绑手机 5 years ago
chenzhi 20ff424e52 优化用户列表4 5 years ago
chenzhi 03a03fd61e 优化用户列表3 5 years ago
chenzhi d4968e4c72 优化推广员 5 years ago
zhengyongxing 4df0f91f43 管理后台上传图片修改 5 years ago
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小 5 years ago
liuweiwen a7c5957201 推广公司管理 5 years ago
liuweiwen fd7481a940 风控管理样式调整 5 years ago
liuweiwen 93d46b74ae 样式调整 5 years ago
chenzhi 3f358bb818 优化用户列表2 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
chenzhi 4aa9ac6767 用户表优化1 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改 5 years ago
zhengyongxing 30b3794ef4 管理后台导出数据bug修正 5 years ago
zhengyongxing 4f385a87c6 管理后台导出数据修改 5 years ago
zhengyongxing fbead8c3a1 推广补链导出修改 5 years ago
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi d48b0f1341 优化统计 5 years ago
zhengyongxing 65fd27fe36 导出修改 5 years ago
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
chenzhi dbc77d07e7 优化聚合排序 5 years ago
chenzhi cfa67f9e3e 总览统计结束 5 years ago
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev 5 years ago
zhengyongxing ba85fc8c76 游戏充值导出修正 5 years ago
chenzhi e1c29c73af 总览统计结束 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liuweiwen 97a7aa7437 落地页 5 years ago
liuweiwen 6c529e7bbd 统计 5 years ago
chenzhi e763abbf92 123. 5 years ago