Commit Graph

327 Commits (69ad354ff7df86b0b624e70f8c293c322df319a8)

Author SHA1 Message Date
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 优化脚本