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

669 Commits (79f9801351d0a0df76ac8f16c24629c0dc160262)

Author SHA1 Message Date
ELF 9b5697a859 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
ELF 1fcbe2dd65 Merge branch 'dev' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng 59709fa295 游戏--添加支付方式渠道配置
zhanglingsheng 669baefe5e 游戏--添加支付方式渠道配置
chenzhi 0ec79e6cb9 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 24c2ea0031 优化区服预告的区服选择
ELF 8a2f36b5a3 Merge branch 'dev' into release-1.0.0
yulingwei fe8a99b0ec Merge branch 'feature/ltv' into dev
yulingwei 931893640a 修改问题
chenzhi fe06fded2a 优化区服列表，隐藏操作，新增id
zhengyongxing e8313dd92b 支付渠道统计时间筛选历史记录去除
ELF bf5ad7aa85 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 7f6730a562 修改留存率bug
chenzhi 901d780165 优化公会弹框游戏选择
liuweiwen 8615caa33f 游戏统计-搜索
zhengyongxing 7ed0be2a29 支付渠道统计bug修正
liuweiwen 69013539cd 修改excel路径,自动跳过excel为空的行
liuweiwen 1def746be4 修改excel路径
chenzhi 469db01864 优化玩家列表说明
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 600ac3fd9e 添加推广员时推广公司必填
zhanglingsheng 39f1ea9d0c 超级签统计--样式
chenzhi c602946088 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 12966e83bd 优化玩家列表数据显示规则
zhanglingsheng 35375a0c01 超级签统计--JS
zhanglingsheng 6ffd20525d Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 3a3afa739c 超级签统计--搜索修改
zhengyongxing 237faf5956 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhengyongxing 5f4b02b9c5 超级签订单菜单修正
liuweiwen 3244238849 修改文字
liuweiwen 82c76cbbba Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ea3cdf26d8 游戏统计搜索合作公司与游戏联动 
直充支出明细多条数据可滚动
chenzhi 44407cdb89 优化游戏选择公司联动
chenzhi e1ad428dfe Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 795c1983ad 优化官方渠道没有渠道查看
liuweiwen adaa402a14 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1291009a02 游戏统计搜索时间范围
chenzhi a6ad40b45a 公会统计新增返回按钮
chenzhi 6288e5e64e 优化游戏列表搜索推广员没掉问题
chenzhi 43ba5afd45 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9549812c41 修复第二页数据不显示问题
zhengyongxing 65e13bbcc5 测试白名单bug修正
zhengyongxing 80ebdc7f80 支付渠道统计添加权限
chenzhi 5bbe0c1dcd Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 9d89be4527 优化公司游戏名游戏类型关系检索
liuweiwen aaabd0a07f 游戏统计搜索时间范围
chenzhi d1cca460be 优化公会统计游戏搜索框
zhanglingsheng 93123b3b95 订单记录
ELF de81412aef Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
ELF 88c1cdcd1b 解决冲突
tping 5af705c2f9 通知到账
liuweiwen 26726f32bf 游戏统计下拉框改为select2
zhengyongxing e4f49e91c2 Merge branch 'dev_statistics' into dev
zhengyongxing 7eb430f746 渠道统计bug修正
ELF 67dd874ccf 修改
zhengchanglong 616c7f583f Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Data/update.sql
chenzhi 116dc2c86f 优化三角色说明
chenzhi 1f4490733a 优化推广员注册用户
chenzhi 8c577ec4af 新增平台统计说明
chenzhi 7a82b930bf 优化区服选择不响应问题
ELF 8d934c8d88 修改
chenxiaojun 92b0bc2c87 公会分成管理--更新
chenxiaojun ec273ab157 公会分成管理--更新
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev
zhengyongxing 792906e448 平台币充值功能添加
zhengyongxing eb187fa8d8 超级签详情链接添加
zhengchanglong dba78c08cd 非管理员数据导出隐藏
zhengchanglong a45fde72dd 非管理员数据导出隐藏
chenzhi 0ef4241570 合并statistcs
zhengyongxing 09924a5cc3 超级签详情链接添加
liuweiwen 8a512aedc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen ab27c53da4 修改提示
zhengyongxing a7e747e639 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ac6f980d03 角色权限返回样式调整
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
zhengchanglong 01c79143b1 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong 42542ff640 非管理员数据加密显示
liuweiwen eb6c65522d 修改提示
zhengyongxing 17e4084192 角色权限返回调整
liuweiwen cc1e3ccbb3 推广员账号已存在判断
liuweiwen dfa5316ef1 推广员状态默认为待审核
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录 
改为展示这个会长及其所属推广员的登录记录
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong c6b8f99b6e 非管理员数据加密显示
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 非管理员数据加密显示
liuweiwen e32491c108 bug修复，解决点击搜索框后下拉显示异常
chenzhi ba6947987b Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi e414013f8b 优化导出2
zhengyongxing 0a8865e335 菜单修正
zhengyongxing b8d736c337 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 00f33befa2 平台币收回修正
chenzhi c5dc3b4f22 优化会长统计导出1
sunke 5b7a0ad8b2 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 非管理员数据加密显示和隐藏导出按钮
zhengyongxing 5daf1eb565 支付渠道查询修改
sunke 2f83a85690 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
liuweiwen 546a7029cd bug修复：游戏充值-》补单没权限提示内容为空的问题
liuweiwen 69e3843a56 修改文字
zhengyongxing d465be8969 数据权限提交
chenzhi c6f2794a3b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi f480cd6b7a 优化给推广员发放平台币时菜单问题
liuweiwen 21e90e6cb3 Merge branch 'dev_permission' into release-1.0.0
liuweiwen fe5ae6a499 搜索的推广员数据权限
zhengyongxing 153f731b55 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing e8c3f021b6 角色查询导出修改
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新
liuweiwen 4fca3e8288 修改返回按钮样式
chenzhi b97a956cbc 公会统计5
liuweiwen 511b780f72 返回跳转
liuweiwen ee2fc154a4 推广公司
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 904b707cf4 公会统计5
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新
chenzhi 9104c0865c 公会统计5
zhengyongxing 69ad354ff7 数据权限bug修正
zhengchanglong e08a2eb3ce Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Admin/Controller/access_data_foldline.txt
#	Data/update.sql
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
chenzhi 1450d05677 公会统计5
liuweiwen 96bf040f98 导出数据权限
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新
chenzhi c05698e991 公会统计4
liuweiwen 4bf6352f9d 导出添加数据权限
chenzhi 6e97bd3bbe Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi b94fb8d794 公会统计4
sunke 5f24c670b8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 46c7c85b68 超级签详情样式
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev
yulingwei 63d945b4df 修改样式
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev
yulingwei bc7c6b493c 修复问题
liuweiwen 7f57b53646 渠道统计列表
liuweiwen af541bface 平台统计列表
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev
yulingwei 36b295919a 修复问题
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
zhanglingsheng 83ce328062 超级订单搜索导出
liuweiwen 279e6d4d81 Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics
zhanglingsheng c112391dea 超级订单搜索导出
liuweiwen cdbf059ee4 平台币直充明细列表，搜索，导出 
内充支出明细列表，搜索，导出
sunke 0d1e68e449 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新
zhanglingsheng cbbbf6350c 超级签统计--导出
chenzhi 7f86924778 公会优化3
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新
zhanglingsheng b3a98a5f29 超级签统计
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 09ba38fc79 超级签统计
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev
zhengchanglong 25a4138842 扶持管理字眼改成资源管理
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
yulingwei 9f156f7be4 ltv优化
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源
chenzhi 929d5500c0 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi 33bf8c1ea7 公会统计2
chenxiaojun 8fd8ae006a 管理后台>推广员管理>公会分成管理--更新
sunke bafd5cf8d2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/codemanage
chenxiaojun f2fc739db2 管理后台>推广员管理>公会分成管理--新增
chenxiaojun bd8c4331bd 管理后台>推广员管理>公会分成管理--新增
liuweiwen 53a235379a 游戏订单查看-导出excell
liuweiwen 39e3350dd9 游戏订单查看
sunke 60f2c62fe6 下载链接管理后台
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev
zhanglingsheng 2a5dccdab8 游戏充值预下单
liuweiwen ead339046f 游戏统计
liuweiwen 5d6716b239 游戏统计
chenzhi ff04347526 公会统计1
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 5040b78473 登录日志修改
zhanglingsheng 33c3fd1d0d 游戏联动查询
zhanglingsheng 31af192402 解决冲突
zhanglingsheng 8f75d0f450 游戏
zhanglingsheng 24d47089dd 游戏预充值
zhanglingsheng 0e0f603d13 游戏充值预下单
liuweiwen b3fcf58932 推广员编辑推广公司
liuweiwen d64d18144a 推广公司录入