1308 Commits (036a710f2f0e71bd3be1eae9e6f701456bffe271)

Author SHA1 Message Date
chenzhi 8c577ec4af 新增平台统计说明 5 years ago
chenzhi 7a82b930bf 优化区服选择不响应问题 5 years ago
ELF 8d934c8d88 修改 5 years ago
chenxiaojun 92b0bc2c87 公会分成管理--更新 5 years ago
chenxiaojun ec273ab157 公会分成管理--更新 5 years ago
chenzhi 4dc8a8cb6d 优化导出为新开一个窗口 5 years ago
zhengchanglong ab5f7267e5 Merge branch 'release-1.0.0' into dev 5 years ago
zhengyongxing 792906e448 平台币充值功能添加 5 years ago
zhengyongxing eb187fa8d8 超级签详情链接添加 5 years ago
zhengchanglong dba78c08cd 非管理员数据导出隐藏 5 years ago
zhengchanglong a45fde72dd 非管理员数据导出隐藏 5 years ago
chenzhi 0ef4241570 合并statistcs 5 years ago
zhengyongxing 09924a5cc3 超级签详情链接添加 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 cc1e3ccbb3 推广员账号已存在判断 5 years ago
liuweiwen dfa5316ef1 推广员状态默认为待审核 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 c6b8f99b6e 非管理员数据加密显示 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
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
chenzhi c5dc3b4f22 优化会长统计导出1 5 years ago
sunke 5b7a0ad8b2 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
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 69e3843a56 修改文字 5 years ago
zhengyongxing d465be8969 数据权限提交 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
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
chenxiaojun 5034cb863b 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun 788a2415e3 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenxiaojun aa5e404188 管理后台>推广员管理>公会分成管理--更新 5 years ago
chenzhi 9104c0865c 公会统计5 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 96bf040f98 导出数据权限 5 years ago
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新 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
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
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei bc7c6b493c 修复问题 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 7f86924778 公会优化3 5 years ago
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新 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
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 39e3350dd9 游戏订单查看 5 years ago
sunke 60f2c62fe6 下载链接管理后台 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 5d6716b239 游戏统计 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
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
liuweiwen b3fcf58932 推广员编辑推广公司 5 years ago
liuweiwen d64d18144a 推广公司录入 5 years ago
zhengyongxing 6dc8366018 数据授权修改内容提交 5 years ago
zhanglingsheng 621776246a SDK菜单添加隐藏 5 years ago
zhengyongxing 3aa3c3f66b 数据授权修改 5 years ago
zhengchanglong 8a241cceb8 修改身份证加密显示方式 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 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
chenzhi ff6c70e380 合并cz 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
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
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
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 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 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
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
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 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 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 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
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 e3fe1cc03f 后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
5 years ago
chenzhi 768c03c78d 优化总览导出为前端导出 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
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
liuweiwen 1693f7fa98 推广公司 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
chenzhi e1c29c73af 总览统计结束 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liuweiwen 24ce610949 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】,名词更改 — (游戏详情介绍)改为(游戏简介) 5 years ago
chenzhi c178de254b 合并dev 5 years ago
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev 5 years ago
yulingwei fa9d40f87a 新增风控标识 5 years ago
zhengyongxing 56d3718c14 用户登录记录 5 years ago
liuweiwen b764260647 后台上传官网附件 5 years ago
chenzhi 81e56063c7 优化取消补链提示 5 years ago
chenzhi d64b627883 游戏充值新增文字说明 5 years ago
chenzhi ef25027213 补链新增切分时间 5 years ago
chenzhi dd22e6d0e9 修改补链in/out 5 years ago
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev 5 years ago
yulingwei 7a767466ef 锁号优化 5 years ago
zhengyongxing 34d424887d 绑定币 5 years ago
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi dfff8b6240 优化推广员选择 5 years ago
zhanglingsheng ede4cdd96e 短信配置 5 years ago
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 3f8168c11a 添加新短信 5 years ago
chenzhi 8a7c6219ca 新需求 充值-游戏充值新增两个字段显示 5 years ago
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题 5 years ago
chenzhi 3500cce032 [bug]角色查询 区服不显示 5 years ago
chenzhi bb09ef9005 [bug]角色查询区服不显示 5 years ago
chenzhi e27cdc8a38 优化所有统计 5 years ago
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei b9bc2a7162 更新 5 years ago
zhengyongxing 777352f1bf 平台币充值bug 5 years ago
zhengyongxing fb6177d187 平台币充值bug 5 years ago
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zhanglingsheng 4915ebc70c 推广员oa关联 5 years ago
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei ee7bb128c0 修复 5 years ago
zhanglingsheng e59352edbf 推广员oa关联 5 years ago
zhanglingsheng 988bf99086 ss 5 years ago
zhanglingsheng c4e2d0a245 推广员OA关联 5 years ago
yulingwei 4071341458 更新 5 years ago
yulingwei 090d1e2f69 更新bug 5 years ago
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 8bb10aea61 [bug]玩家列表累计充值 5 years ago
elf@home dc6790b404 修改 5 years ago
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 342ec9130e 修改 5 years ago
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录 5 years ago
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框 5 years ago
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
yulingwei 12362190e6 upt 5 years ago
chenzhi 86b53d375c [新增]玩家列表汇总统计 5 years ago
chenzhi ea580a52fe 隐藏推广员统计的二级页 5 years ago
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题 5 years ago
yulingwei 8fee02fc4c 修改时间 5 years ago
chenzhi 849fd77ac6 优化推广员统计的方法 5 years ago
zhengyongxing 4f27c2fb29 统计bug修正 5 years ago
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Data/update.sql
5 years ago
yulingwei 24d3e6ab07 修改bug 5 years ago
yulingwei 046beee6be 修改bug 5 years ago
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化 5 years ago
chenzhi 360cf3f3ba 优化前端展示 5 years ago
chenzhi 04c5f17790 优化脚本 5 years ago
sunke b64882554a 管理后台增加资质审核检索 5 years ago
chenzhi 37d8f72c6d 优化首页展示 5 years ago
sunke 0b8f3450c6 审核后台 5 years ago
sunke d2d211737f bug 5 years ago
sunke eac235d498 身份认证后台 5 years ago
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页 5 years ago
zhanglingsheng f074ce853b sdk菜单配置修改 5 years ago
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改 5 years ago
zhengyongxing 97b9a06e69 推广后台bug修正 5 years ago
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新 5 years ago
chenxiaojun 6ad8277aa0 管理后台--更新 5 years ago
chenxiaojun 2e7ecfa53c 管理后台--更新 5 years ago
sunke ee8a954566 查看消费记录滚动 5 years ago
elf@home 06486d458c 修改bug 5 years ago
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新 5 years ago
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整 5 years ago
sunke 1f34a3a0ce 平台币明细,sdk菜单图片上传 5 years ago
yulingwei 0d258c1d8d upt 5 years ago
yulingwei 6ea4c72416 修改部分导出报表问题 5 years ago
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
ELF e27c5a5266 修改bug 5 years ago
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
jbrazz 8a513767dd upt 5 years ago
sunke 9e2bb1e809 安全管理admin后台 5 years ago
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新 5 years ago
jbrazz 8be3ee9560 upt 5 years ago
jbrazz 31948423e0 upt 5 years ago
jbrazz 20c168a537 三级改四级配置 5 years ago
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制 5 years ago
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新 5 years ago
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev 5 years ago
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新 5 years ago
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新 5 years ago
jbrazz f4a46335ca upt 5 years ago
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev 5 years ago
jbrazz ea4c861559 upt 5 years ago
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
zyx 0a819757cb 测试资源时间bug修正 5 years ago
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c9996e071c fix grand_id 5 years ago
chenzhi 58db110844 合并 5 years ago
chenzhi 115bafc067 新增补链日期及取消补链功能 5 years ago
ELF 831456b333 解决冲突 5 years ago
jbrazz 9300280f78 merge feture/ylw 5 years ago
jbrazz db1ea1370a upt 5 years ago
jbrazz 5e9cfb023f uypt 5 years ago
Your Name f642fb2c90 游戏充值订单添加CP订单号字段 5 years ago
jbrazz 74be3407b1 upt 5 years ago
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5f673b346d 月结统计添加部长渠道 5 years ago
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote 5 years ago
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
jbrazz 68df391d9c upt 5 years ago
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev 5 years ago
zyx 266202c06b 游戏详情查看导出,按日期分成多个sheet 5 years ago
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name 51701a485d SDK菜单添加平台选型 5 years ago
zyx 602e53e82f 合并分支dev_zyx财务部分的代码 5 years ago
zhengchanglong 78e23d19b2 Merge branch 'dev_zyx' into dev 5 years ago
zyx 8fd435a324 月结统计,游戏查看名称修改 5 years ago
zhengchanglong e5c834e054 Merge branch 'dev_zyx' into dev 5 years ago
zyx 4dfec50ba5 月结统计修改 5 years ago
zhengchanglong 879accf9f5 Merge branch 'dev_zyx' into dev 5 years ago
zyx f44a11a915 月结统计提示语修改 5 years ago
chenzhi 2a7d4a435c Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
zhengchanglong 78846c699f Merge branch 'dev_zyx' into dev 5 years ago
zyx 9539b38e86 月结统计提示语修改 5 years ago
jbrazz 48b1cdf66f upt 5 years ago
zhengchanglong 3c3a13c068 Merge branch 'dev_zyx' into dev 5 years ago
zyx cfa33d3e42 月结统计提示语修改 5 years ago
jbrazz a8125bf377 upt 5 years ago
zhengchanglong 9dd5a34bf7 Merge branch 'dev_zyx' into dev 5 years ago
chenzhi 50c775a78b Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenzhi f9397efebf 修改总流水统计方式 5 years ago
zhengchanglong 6dcd1549d0 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Data/update.sql
5 years ago
zyx 5a7432ef40 月结统计新增平台比收入字段,将平台币流水改为平台币支出 5 years ago
zyx b6080180ab 测试资源bug修正 5 years ago
jbrazz 48de85a3c3 upt 5 years ago
zhengchanglong 2c80186025 Merge branch 'dev_zyx' into dev 5 years ago
zyx 27e8a0c0b5 提示栏文字调整,组长渠道与推广员渠道添加文字提示栏 5 years ago
zyx 414f471ac1 提示栏文字调整 5 years ago
zhengchanglong bf24f74d00 Merge branch 'dev_zyx' into dev 5 years ago
zyx 7167366949 提示栏文字调整 5 years ago
zyx 064a3d0098 搜索框样式调整 5 years ago
zyx 6f77f576d1 标签位置调整 5 years ago
zyx bbc75a419d bug修正,样式更新 5 years ago
zhengchanglong cd70dd7dd8 Merge branch 'dev_zyx' into dev 5 years ago
zyx 62311eb40d 月结统计bug修正 5 years ago
zyx 515ffa25b9 月结统计bug修正 5 years ago
Your Name dce059abe5 SDK菜单修改 5 years ago
Your Name 7466b90d13 SDK菜单修改 5 years ago
Your Name ed3ce2b4b5 SDK菜单修改 5 years ago
Your Name c3762b420c SDK菜单修改 5 years ago
Your Name 2569850407 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
Your Name c90c397dd9 SDK菜单修改 5 years ago
zyx 2adc07ec4a 组长月结统计页面文字修正 5 years ago
zyx 4803bd4a1b 组长月结统计页面修正 5 years ago
zhengchanglong e69bc5f459 Merge branch 'dev_zyx' into dev 5 years ago
zyx 63dff98660 月结统计导出bug修正 5 years ago
zyx 1d59721ee2 月结统计导出bug修正 5 years ago
zyx b42f621dbc 财务管理功能提交 5 years ago
zyx ee5dccfaeb 财务管理功能代码完善 5 years ago
jbrazz b78c6228b0 Merge branch 'hotfix/fix_bug' into dev 5 years ago
jbrazz d4c7727426 upt 5 years ago
zyx 54a01da982 财务管理功能完善 5 years ago
zyx fe8a60093f 新增渠道模板提交 5 years ago
zyx d3de669837 '代码合并' 5 years ago
jbrazz 8859c847f6 upt 5 years ago
jbrazz 459b722c1c upt 5 years ago
chenxiaojun 3be42d0186 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
chenxiaojun e247c7dedf 管理后台->统计->新增->其他注册统计|官方渠道统计 5 years ago
zyx 24cdd7086b '合并代码' 5 years ago
sunke 021673f657 图片上传补充 5 years ago
sunke 692a1bcc11 webuploader插件 5 years ago
zyx c65aa8d69a 财务管理bug修正,导出功能,合作方列表添加 5 years ago
zyx 224c745ba8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
zyx 112316c395 财务管理功能添加 5 years ago
chenxiaojun 0963c69f4d 管理后台->游戏管理->合作方管理->新增批量删除 5 years ago
chenxiaojun 41d45995b0 管理后台->游戏管理->合作方管理更新 5 years ago
chenxiaojun dd10535a07 管理后台->游戏管理->新增合作方管理 5 years ago
chenxiaojun fbe8a764f1 管理后台->删除溪谷入口 5 years ago
chenxiaojun a04f291471 管理后台->删除溪谷入口 5 years ago
ELF e4f1ed99f8 修改后台登录页 5 years ago
ELF 437909d53a 测试 5 years ago
zyx 0d35370ade 扶持号管理推广员搜索改成下拉选项框,扶持号管理搜索异常修正,去除将text_resource的排序规则改回一般排序 5 years ago
zyx 7ead67f8cb 快捷图标代码修正 5 years ago
zyx c6da6fb705 首页用户注册充值信息修正 5 years ago
jbrazz 5527b0bc31 Merge branch 'hotfix/promote_query' into dev 5 years ago
jbrazz 736c0fd432 fix 5 years ago
zhengchanglong 5dbfb59f3f Merge branch 'dev_zcl' into dev 5 years ago
zhengchanglong a5899444a7 Merge branch 'dev_zyx' into dev
# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
5 years ago
chenzhi 2f124bffbb coin_num 5 years ago
chenzhi 751ab77dc9 Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl 5 years ago
chenzhi e3d9d382d9 新增线下充值审核 5 years ago
zyx 0a9dbe6a78 管理后台菜单bug修复 5 years ago
zyx c8f101f40c 管理后台添加测试资源 5 years ago
zyx 24d5bf34c7 添加站点功能修改快捷菜单的图标 5 years ago
chenxiaojun 1ba358fabb 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun c322f6ec7e 管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type 5 years ago
chenxiaojun a91c372a3b 修复关联游戏混服选项bug 5 years ago
chenxiaojun 76bd557efd 修复关联游戏混服选项bug 5 years ago
ELF bcc34cbd0c 打包逻辑重构 5 years ago
Your Name 22e7866644 SDK菜单添加 5 years ago
Your Name f1b5a2257d SDK用户菜单-修改 5 years ago
Your Name b253d23ae3 SDK用户菜单字段名修改 5 years ago
Your Name 971906dd29 SDK用户菜单 5 years ago
Your Name 118340fa33 SDK用户菜单 5 years ago
zyx 90665c3dc5 新增礼包bug修正 5 years ago
zyx 96b81a57ca 礼包添加bug修正 5 years ago
zyx 63eebf5611 礼包管理新增全部,超级签选项 5 years ago
zyx f64225cff0 测试功能移交到总管理后台,扶持号管理bug修正 5 years ago
“‘ b9bd9655b7 测试资源记录及发放 5 years ago
ELF 0c34bb88d3 解决冲突 5 years ago
chenxiaojun 24b0649615 新增->游戏分包打包排序 5 years ago
chenxiaojun a1476436d2 新增->游戏分包打包顺序
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun 82d40f4e8b 新增->游戏分包打包顺序 5 years ago
chenxiaojun 62d38bf08e 新增->设置'会长下级游戏展示'
# Conflicts:
#	Data/update.sql
5 years ago
chenxiaojun f4fe99c130 管理员后台->推官员编辑->添加'下级游戏展示'设置 5 years ago
18850253506@163.com 4a96cf7871 资料专区 5 years ago
chenxiaojun 2ca1009b32 管理员后台 游戏添加混服设置 5 years ago
chenxiaojun 6c78459b38 更新 5 years ago
chenxiaojun 8ffc9038c4 更新 5 years ago
ELF bfadef687f 添加功能 5 years ago
ELF 75b292b906 修改 5 years ago
ELF d61f98df7b 修改内容 5 years ago
ELF 405885e99f 添加环境变量目录 5 years ago
ELF 2ffa024c4c initial 5 years ago