Commit Graph

245 Commits (459026d842616869061ef2dd32c1d6a11a9379cd)

Author SHA1 Message Date
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.
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 三级变四级
sunke 692a1bcc11 webuploader插件
chenzhi 02151093af 修改
zyx c16a7c0322 后台分页样式样式添加右边框
zhengchanglong af68a2ef10 推官员首页优化
chenxiaojun 63b27d8c1d 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
zhengchanglong 32595840c3 Merge branch 'dev_zcl' into dev
chenzhi a54a6b8b26 优化bug
ELF cdfbe61fa2 Merge branch 'hotfix/pc' into dev
jbrazz 2d94c4a539 fix
ELF c888915daa Merge branch 'hotfix/query' into dev
ELF ece317d6fa 修改bug
Your Name 22e7866644 SDK菜单添加
zhengchanglong 8de8da4f38 超级签充值业务迁移mobile目录下
zhengchanglong 5889b69b71 Merge branch 'dev-cz' into dev
chenzhi ba4219dc64 更新忘记密码
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong f0dc10cd60 支付流程修改
chenzhi 4539c163a4 首页alert恢复
zhengchanglong 86040c88c6 超级签购买错误信息页面
chenzhi d24fa30651 优化
chenzhi 992ef831b5 验证码简化
chenzhi ca79a3f627 css ok
chenzhi b112a5548f 123
chenzhi cc78f094ad 去除blank
chenzhi b5484a07c6 blank
chenzhi 5236c7a6f1 优化css1
ELF 145144ba51 解决冲突
ELF 4a403076b9 解决冲突
ELF 983b707d69 修改手机端显示
chenzhi 88a971b56e 优化css
chenzhi 34801e02e3 优化适配
chenzhi b8153b1cd2 比例加大
chenzhi 866fb4c290 适配加大
chenzhi 953cb6b988 流程样式
chenzhi 712498aff9 下载
chenzhi 6ed821429f 检索
chenzhi 4ac6442777 更新
chenzhi da8aee73c6 增加弹框
“‘ 56f567e47f 支付
sunke 2e18b8cc05 资料详情落地页增加layui样式
chenxiaojun 53ebee76a8 新增:官网->客服帮助->模糊搜索
chenxiaojun af9e148f1d 新增:官网->客服帮助->模糊搜索
chenxiaojun 2b11bed26f 复制到剪切板功能更新
zhengchanglong 29282badd6 超级签删除冗余页面及JS路径有误修正
tpingzhang c3a8f6b508 优先扣除绑币、平台币
超级签
兼容应用内应用外跳转
chenxiaojun 7afc18daae 更新:充值明细 注册明细 数据汇总 每日概况
ELF cd58cecd3f 修改bug
zhengchanglong 71dba327c2 推广员后台首页消息列表添加分页
zhengchanglong dc65aa0766 Merge remote-tracking branch 'origin/dev' into dev
zhengchanglong 5229da60f1 推广员管理后台首页业务
ELF bfadef687f 添加功能
tpingzhang 3283f5e3bd 快捷支付
zhengchanglong 1a62aed2d4 支付跳转修改
zhengchanglong 13a4a48c1d 超级签H5无订单优化
ELF ba7511897a 修改
ELF d9f826cf12 提交内容
ELF 2ffa024c4c initial