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

559 Commits (e6d4304d74a4d7ccf31499f2bc467b000bbff54c)

Author SHA1 Message Date
zhanglingsheng c112391dea 超级订单搜索导出
liuweiwen cdbf059ee4 平台币直充明细列表，搜索，导出 
内充支出明细列表，搜索，导出
sunke 0d1e68e449 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 48614da52d 推广平台>数据管理>充值玩家--更新
zhanglingsheng cbbbf6350c 超级签统计--导出
chenzhi 7f86924778 公会优化3
chenxiaojun 94b66e3edd 推广平台>数据管理>充值玩家--更新
zhanglingsheng b3a98a5f29 超级签统计
zhanglingsheng 3b444155d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 09ba38fc79 超级签统计
zhengchanglong ff1981ba59 Merge branch 'release-1.0.0' into dev
zhengchanglong 25a4138842 扶持管理字眼改成资源管理
yulingwei ebf64a7137 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 21bbc0eb40 Merge branch 'hotfix/ltv' into dev
zhengchanglong 0459b99da0 Merge branch 'release-1.0.0' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
yulingwei 9f156f7be4 ltv优化
zhengchanglong 2cb7d9bdfd 扶持资源改成测试资源
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 39e3350dd9 游戏订单查看
sunke 60f2c62fe6 下载链接管理后台
zhanglingsheng f3dd820ca1 Merge branch 'release-1.0.0' into dev
zhanglingsheng 2a5dccdab8 游戏充值预下单
liuweiwen ead339046f 游戏统计
liuweiwen 5d6716b239 游戏统计
chenzhi ff04347526 公会统计1
zhengyongxing 449a16ab13 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 5040b78473 登录日志修改
zhanglingsheng 33c3fd1d0d 游戏联动查询
zhanglingsheng 31af192402 解决冲突
zhanglingsheng 8f75d0f450 游戏
zhanglingsheng 24d47089dd 游戏预充值
zhanglingsheng 0e0f603d13 游戏充值预下单
liuweiwen b3fcf58932 推广员编辑推广公司
liuweiwen d64d18144a 推广公司录入
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng 621776246a SDK菜单添加隐藏
zhengyongxing 3aa3c3f66b 数据授权修改
zhengchanglong 8a241cceb8 修改身份证加密显示方式
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 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
chenzhi ff6c70e380 合并cz
zhengyongxing d545c22c3b 数据管理功能提交
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 5df3a59df4 扶持发放添加导出功能
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
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 管理后台新开发功能修改
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段
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 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
chenzhi 1ccbd03a0f 超级签新增支付方式
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ad97083c9f 行为日志文案
chenzhi 0c62e80e67 优化总览表格高度
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liuweiwen 188abdcbdd 落地页视频置顶判断
zhengyongxing 7b12780d9c 管理后台新开发功能修改
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 3d672db381 推广补链新增一系列查询条件
ELF c451921b92 后台添加IOS打包方式选择
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 14644b44a2 落地页图片改为使用游戏截图
zhanglingsheng f392ad4de0 游戏充值行为日志
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi df50ce6352 补链csv导出
liuweiwen c31ae44f79 落地页去掉App购买
chenzhi 5359e67860 优化补链记录为ajax
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
liuweiwen 04bd089bd9 上传视频格式提示
chenzhi f8cbe8d9ef 分开推广补链和补链记录
zhengyongxing fd187aa04f 白名单修改
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 70aab2f137 角色查询新增创角时间区间查询
zhengyongxing fa393d9c90 管理后台新增功能添加
liuweiwen 563b672c21 加提示
liuweiwen 14258a01a9 前端判断上传视频的大小与格式
liuweiwen a1bdc4b936 提示
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen b0748243b9 编辑游戏-》上传视频
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
chenzhi 768c03c78d 优化总览导出为前端导出
liuweiwen 59b1e3149e 管理后台-推广公司搜索
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 4df0f91f43 管理后台上传图片修改
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小
liuweiwen a7c5957201 推广公司管理
liuweiwen fd7481a940 风控管理样式调整
liuweiwen 93d46b74ae 样式调整
liuweiwen 1693f7fa98 推广公司
liuweiwen d51725f1af 新增推广员时，新增推广所属公司
chenzhi 25cb177aea 新增游戏区服开服预告
chenzhi e1c29c73af 总览统计结束
ELF 3e7382542d 打包区分ios新旧包
liuweiwen 24ce610949 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，名词更改 — （游戏详情介绍）改为（游戏简介）
chenzhi c178de254b 合并dev
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev
yulingwei fa9d40f87a 新增风控标识
zhengyongxing 56d3718c14 用户登录记录
liuweiwen b764260647 后台上传官网附件
chenzhi 81e56063c7 优化取消补链提示
chenzhi d64b627883 游戏充值新增文字说明
chenzhi ef25027213 补链新增切分时间
chenzhi dd22e6d0e9 修改补链in/out
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
yulingwei 65552a6dae Merge branch 'hotfix/member_lock' into dev
yulingwei 7a767466ef 锁号优化
zhengyongxing 34d424887d 绑定币
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi dfff8b6240 优化推广员选择
zhanglingsheng ede4cdd96e 短信配置
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3f8168c11a 添加新短信
chenzhi 8a7c6219ca 新需求 充值-游戏充值新增两个字段显示
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 2d2f3abf75 [bug]角色查询 无游戏区服全显示问题
chenzhi 3500cce032 [bug]角色查询 区服不显示
chenzhi bb09ef9005 [bug]角色查询区服不显示
chenzhi e27cdc8a38 优化所有统计
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei b9bc2a7162 更新
zhengyongxing 777352f1bf 平台币充值bug
zhengyongxing fb6177d187 平台币充值bug
zhanglingsheng a316c4f7f4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4915ebc70c 推广员oa关联
yulingwei 077ba7754f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei ee7bb128c0 修复
zhanglingsheng e59352edbf 推广员oa关联
zhanglingsheng 988bf99086 ss
zhanglingsheng c4e2d0a245 推广员OA关联
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8bb10aea61 [bug]玩家列表累计充值
elf@home dc6790b404 修改
yulingwei 3e423b1372 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 342ec9130e 修改
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12362190e6 upt
chenzhi 86b53d375c [新增]玩家列表汇总统计
chenzhi ea580a52fe 隐藏推广员统计的二级页
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
yulingwei 8fee02fc4c 修改时间
chenzhi 849fd77ac6 优化推广员统计的方法
zhengyongxing 4f27c2fb29 统计bug修正
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
sunke b64882554a 管理后台增加资质审核检索
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
sunke d2d211737f bug
sunke eac235d498 身份认证后台
chenxiaojun 9933463c70 管理后台->推广员->财务管理->推广提现--结算详情分页
chenxiaojun f9d26bab7c 管理后台->推广员->财务管理->推广提现--结算详情分页
zhanglingsheng f074ce853b sdk菜单配置修改
chenxiaojun 5e3cc42bc1 管理后台->推广员->推广员编辑--二级密码名词解释更改
chenxiaojun cc572ca66e 管理后台->推广员->推广员编辑--二级密码名词解释更改
zhengyongxing 97b9a06e69 推广后台bug修正
chenxiaojun 8ac33bb9e4 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun fd53997094 管理后台->充值->平台币订单->平台币回收--更新
chenxiaojun 6ad8277aa0 管理后台--更新
chenxiaojun 2e7ecfa53c 管理后台--更新
sunke ee8a954566 查看消费记录滚动
elf@home 06486d458c 修改bug
chenxiaojun a84ea0e679 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 55fe6a2c7d 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun 638ceba6cc 管理后台->游戏订单->游戏充值--日期检索更新
chenxiaojun f473c0abc1 管理后台->游戏订单->游戏充值--列表样式调整
sunke 1f34a3a0ce 平台币明细，sdk菜单图片上传
yulingwei 0d258c1d8d upt
yulingwei 6ea4c72416 修改部分导出报表问题
ELF d112a3c7ff Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e27c5a5266 修改bug
jbrazz 5deb0c2b05 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
jbrazz 8a513767dd upt
sunke 9e2bb1e809 安全管理admin后台
ELF d9419ae64e Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenxiaojun 6307625efc 管理后台->推广员->结算管理->推广提现->--更新
jbrazz 8be3ee9560 upt
jbrazz 31948423e0 upt
jbrazz 20c168a537 三级改四级配置
ELF 6f4ec4ff30 Merge branch 'feature/promote' into dev
chenxiaojun c057c5cf47 管理后台->推广员->结算管理->推广提现->上传汇款证明--格式限制
chenxiaojun 578d640524 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 1c157d78b9 管理后台->推广员->结算管理->推广提现->订单详情--更新
ELF 68d39bb3c9 Merge branch 'feature/promote' into dev
chenxiaojun 0787c976ef 管理后台->推广员->结算管理->推广提现--更新
chenxiaojun 895265a330 管理后台->推广员->结算管理->推广提现--更新
jbrazz f4a46335ca upt
jbrazz 380c930686 Merge branch 'featurer/ylw_4.0' into dev
jbrazz ea4c861559 upt
zyx 97a1b634b9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 0a819757cb 测试资源时间bug修正
jbrazz 0dcb2a2014 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c9996e071c fix grand_id
chenzhi 58db110844 合并
chenzhi 115bafc067 新增补链日期及取消补链功能
ELF 831456b333 解决冲突
jbrazz 9300280f78 merge feture/ylw
jbrazz db1ea1370a upt
jbrazz 5e9cfb023f uypt
Your Name f642fb2c90 游戏充值订单添加CP订单号字段
jbrazz 74be3407b1 upt
zyx cbfb286d53 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5f673b346d 月结统计添加部长渠道
ELF eb15fc7dfc Merge branch 'feature/pack' into feature/promote
jbrazz 8a2c99681a Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz c66c35b686 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
jbrazz 68df391d9c upt
zhengchanglong 2d67812f90 Merge branch 'dev_zyx' into dev
zyx 266202c06b 游戏详情查看导出，按日期分成多个sheet
Your Name 330216e20e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 51701a485d SDK菜单添加平台选型
zyx 602e53e82f 合并分支dev_zyx财务部分的代码