Commit Graph

2212 Commits (df1b8784851701ca6cf3c9e1121245d0221cc8fa)

Author SHA1 Message Date
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新
sunke 49408030f0 行为日志
liuweiwen b992d5a744 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 98f7653f2a pc官网-》家长监护-》更换家长监护引导内容
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ad97083c9f 行为日志文案
chenxiaojun a389f9a245 推广平台>落地页>安卓添加视频
chenxiaojun ff2481cdc4 推广平台>落地页>安卓添加视频
ELF 991861e488 解决冲突
ELF 289b40329f 添加换绑时金额
liuweiwen f8df1d57dd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Data/update.sql
liuweiwen 188abdcbdd 落地页视频置顶判断
chenxiaojun 3b5a915bda 推广平台>数据管理>订单查询--更新
ELF c61a3e200a 解决冲突
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
liuweiwen c31ae44f79 落地页去掉App购买
chenxiaojun 4047208871 推广平台>数据管理>订单查询--更新
ELF 92accdc727 修改
ELF a2de4bed7b 切换IOS新旧打包方式
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示
liuweiwen 04bd089bd9 上传视频格式提示
liuweiwen e6dcd25bc4 解绑手机
ELF 1409846ac3 切换IOS新旧打包
liuweiwen 9892d72910 落地页样式调整
liuweiwen 52b134fe90 落地页样式调整
liuweiwen ce85de6f5c 落地页新增需求-增加app购买浮层
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 b0748243b9 编辑游戏-》上传视频
sunke 7bcbb6c9d1 订单查询充值状态增加
liuweiwen fb5d9afded 落地页视频上传和显示
chenxiaojun 45f061d81c 推广平台>数据管理>订单查询--更新
elf@home 9c3b872cb9 修改打包模式
ELF 1a8be9429c 修改打包方式
liuweiwen f9eedf339b 文字修改
liuweiwen 3c6ca71bb6 解绑手机
liuweiwen 1a9b90d5cc 解绑手机
liuweiwen aadfb0af62 充值页面问号
liuweiwen 8380f6d33b 官网超级签不可点击
yulingwei 84fc4e367b 更新
zhengyongxing 4df0f91f43 管理后台上传图片修改
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小
liuweiwen fd7481a940 风控管理样式调整
liuweiwen 93d46b74ae 样式调整
liuweiwen 0c3225a9bc 【家长监护】页面导航改为介绍详细说明
liuweiwen 02f6ce3bb0 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 6b13ab0c66 招商合作改为商务合作
zhengyongxing f009243399 官网登录跳转修正
liuweiwen 473ad69fa3 补充用户协议
liuweiwen e6e382fa2a 手机官网商务合作文字修改
zhengyongxing 767359f3e7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改
liuweiwen d2df0e6631 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen d630645398 官网增加国浩律师链接
zhengyongxing 30b3794ef4 管理后台导出数据bug修正
zhengyongxing ee32adb459 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 4f385a87c6 管理后台导出数据修改
zhengchanglong ef523bf653 落地页下载安装提示图片顺序修改
zhengchanglong 6bf056fb60 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong e54b7ba88d 超级签购买测试
liuweiwen 836b2013d5 官网首页
liuweiwen 3383a6864a Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ef5073e9cb 去掉单位
zhengyongxing d6184531d8 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing fbead8c3a1 推广补链导出修改
zhengchanglong 628b90b72c 超级签购买测试
zhengyongxing 65fd27fe36 导出修改
zhengyongxing 79198191a7 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改
chenzhi a8753d0932 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 3abfc47677 优化推广后台显示的开服公告
zhengchanglong 8a96875e27 超级签购买测试
liuweiwen 4f63c08bc0 手机官网隐藏昵称
liuweiwen fd5c9fba0f Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 56b6153d26 解绑手机
chenzhi c4eca18b4e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 25313a0fb1 实名认证样式修改
liuweiwen 070d9dd9b7 解绑手机
liuweiwen c64aab6d39 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 65af73145a 绑定手机页面修改,修改密码页面修改
chenxiaojun a128fff331 推广平台->首页--更新
chenxiaojun e8a4da70cc 推广平台->首页--更新
chenxiaojun 097240f5ec 推广平台->首页--更新
chenxiaojun e9bfaef26b 推广平台->首页--更新
chenzhi 84d55a687f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 25cb177aea 新增游戏区服开服预告
liuweiwen 6f2ef23c7b 忘记密码
liuweiwen ea430f0b35 我的游戏去掉立即进入
ELF 1c83185aaf 修改打包方式
liuweiwen 914c9a5cf8 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 1f23955af1 手机官网-忘记密码改为新页面,两个页面何为一个页面
ELF ebbe43d918 Merge branch 'master' of 47.111.118.107:/srv/git/platform
ELF 69708490ba Merge branch 'hotfix/download'
sunke 34b53c4ec1 数据汇总合计
sunke b82803c1e5 合计
liuweiwen 220a458e11 落地页
liuweiwen 7dc73e7210 落地页
liuweiwen 8551160563 落地页
liuweiwen a162511034 落地页
liuweiwen fdce7a9a08 落地页
liuweiwen f61d739764 落地页
liuweiwen b736b00f57 落地页
liuweiwen a4da5aa6c2 落地页
liuweiwen c528c66540 落地页
liuweiwen b157adb6e4 落地页
liuweiwen c877f4d7cd 落地页
liuweiwen 24747f1ba0 落地页
liuweiwen 8c3278975e 落地页
liuweiwen 3cd616d64c 落地页
liuweiwen e860ee083c 落地页
liuweiwen afd5ecb036 落地页
liuweiwen 66e4244e45 落地页
liuweiwen 9a0354a287 落地页
liuweiwen 46befba117 落地页
liuweiwen a5df34cfd9 落地页
liuweiwen 6590a35319 落地页
chenxiaojun d53ca22dd0 推广平台->首页--更新
chenxiaojun 747c97ceec 推广平台->首页--更新
liuweiwen 660d9d9550 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen bfd5fae1ce 落地页
chenxiaojun 58d13124d9 推广平台->首页--更新
chenxiaojun ef9fe76454 推广平台->首页更新
sunke 9f60171191 每日概况合计
liuweiwen bfb14a84f0 落地页
liuweiwen c7f734c5ad 落地页
liuweiwen ed8b227f07 落地页
liuweiwen a8c70e7767 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 9e969de165 落地页
sunke ff224f4b7d 玩家注册 充值玩家下载优化
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev
zhengyongxing ba85fc8c76 游戏充值导出修正
liuweiwen a8273472ae 落地页
liuweiwen 493cfbafee 我的游戏
ELF 837858a162 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 3e7382542d 打包区分ios新旧包