2462 Commits (f132189ea456a479c77cfe85d6bdabdbf3592023)

Author SHA1 Message Date
liuweiwen 7293bf158f Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Admin/View/BehaviorLog/index.html
#	Application/Home/Controller/QueryController.class.php
5 years ago
liuweiwen c5ea7c54ed 落地页关闭下载提示文字修改 5 years ago
chenxiaojun a29f6bfc14 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun d341789460 推广平台>数据管理>充值玩家--更新 5 years ago
sunke fee36cb7ff 防错 5 years ago
chenxiaojun 4586105e49 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 8a8a193248 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun d795fb74f7 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 583756e9f7 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun deb3e4d189 推广平台>数据管理>充值玩家--更新 5 years ago
sunke 5038291876 关联防错 5 years ago
chenxiaojun 2771b705b4 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun becddfca83 推广平台>数据管理>充值玩家--更新 5 years ago
sunke 47bad41bfa 行为日志 时间检索 5 years ago
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 39f068ebbe 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun b136ddcac3 推广平台>数据管理>充值玩家--更新 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
chenxiaojun 107a32cdf4 推广平台>数据管理>充值玩家--更新 5 years ago
zhanglingsheng 31af192402 解决冲突 5 years ago
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng ae66cf5008 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 2f81246d6e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
sunke fa5a47ea75 数据问题行为日志 5 years ago
ELF 762d8d598c Merge branch 'release-1.0.0' into dev 5 years ago
ELF 3ce289a194 隐藏玩家迁移功能 5 years ago
ELF 33f42a611b Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
ELF 9233d1568f 隐藏玩家迁移功能 5 years ago
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
chenxiaojun df7c165d12 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
chenxiaojun dc2c4ee652 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
sunke cb89467f6b 时间 5 years ago
chenxiaojun 03edc87f4f 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev 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
chenxiaojun 9c9396351b 推广平台>数据管理>订单查询--检索bug修复 5 years ago
chenxiaojun b3c1eb01de 推广平台>数据管理>订单查询--检索bug修复 5 years ago
chenxiaojun f0a09050ae 推广平台>数据管理>订单查询--检索bug修复 5 years ago
zhengyongxing deaeed6027 数据授权修改内容提交 5 years ago
chenxiaojun bec8203d47 推广平台>我的游戏--更新 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
chenxiaojun db848b5cf0 推广平台>我的游戏--更新 5 years ago
chenxiaojun 68ff0bcdc6 推广平台>我的游戏--更新 5 years ago
chenxiaojun a172735044 推广平台>充值玩家|我的游戏--更新 5 years ago
chenxiaojun edd5b55afa 推广平台>充值玩家|我的游戏--更新 5 years ago
zhanglingsheng 47628f2981 游戏充值预下单 5 years ago
sunke 2575a56384 结束时间包含 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
liuweiwen edadf82cb0 落地页 5 years ago
zhanglingsheng e949a4a60b 游戏充值预下单 5 years ago
liuweiwen afa5310526 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
liuweiwen 597db40ddc 落地页 5 years ago
zhanglingsheng 95f7acd6ff 游戏充值预下单 5 years ago
zhanglingsheng 65e1ddbd93 游戏充值预下单 5 years ago
chenxiaojun f2c501d69e 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun fb4a4f3cae 推广平台>数据管理>充值玩家--更新 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
chenxiaojun 0797a18e87 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun dd536f9556 推广平台>数据管理>充值玩家--更新 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
chenxiaojun e0f5404a83 推广平台>落地页--更新 5 years ago
chenxiaojun 462dd061b7 推广平台>落地页--更新 5 years ago
chenxiaojun b5b4f020a7 推广平台>落地页--更新 5 years ago
chenxiaojun 78b0f66d37 推广平台>落地页--更新 5 years ago
zhengyongxing 6f584f8323 数据权限功能提交 5 years ago
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug 5 years ago
liuweiwen 46aa23514e Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
liuweiwen cdf8f51007 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新 5 years ago
sunke b47eced096 日志分页 5 years ago
liuweiwen 1686c7c3c0 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen 587da83973 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
zhanglingsheng 43d49b10a0 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
zhanglingsheng 5d01cb1ff5 游戏充值预下单 5 years ago
liuweiwen c6ffac041f 官网充值页面弹窗提示修改:alert改为popmsg.msg 5 years ago
zhanglingsheng 50dbc200e5 时间转换函数全部精确到秒 5 years ago
sunke 0cb7a40ea9 行为日志角色id 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
sunke 92523d7429 充值状态 5 years ago
sunke 4c1471f6bb 行为日志 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
zhengchanglong ba4339977e Merge branch 'dev' into release-1.0.0 5 years ago
zhengyongxing 24dab9158b 管理后台bug修改 5 years ago
liuweiwen f5316aee55 Merge branch 'release-1.0.0' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
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
liuweiwen dabfc64dc9 Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0 5 years ago
liuweiwen 146b9e518a 解决落地页视频不置顶无视频显示视频框,滚动层被游戏截图挡住 5 years ago
chenzhi db6131a135 暂存 5 years ago
chenxiaojun 01ef816ee1 推广平台>数据管理>订单查询--更新 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
chenxiaojun 69fd83a2f0 推广平台>数据管理>充值玩家--更新 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
chenxiaojun f05034486c 推广平台>数据管理>充值玩家 5 years ago
sunke 660397bf4f 双乾支付 5 years ago
sunke 2cef293427 Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0 5 years ago
sunke 2c17a4c24f 双乾支付 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
chenxiaojun be9619e25a 推广平台>落地页--更新 5 years ago
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun 25ea7569cd 推广平台>落地页--更新 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenxiaojun aa67148398 推广平台>落地页--更新 5 years ago
chenxiaojun a93d11d871 推广平台>落地页--更新 5 years ago
chenxiaojun 44e912d9dc 推广平台>落地页--更新 5 years ago
chenxiaojun 50e0d22a8f 推广平台>落地页--更新 5 years ago
chenxiaojun 3719548d78 推广平台>落地页--更新 5 years ago
chenxiaojun 5a4d26a6e5 推广平台>落地页--更新 5 years ago
chenxiaojun 9d3a818fab 推广平台>落地页--更新 5 years ago