Commit Graph

226 Commits (cc6c5d4e74e0c0e2bce655addb36f0ba3668cc74)

Author SHA1 Message Date
ELF d3a3b8cdb7 修改
ELF 0f44d9e95c 解决冲突
zhengchanglong bb08c723a3 Merge branch 'feature/group_type' into release-1.0.1
chenzhi dbc0e00132 合并
liuweiwen 57a1d8ed8c 对账系统
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev
# Conflicts:
#	Data/update.sql
liuweiwen 394a3e4bb5 cp/工会对账系统
chenxiaojun 114cb2f7a5 更新
chenxiaojun f2e0cec5aa 更新
chenxiaojun 0927417ce9 推广结算--更新
ELF f472f5e9d3 文件保存改成cdn
ELF 297ca262b6 修改落地页样式
ELF 4cfad7166d 修改落地页样式
ELF 67caddeef0 修改落地页样式
ELF 5e0c1c0f87 修改
liuweiwen 7a0280f50c excel下载模板
liuweiwen 263937f83e 落地页增加登录注册等静态页面
chenzhi 8bd7ae4fdb 优化框架层级问题
chenzhi 95f055b532 修改下拉框层级太大问题
liuweiwen dabdbb6c98 落地页测试
liuweiwen 8f99c7354a 落地页测试
liuweiwen d7bd8326bd 落地页测试
liuweiwen b608f8587b 落地页测试
liuweiwen 5bebb747f7 落地页样式调整测试
liuweiwen 656c1a9bbb 落地页样式调整测试
liuweiwen 50bea19cd2 落地页样式调整测试
liuweiwen c6588a4c35 落地页样式调整测试
liuweiwen d0eb964808 落地页样式调整测试
zhengchanglong 7c7ec4fc1d Merge branch 'dev_permission' into release-1.0.0
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/BehaviorLogController.class.php
#	Application/Admin/Controller/ExportController.class.php
liuweiwen c07ba38dbf 官网充值
liuweiwen e5067479d7 官网充值
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 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
chenxiaojun d6186a9579 推广平台>落地页--更新
liuweiwen 0b67ef8eb3 pc官网-》家长监护页-》导航样式调整
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen 188abdcbdd 落地页视频置顶判断
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen c31ae44f79 落地页去掉App购买
chenzhi 5359e67860 优化补链记录为ajax
liuweiwen 99f175eece 落地页样式调整
liuweiwen 52b134fe90 落地页样式调整
liuweiwen ce85de6f5c 落地页新增需求-增加app购买浮层
liuweiwen 4aa33ad48b 落地页视屏
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww
zhengchanglong 58399f4c69 PC官网优化
liuweiwen ef879b9bfb 手机官网轮播图
liuweiwen 4d19e0630f 样式修改
liuweiwen 473ad69fa3 补充用户协议
chenzhi c4eca18b4e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 25313a0fb1 实名认证样式修改
liuweiwen 65af73145a 绑定手机页面修改,修改密码页面修改
liuweiwen ea430f0b35 我的游戏去掉立即进入
liuweiwen 33de8241a9 落地页
liuweiwen d1a59714d9 落地页
liuweiwen 22179ddfd6 落地页前端修改
liuweiwen eb9b94f18f 超级签登录跳转
liuweiwen d68b9f34c3 落地页图片替换
liuweiwen a06537a9da 手机官网css
liuweiwen 0f8e3946c1 落地页css
liuweiwen d0341414f6 落地页css修改
liuweiwen 2ac6228073 pc官网 官网】----【账户充值】点击家长监护/客服帮助,无反馈
liuweiwen d838b6fc22 手机官网-发送验证码字体
chenzhi 15ce00396f 优化官网支付
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.