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

808 Commits (b1e9127e9da77a37fda45f90ba260b4f85f20cf2)

Author SHA1 Message Date
zhanglingsheng eaf1cb3f17 游戏区服联动修改
liuweiwen 6b1bbe4c20 数据授权修改
zhanglingsheng 47628f2981 游戏充值预下单
zhanglingsheng fb425d3e91 游戏充值预下单
zhanglingsheng e949a4a60b 游戏充值预下单
zhanglingsheng 95f7acd6ff 游戏充值预下单
zhanglingsheng 65e1ddbd93 游戏充值预下单
liuweiwen de7d34576d 添加数据权限 
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
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 2b336dd560 数据文件删除
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
chenzhi ff6c70e380 合并cz
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 5df3a59df4 扶持发放添加导出功能
zhengyongxing 6f584f8323 数据权限功能提交
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
zhanglingsheng 5d01cb1ff5 游戏充值预下单
zhanglingsheng 6d2c4fc3a2 游戏充值预下单
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 62502f0732 游戏充值预下单
zhengyongxing e6c45bc494 推广补链导出修改
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 管理后台新开发功能修改
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 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
chenzhi ab29dafffc 补链旧数据脚本
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链
zhengyongxing 8b2d04f986 管理后台新开发功能修改
zhengyongxing e2e685e8c3 管理后台新开发功能修改
chenzhi 60c7bdce34 新增补链时判断是否已结算
chenzhi 1ccbd03a0f 超级签新增支付方式
zhengyongxing f112364f63 超级签功能bug修改
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 1bf6adb6c7 优化用户列表默认时间
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 1010fe2674 推广补链新增查询条件
chenzhi 3d672db381 推广补链新增一系列查询条件
ELF c451921b92 后台添加IOS打包方式选择
zhanglingsheng f8498638ad 游戏充值行为日志
zhanglingsheng f392ad4de0 游戏充值行为日志
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi df50ce6352 补链csv导出
chenzhi 5359e67860 优化补链记录为ajax
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
chenzhi f8cbe8d9ef 分开推广补链和补链记录
zhengyongxing fd187aa04f 白名单修改
chenzhi 70aab2f137 角色查询新增创角时间区间查询
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表
zhengyongxing fa393d9c90 管理后台新增功能添加
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen fb5d9afded 落地页视频上传和显示
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
liuweiwen 522ba58a4d 推广公司
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
chenzhi c2fb23f9a2 优化用户列表结束
chenzhi d948dee3df 用户列表优化3
chenzhi 20ff424e52 优化用户列表4
chenzhi 03a03fd61e 优化用户列表3
chenzhi d4968e4c72 优化推广员
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小
liuweiwen a7c5957201 推广公司管理
chenzhi 3f358bb818 优化用户列表2
liuweiwen 1693f7fa98 推广公司
chenzhi 4aa9ac6767 用户表优化1
liuweiwen d51725f1af 新增推广员时，新增推广所属公司
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改
zhengyongxing 30b3794ef4 管理后台导出数据bug修正
zhengyongxing 4f385a87c6 管理后台导出数据修改
zhengyongxing fbead8c3a1 推广补链导出修改
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi d48b0f1341 优化统计
zhengyongxing 65fd27fe36 导出修改
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改
chenzhi 25cb177aea 新增游戏区服开服预告
chenzhi dbc77d07e7 优化聚合排序
chenzhi cfa67f9e3e 总览统计结束
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev
zhengyongxing ba85fc8c76 游戏充值导出修正
chenzhi e1c29c73af 总览统计结束
ELF 3e7382542d 打包区分ios新旧包
liuweiwen 6c529e7bbd 统计
chenzhi e763abbf92 123.
liuweiwen b4745a357c Merge branch 'dev' into dev_lww
chenzhi 68d23b469c 123
chenzhi 6bc0cdcf1e 123
zhengyongxing 059742043c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenxiaojun 7de0b54773 推广平台->数据管理->充值玩家--更新
chenxiaojun 781d6d408a 推广平台->数据管理->充值玩家--更新
ELF 8d3d0ad726 Merge branch 'master' of 47.111.118.107:/srv/git/platform
ELF 4afe365e40 Merge branch 'hotfix/add_bans_type'
liuweiwen 56f2c422aa 优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，（一句话简介）限制字数（最多30字）
chenxiaojun 536ee9627f 脚本：用户推广员数据刷新
chenxiaojun 845df466f6 脚本：用户推广员数据刷新
chenxiaojun 968bf2c067 脚本：用户推广员数据刷新
chenxiaojun 71df93a12f 推广平台->数据管理->充值玩家--更新
chenxiaojun 0ea1cf04ec 推广平台->数据管理-充值统计|财务管理-结算明细--合计
chenxiaojun a7c80b84c2 脚本：用户推广员数据刷新
chenxiaojun 167e056f9a 脚本：用户推广员数据刷新
chenxiaojun 014a0e2f34 脚本：用户推广员数据刷新
chenzhi 1c9ed4b2ba 优化统计
chenxiaojun 73ca6f1f3f 推广平台->数据管理->订单查询--更新
chenxiaojun 83267e230a 推广平台->数据管理->数据管理->订单查询--更新
chenxiaojun 6cce4d7e05 推广平台->数据管理->订单查询--更新
chenxiaojun 1af46a74ee 推广平台->数据管理->数据管理->订单查询--更新
liuweiwen 466153f51a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 16d91ec2ee 后台游戏评分限制
chenzhi 9962366ab9 暂存修改
zhengyongxing 2cc68f3086 Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev 
 Conflicts:
	Application/Admin/Controller/StatController.class.php
