909 Commits (769cbb9e375914f4a8cac30256703748190294fd)

Author SHA1 Message Date
zhengchanglong 88fde815d4 非管理员数据加密显示和隐藏导出按钮 5 years ago
zhengyongxing 628ea84935 平台币收回修正 5 years ago
liuweiwen 546a7029cd bug修复:游戏充值-》补单没权限提示内容为空的问题 5 years ago
liuweiwen 126d1ca9bc 管理后台-》统计-》推广员统计,增加判断当前管理员是否有官方渠道权限 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
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
liuweiwen 4fca3e8288 修改返回按钮样式 5 years ago
liuweiwen 511b780f72 返回跳转 5 years ago
zhengyongxing 7779535fb6 数据权限 5 years ago
liuweiwen ee98ca39bb 推广公司 5 years ago
liuweiwen ee2fc154a4 推广公司 5 years ago
zhanglingsheng f3a80b73b8 行为日志显示bug 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
zhanglingsheng eaa5066324 行为日志bug 5 years ago
zhengyongxing 5f3e71e8a8 数据权限bug修正 5 years ago
zhengyongxing e7b2f57a93 数据权限bug修正 5 years ago
zhengyongxing ce0e9f943d 数据权限bug修正 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 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
liuweiwen 0695a22472 导出数据权限 5 years ago
liuweiwen 96bf040f98 导出数据权限 5 years ago
zhengchanglong 8075ac22f8 添加管理员生日字段默认当天 5 years ago
liuweiwen 62f5098df7 处理数据权限筛选时,不覆盖原有的搜索字段promote_id 5 years ago
liuweiwen a9a6b49148 空格 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
liuweiwen 4bf6352f9d 导出添加数据权限 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
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
5 years ago
zhengchanglong 25a4138842 扶持管理字眼改成资源管理 5 years ago
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源 5 years ago
zhanglingsheng 2a5dccdab8 游戏充值预下单 5 years ago
zhanglingsheng 33c3fd1d0d 游戏联动查询 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 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 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