Commit Graph

108 Commits (7a767466ef2a6ed08f29149436d156e8c8a448a2)

Author SHA1 Message Date
chenxiaojun e6210336c8 推广平台->游戏管理->游戏详情--样式调整
chenxiaojun 840dc085a4 推广平台->游戏管理->游戏详情--样式调整
“用lww 1b2a9c7f9b pc官网修改
“用lww 595c64e831 pc官网修改
“用lww 6e1db7caa6 Merge remote-tracking branch 'origin/dev' into dev_lww
“用lww 0168a52b68 手机官网-页面更改
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun 49270427ee 推广平台->数据汇总->充值玩家--更新
“用lww 07a33ab051 手机官网-落地页
“用lww 28db83f646 Merge remote-tracking branch 'origin/dev' into dev_lww
“用lww 97543cebb8 pc官网-充值页面修改
yulingwei 26d0d0d6cb merge
yulingwei a9f06b1d57 修改批量锁定问题
chenzhi 2a417c2746 123
chenxiaojun b4a1a24dda 推广平台->游戏管理->专服|混服--样式调整
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengchanglong 1e2635cff2 手机官网修改
zhengchanglong 00858df9fb PC官网修改
zyx 0d090ded9b 礼包界面
chenzhi 5d454e5429 我的游戏
chenzhi bf728438d7 优化
chenzhi 9764d361f1 123
chenzhi 40001277bc login
chenzhi 3098558fe0 lww代码合并
sunke 84448998dd tubiao
sunke f5dd537074 图标判断
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev
sunke fe9336b055 common.js
“用lww 7962cc62b4 pc端官网修改
“用lww cf78ecd0cc pc端官网修改
“用lww 9ef65ced5c Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts.
chenzhi c11814f902 修改背景
zhengchanglong f21403a05b Merge branch 'dev_lww' into feature/promote
“用lww e019e23ca4 pc端官网修改
sunke f948bfbb7d 下载器内容
ELF 070cc2e7c2 修改bug
ELF e0d542b5f6 解决冲突
“用lww 4edd0bac4a 修改
zyx 5eca14b69e Merge branches 'dev' and 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
“用lww d5998e722e 官网-底部间距调整
ELF 3d88a82794 回滚官网
“用lww fb99dc3389 官网
“用lww 320ebf1b6e 新增分支dev_lww
ELF 89b243930d 落地页下载页优化
elf@home fc1cef9ec1 修改落地页/下载页
chenzhi 498de9ab75 同步dev
zhengchanglong 55d9c36ccf 修改推广员首页样式
chenzhi 5b40ebdf91 dev
ELF 5b62b99765 三级变四级