zhengyongxing 245e07fc3f 设备统计脚本bug修正
chenzhi c178de254b 合并dev
chenzhi ce20d48d57 总览-推广员聚合及展示
ELF cf31d4cc57 Merge branch 'hotfix/add_bans_type' into dev
ELF f3f497a21d Merge branch 'hotfix/oldpack' into dev
yulingwei fa9d40f87a 新增风控标识
zhengyongxing ad8dd94e32 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liaojinling 3cfce8675e 修改每分钟打包数量
zhengyongxing 57ca1269d6 登录导出优化
chenzhi ae03347437 123
chenzhi 74ff06d549 优化首页折现统计数据
zhengyongxing 56d3718c14 用户登录记录
liuweiwen b61587868b 上传广告图片
liuweiwen 1bd90da914 【统计】-【数据分析】-【ARPU分析】页面数据异常
zhengyongxing 9e26a06ed2 统计bug修正
zhengyongxing e8477373ff 定时脚本bug
liuweiwen 3dddaf247d 后台还原游戏充值导出
liuweiwen b764260647 后台上传官网附件
liuweiwen 790b49c95b Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 192ad84897 后台-》平台币充值导出时间
chenzhi 81e56063c7 优化取消补链提示
zhengyongxing 9abca632ae Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Admin/Controller/ExportController.class.php
zhengyongxing 9db27712e2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 14f69c408e 登录记录导出
zhengyongxing fd15fde141 登录记录导出修改
liuweiwen 8d52d52785 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen e962786e07 后台-【充值】-【平台币充值】导出充值时间出错
chenzhi f09ee94952 优化补链参数
chenzhi dd22e6d0e9 修改补链in/out
chenzhi 1d4c1accde 123
liuweiwen 6ca5b80d18 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
yulingwei 7a767466ef 锁号优化
zhengyongxing 1881d11d09 绑币收回修改
ELF 5737c714b1 修改
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 728f78db09 OA关联切换正式
“用lww 2eadac6b53 后台-》统计-》流失分析优化
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 793c1501ba 修改
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8f36f7204f 优化首页显示
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新
chenzhi 31fa9fe1f1 123
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 1caece3034 充值汇总修改，用户导出修改
chenzhi af593e4326 优化首页折线统计统计方式
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi dfff8b6240 优化推广员选择
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3f8168c11a 添加新短信
yulingwei 0965c480a3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei e8ed8f808b 修改修复脚本
zhengyongxing 7d70f856ce 用户玩家列表优化
zhanglingsheng 864e2e5de1 OA
chenzhi cd9363f9fe 优化游戏及推广员统计
“用lww 68b75f258c 后台-》统计-》流失分析优化
zhanglingsheng 473fd31be1 OA
zhanglingsheng 86f05872d2 OA
yulingwei 82556627f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 4e56f9e325 更新
zhanglingsheng a900e5ed66 OA关联
chenzhi 4f1bd88dc2 取消首页速度测试
ELF b720644b02 修改
chenzhi b610845d20 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 4af962e5a6 首页测试
zhengyongxing 6dee3f5939 平台币统计导出
zhengyongxing 93043b3abe 平台统计导出
zhengyongxing 96df83ebfb Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复
zhengyongxing 4e78370f14 推广员充值统计
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复
zhengyongxing 5a80070b97 推广后台导出修改
zhengyongxing 2ae543ad7e 用户导出修改
zhanglingsheng 3e8cfab9d0 OA-关联-导出
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ceb50f20b6 优化用户列表数据
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng de3f6196e6 oa关联
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 507e579755 用户列表统计
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 086c95b826 用户导出修改
zhengyongxing 8f1d59aa39 平台币充值bug
yulingwei d8a59b5670 更新
chenzhi 63c27e62ca 123
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新
yulingwei c3955dceb8 更新脚本
yulingwei d95540c92c 登录日志修复脚本
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 3ee50bcfc0 upt
ELF 390f22894a 修改运维脚本
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 80b7142317 修改运维脚本
chenzhi 9e171f2ce2 优化统计
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ce21545360 oa-关联
yulingwei 12fb156306 优化脚本
chenzhi e27cdc8a38 优化所有统计
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei bcc0b964b0 upt
zhanglingsheng e9e66fa8a0 oa关联
zhanglingsheng 0a9efe02ca oa关联
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4590988f95 oa
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei b9bc2a7162 更新
zhengyongxing 6fcdfd2f31 用户导出
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 1966e0a2e8 更新
zhengyongxing fc126c0bbf 平台币充值bug
zhengchanglong 965ad46dce 充值汇总导出BUG修复
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 7a873a9d98 平台币发放bug修正
zhanglingsheng 668e4d097c 推广员oa关联
zhanglingsheng 4915ebc70c 推广员oa关联
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng dcd9791f79 推广员oa关联
zhengyongxing ee65c37cb1 用户筛选条件修正
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev