Commit Graph

2448 Commits (6188102e041344dad87bf5f1c4cc915459fe9354)
 

Author SHA1 Message Date
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 1bf6adb6c7 优化用户列表默认时间
tpingzhang 46dda0848f 合服 用户行为
liuweiwen 48ae252b4e 游戏表增加字段视频是否置顶
liuweiwen f8df1d57dd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
liuweiwen 188abdcbdd 落地页视频置顶判断
chenxiaojun 3b5a915bda 推广平台>数据管理>订单查询--更新
chenzhi 1010fe2674 推广补链新增查询条件
chenzhi 3d672db381 推广补链新增一系列查询条件
ELF c61a3e200a 解决冲突
ELF 6f7a930c25 修改数据库
ELF c451921b92 后台添加IOS打包方式选择
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 14644b44a2 落地页图片改为使用游戏截图
zhanglingsheng f8498638ad 游戏充值行为日志
zhanglingsheng f392ad4de0 游戏充值行为日志
zhanglingsheng ac0132575f Merge branch 'hotfix/log' into dev
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi df50ce6352 补链csv导出
liuweiwen c31ae44f79 落地页去掉App购买
chenxiaojun 4047208871 推广平台>数据管理>订单查询--更新
ELF c77016f284 Merge branch 'hotfix/changepack'
ELF 92accdc727 修改
chenzhi 5359e67860 优化补链记录为ajax
ELF a3a5ae1b76 Merge branch 'hotfix/changepack'
ELF a2de4bed7b 切换IOS新旧打包方式
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示
liuweiwen 99f175eece 落地页样式调整
liuweiwen 04bd089bd9 上传视频格式提示
liuweiwen e6dcd25bc4 解绑手机
ELF 87a440ef23 Merge branch 'hotfix/changepack'
ELF 1409846ac3 切换IOS新旧打包
chenzhi f8cbe8d9ef 分开推广补链和补链记录
liuweiwen 9892d72910 落地页样式调整
liuweiwen 52b134fe90 落地页样式调整
liuweiwen ce85de6f5c 落地页新增需求-增加app购买浮层
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 70aab2f137 角色查询新增创角时间区间查询
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表
liuweiwen 7995273b9f Merge remote-tracking branch 'origin/dev' into dev
liuweiwen fcbde62500 落地页游戏关闭下载判断
sunke 5ee4ce6552 修改下载日志
liuweiwen 5697e8d2c6 落地页前端修改
liuweiwen 53a4038622 落地页前端修改
liuweiwen dfa14fbbc7 落地页视频前端修改
liuweiwen 563b672c21 加提示
liuweiwen 14258a01a9 前端判断上传视频的大小与格式
liuweiwen a1bdc4b936 提示
liuweiwen d690c0e4ab 新增字段
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz