Commit Graph

483 Commits (17821039aba04c275e46669cad2c27911c35248c)

Author SHA1 Message Date
chenxiaojun 14d4c71a7f 管理后台>推广员管理>公会分成管理--更新
chenxiaojun 3e439715c1 管理后台>推广员管理>公会分成管理--更新
chenzhi c05698e991 公会统计4
liuweiwen 4bf6352f9d 导出添加数据权限
chenzhi 6e97bd3bbe Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
chenzhi b94fb8d794 公会统计4
sunke 5f24c670b8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 883dd449e0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 46c7c85b68 超级签详情样式
yulingwei 4dfdd653da Merge branch 'hotfix/ltv' into dev
yulingwei 63d945b4df 修改样式
yulingwei 007b8bbccd Merge branch 'hotfix/ltv' into dev
yulingwei bc7c6b493c 修复问题
liuweiwen 7f57b53646 渠道统计列表
liuweiwen af541bface 平台统计列表
yulingwei 70d6919d18 Merge branch 'hotfix/ltv' into dev
yulingwei 36b295919a 修复问题
chenxiaojun ef4443cd4c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenxiaojun 3d3b96abc1 安卓落地页视频样式修复
chenxiaojun cf8f6d007f Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
chenxiaojun 6c46cd711f 管理后台>推广员管理>公会分成管理--更新
chenzhi 36f8c5ed43 Merge branch 'dev_statistics' of 47.111.118.107:/srv/git/platform into dev_statistics
zhanglingsheng 83ce328062 超级订单搜索导出
liuweiwen 279e6d4d81 Merge remote-tracking branch 'origin/dev_statistics' into dev_statistics
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