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

919 Commits (905769f9223d9b93623103007345ada7e28614b1)

Author SHA1 Message Date
liuweiwen 5b1a4db378 登录记录
liuweiwen 2e818c04f8 登录记录搜索
zhengchanglong 484972e9f2 Merge branch 'release-1.0.0' into dev
liuweiwen cc1e3ccbb3 推广员账号已存在判断
chenzhi 624e321b70 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
chenzhi 96e52b267a 修复没总览依旧显示问题
liuweiwen 2096c22826 注释
liuweiwen ec4c820057 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
liuweiwen 86dd4a2952 【用户】-【玩家组】-【登录记录】-选择会长只显示这个会长的登录记录 
改为展示这个会长及其所属推广员的登录记录
zhengchanglong 1ca183b547 非管理员数据加密显示
zhengchanglong 4d06b52b9d Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
zhengchanglong c6b8f99b6e 非管理员数据加密显示
chenzhi b3e09ad5db 放行ajax,首页无权限判断
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 非管理员数据加密显示
ELF b36e1f1bc9 解决冲突
zhengyongxing d1a5b63be2 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 71df0ab08b 菜单修正
chenzhi ba6947987b Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
chenzhi e414013f8b 优化导出2
zhengyongxing b8d736c337 Merge branch 'dev_statistics' of 47.111.118.107:wmtx/platform into dev_statistics
zhengyongxing 00f33befa2 平台币收回修正
chenxiaojun 206c2ed251 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi c5dc3b4f22 优化会长统计导出1
chenxiaojun 1f19360d72 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 81fb39c004 管理后台>推广员管理>公会分成管理--更新
liuweiwen 3b23c0c5cf 后台管理-》统计-》推广员统计，增加判断是否有官方渠道权限
sunke 5b7a0ad8b2 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
sunke 1699c155e8 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 非管理员数据加密显示和隐藏导出按钮
chenxiaojun 2559aa32e9 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 6b8e277fb1 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 628ea84935 平台币收回修正
zhengyongxing 5daf1eb565 支付渠道查询修改
sunke 2f83a85690 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计，增加判断当前管理员是否有官方渠道权限
chenzhi e4b6cdea85 公会修改6
liuweiwen b8e5d719d5 修复bug：推广员-》数据管理-》实时充值，解决昨日充值与今日充值筛选时间未生效的问题
zhanglingsheng 2ec116a017 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng a9c2207ba2 行为日志
zhanglingsheng 837aec6659 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng 855b567a02 行为日志
liuweiwen a9959e9544 解决推广员列表搜索底下推广员时自动过滤掉锁定的
chenzhi 1244156518 优化总览统计
zhengyongxing d465be8969 数据权限提交
chenzhi a877b475f5 优化总览脚本
zhengyongxing e8c3f021b6 角色查询导出修改
chenxiaojun 410a3cda1b 管理后台>推广员管理>公会分成管理--更新
chenzhi b97a956cbc 公会统计5
zhengyongxing 7779535fb6 数据权限
liuweiwen ee98ca39bb 推广公司
liuweiwen ee2fc154a4 推广公司
sunke f3d91e5a11 Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
chenzhi 904b707cf4 公会统计5
zhanglingsheng f3a80b73b8 行为日志显示bug
chenzhi 86db958ca7 将txt文件全部移入runtime
zhanglingsheng 043de55e0b Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
zhanglingsheng c6a89f5fe1 行为日志BUG
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新
zhanglingsheng eaa5066324 行为日志bug
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新
zhengyongxing 5f3e71e8a8 数据权限bug修正
zhengyongxing e7b2f57a93 数据权限bug修正
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新
chenzhi 9104c0865c 公会统计5
zhengyongxing 3151e8b456 Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx
zhengyongxing ce58d63aa5 充值汇总bug修正
zhanglingsheng 7f9ec687cb 行为日志显示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 0695a22472 导出数据权限
liuweiwen 96bf040f98 导出数据权限
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天
zhengchanglong e99e96dfb1 添加管理员生日字段默认今天
liuweiwen a9a6b49148 空格
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新
sunke 4e737c3e6a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
zhanglingsheng b4f6c58e42 Merge branch 'release-1.0.0' into dev
zhanglingsheng 375bbac885 行为日志
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
liuweiwen 31790a7e51 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
liuweiwen 0b2eb4a45b 管理后台-》推广员统计-》推广员注册统计列表数据权限与导出权限 
管理后台-》推广员统计-》推广员充值统计列表数据权限与导出权限
zhengyongxing 48437d25c2 数据权限导出修改
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限 
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
yulingwei f33ec364c3 修复 in 问题
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev
yulingwei bc7c6b493c 修复问题
liuweiwen 4ed57dcda1 增加注释
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
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
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 28e13f4c76 公会聚合3
chenzhi 7f86924778 公会优化3
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新
yulingwei d1bc94e438 修改问题
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 09ba38fc79 超级签统计
chenzhi 06742203f7 公会统计3
yulingwei cd34df0bda 修改时间统计
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev
yulingwei 9f156f7be4 ltv优化
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 750572bc21 游戏订单查看增加开始时间与结束时间搜索
liuweiwen 39e3350dd9 游戏订单查看
sunke 60f2c62fe6 下载链接管理后台
chenxiaojun 8261512ba3 推广平台>数据管理>充值玩家--更新
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新
liuweiwen ead339046f 游戏统计
liuweiwen c0fac39c18 游戏统计
liuweiwen 5d6716b239 游戏统计
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新
chenzhi ff04347526 公会统计1
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 5040b78473 登录日志修改
zhanglingsheng 31af192402 解决冲突
chenxiaojun 61bfbd00cc 公会分成管理
zhanglingsheng 24d47089dd 游戏预充值
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复
liuweiwen b3fcf58932 推广员编辑推广公司
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev
liuweiwen df1b878485 推广公司
liuweiwen d64d18144a 推广公司录入
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission
chenzhi da79ff4441 优化角色权限2
zhengyongxing deaeed6027 数据授权修改内容提交
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng a15e62988b 游戏预充值-导出
chenzhi 1623f3ae65 优化多会长统计1
zhanglingsheng 621776246a SDK菜单添加隐藏
zhanglingsheng eaf1cb3f17 游戏区服联动修改
liuweiwen 6b1bbe4c20 数据授权修改
zhanglingsheng 47628f2981 游戏充值预下单
zhanglingsheng fb425d3e91 游戏充值预下单
zhanglingsheng e949a4a60b 游戏充值预下单
zhanglingsheng 95f7acd6ff 游戏充值预下单
zhanglingsheng 65e1ddbd93 游戏充值预下单
liuweiwen de7d34576d 添加数据权限 
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
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
zhengyongxing 2b336dd560 数据文件删除
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
chenzhi ff6c70e380 合并cz
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 5df3a59df4 扶持发放添加导出功能
zhengyongxing 6f584f8323 数据权限功能提交
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
zhanglingsheng 5d01cb1ff5 游戏充值预下单
zhanglingsheng 6d2c4fc3a2 游戏充值预下单
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 62502f0732 游戏充值预下单
zhengyongxing e6c45bc494 推广补链导出修改
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
zhengyongxing 24dab9158b 管理后台bug修改
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3a20c68117 游戏充值预下单修改
zhengyongxing 46538019d4 管理后台新开发功能修改
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
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
chenzhi ab29dafffc 补链旧数据脚本
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链
zhengyongxing 8b2d04f986 管理后台新开发功能修改