1093 Commits (3244238849ac24dcdf923c1d981c117c30576e64)

Author SHA1 Message Date
sunke 4e737c3e6a Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev 5 years ago
zhanglingsheng b4f6c58e42 Merge branch 'release-1.0.0' into dev 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
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
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
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
liuweiwen 47f53a4941 管理后台-》平台统计-》游戏注册统计列表数据权限与导出权限
管理后台-》平台统计-》游戏充值统计列表数据权限与导出权限
管理后台-》平台统计-》注册方式统计列表数据权限与导出权限
管理后台-》平台统计-》充值方式统计列表数据权限与导出权限
5 years ago
yulingwei f33ec364c3 修复 in 问题 5 years ago
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev 5 years ago
yulingwei bc7c6b493c 修复问题 5 years ago
liuweiwen 4ed57dcda1 增加注释 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 28e13f4c76 公会聚合3 5 years ago
chenzhi 7f86924778 公会优化3 5 years ago
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新 5 years ago
yulingwei d1bc94e438 修改问题 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
chenzhi 06742203f7 公会统计3 5 years ago
yulingwei cd34df0bda 修改时间统计 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 750572bc21 游戏订单查看增加开始时间与结束时间搜索 5 years ago
liuweiwen 39e3350dd9 游戏订单查看 5 years ago
sunke 60f2c62fe6 下载链接管理后台 5 years ago
chenxiaojun 8261512ba3 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun f032257838 推广平台>数据管理>充值玩家--更新 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 c0fac39c18 游戏统计 5 years ago
liuweiwen 5d6716b239 游戏统计 5 years ago
chenxiaojun f16949935f 推广平台>数据管理>充值玩家--更新 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
chenxiaojun 61bfbd00cc 公会分成管理 5 years ago
zhanglingsheng 6ddf42181c 游戏查询联动 5 years ago
zhanglingsheng 8f75d0f450 游戏 5 years ago
zhanglingsheng 24d47089dd 游戏预充值 5 years ago
zhanglingsheng 0e0f603d13 游戏充值预下单 5 years ago
chenxiaojun 9c4f1e5c4e 推广平台>数据管理>充值玩家--检索bug修复 5 years ago
liuweiwen b3fcf58932 推广员编辑推广公司 5 years ago
zhanglingsheng 5ff5b5e346 Merge branch 'release-1.0.0' into dev 5 years ago
liuweiwen df1b878485 推广公司 5 years ago
liuweiwen d64d18144a 推广公司录入 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 621776246a SDK菜单添加隐藏 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
zhanglingsheng 3a20c68117 游戏充值预下单修改 5 years ago
chenzhi db6131a135 暂存 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 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
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示 5 years ago
chenzhi ab29dafffc 补链旧数据脚本 5 years ago
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链 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
zhengyongxing 8b2d04f986 管理后台新开发功能修改 5 years ago
zhengyongxing e2e685e8c3 管理后台新开发功能修改 5 years ago
chenzhi 60c7bdce34 新增补链时判断是否已结算 5 years ago
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新 5 years ago
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新 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
zhengyongxing f112364f63 超级签功能bug修改 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
chenzhi 1bf6adb6c7 优化用户列表默认时间 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 1010fe2674 推广补链新增查询条件 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 f8498638ad 游戏充值行为日志 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
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表 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 fb5d9afded 落地页视频上传和显示 5 years ago
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
5 years ago
chenzhi 768c03c78d 优化总览导出为前端导出 5 years ago
liuweiwen 522ba58a4d 推广公司 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
chenzhi c2fb23f9a2 优化用户列表结束 5 years ago
chenzhi d948dee3df 用户列表优化3 5 years ago
liuweiwen 3c6ca71bb6 解绑手机 5 years ago
chenzhi 20ff424e52 优化用户列表4 5 years ago
chenzhi 03a03fd61e 优化用户列表3 5 years ago
chenzhi d4968e4c72 优化推广员 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
chenzhi 3f358bb818 优化用户列表2 5 years ago
liuweiwen 1693f7fa98 推广公司 5 years ago
chenzhi 4aa9ac6767 用户表优化1 5 years ago
liuweiwen d51725f1af 新增推广员时,新增推广所属公司 5 years ago
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改 5 years ago
zhengyongxing 30b3794ef4 管理后台导出数据bug修正 5 years ago
zhengyongxing 4f385a87c6 管理后台导出数据修改 5 years ago
zhengyongxing fbead8c3a1 推广补链导出修改 5 years ago
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
chenzhi d48b0f1341 优化统计 5 years ago
zhengyongxing 65fd27fe36 导出修改 5 years ago
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改 5 years ago
chenzhi 25cb177aea 新增游戏区服开服预告 5 years ago
chenzhi dbc77d07e7 优化聚合排序 5 years ago
chenzhi cfa67f9e3e 总览统计结束 5 years ago
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev 5 years ago
zhengyongxing ba85fc8c76 游戏充值导出修正 5 years ago
chenzhi e1c29c73af 总览统计结束 5 years ago
ELF 3e7382542d 打包区分ios新旧包 5 years ago
liuweiwen 97a7aa7437 落地页 5 years ago
liuweiwen 6c529e7bbd 统计 5 years ago
chenzhi e763abbf92 123. 5 years ago
liuweiwen b4745a357c Merge branch 'dev' into dev_lww 5 years ago
chenzhi 68d23b469c 123 5 years ago
chenzhi 6bc0cdcf1e 123 5 years ago
zhengyongxing 059742043c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 5 years ago
chenxiaojun 7de0b54773 推广平台->数据管理->充值玩家--更新 5 years ago
chenxiaojun 781d6d408a 推广平台->数据管理->充值玩家--更新 5 years ago
ELF 8d3d0ad726 Merge branch 'master' of 47.111.118.107:/srv/git/platform 5 years ago
ELF 4afe365e40 Merge branch 'hotfix/add_bans_type' 5 years ago
liuweiwen 56f2c422aa 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】,(一句话简介)限制字数(最多30字) 5 years ago
liuweiwen 24ce610949 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】,名词更改 — (游戏详情介绍)改为(游戏简介) 5 years ago
chenxiaojun 536ee9627f 脚本:用户推广员数据刷新 5 years ago
chenxiaojun 845df466f6 脚本:用户推广员数据刷新 5 years ago
chenxiaojun 968bf2c067 脚本:用户推广员数据刷新 5 years ago
chenxiaojun 71df93a12f 推广平台->数据管理->充值玩家--更新 5 years ago
chenxiaojun 0ea1cf04ec 推广平台->数据管理-充值统计|财务管理-结算明细--合计 5 years ago
chenxiaojun a7c80b84c2 脚本:用户推广员数据刷新 5 years ago