elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,088 Commits
1 Branch
0 Tags
154 MiB
master
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'bd9af09830'
${ noResults }
Commit Graph

221 Commits (bd9af09830306c5e876ae5655d263b2f9c3e4cc5)

Author SHA1 Message Date
zhengchanglong 1c00290da9 Merge branch 'feature/group_type' into dev 
# Conflicts:
#	Data/update.sql
 5 years ago
liuweiwen 394a3e4bb5 cp/工会对账系统 5 years ago
chenxiaojun 114cb2f7a5 更新 5 years ago
chenxiaojun f2e0cec5aa 更新 5 years ago
chenxiaojun 0927417ce9 推广结算--更新 5 years ago
ELF f472f5e9d3 文件保存改成cdn 5 years ago
ELF 297ca262b6 修改落地页样式 5 years ago
ELF 4cfad7166d 修改落地页样式 5 years ago
ELF 67caddeef0 修改落地页样式 5 years ago
ELF 5e0c1c0f87 修改 5 years ago
liuweiwen 7a0280f50c excel下载模板 5 years ago
liuweiwen 263937f83e 落地页增加登录注册等静态页面 5 years ago
chenzhi 8bd7ae4fdb 优化框架层级问题 5 years ago
chenzhi 95f055b532 修改下拉框层级太大问题 5 years ago
liuweiwen dabdbb6c98 落地页测试 5 years ago
liuweiwen 8f99c7354a 落地页测试 5 years ago
liuweiwen d7bd8326bd 落地页测试 5 years ago
liuweiwen b608f8587b 落地页测试 5 years ago
liuweiwen 5bebb747f7 落地页样式调整测试 5 years ago
liuweiwen 656c1a9bbb 落地页样式调整测试 5 years ago
liuweiwen 50bea19cd2 落地页样式调整测试 5 years ago
liuweiwen c6588a4c35 落地页样式调整测试 5 years ago
liuweiwen d0eb964808 落地页样式调整测试 5 years ago
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
 5 years ago
liuweiwen c07ba38dbf 官网充值 5 years ago
liuweiwen e5067479d7 官网充值 5 years ago
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
 5 years ago
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
 5 years ago
chenzhi ff6c70e380 合并cz 5 years ago
zhengyongxing d545c22c3b 数据管理功能提交 5 years ago
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
 5 years ago
chenxiaojun d6186a9579 推广平台>落地页--更新 5 years ago
liuweiwen 0b67ef8eb3 pc官网-》家长监护页-》导航样式调整 5 years ago
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
liuweiwen 188abdcbdd 落地页视频置顶判断 5 years ago
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
liuweiwen c31ae44f79 落地页去掉App购买 5 years ago
chenzhi 5359e67860 优化补链记录为ajax 5 years ago
liuweiwen 99f175eece 落地页样式调整 5 years ago
liuweiwen 52b134fe90 落地页样式调整 5 years ago
liuweiwen ce85de6f5c 落地页新增需求-增加app购买浮层 5 years ago
liuweiwen 4aa33ad48b 落地页视屏 5 years ago
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
 5 years ago
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
zhengchanglong 58399f4c69 PC官网优化 5 years ago
liuweiwen ef879b9bfb 手机官网轮播图 5 years ago
liuweiwen 4d19e0630f 样式修改 5 years ago
liuweiwen 473ad69fa3 补充用户协议 5 years ago
chenzhi c4eca18b4e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi 25313a0fb1 实名认证样式修改 5 years ago
liuweiwen 65af73145a 绑定手机页面修改，修改密码页面修改 5 years ago
liuweiwen ea430f0b35 我的游戏去掉立即进入 5 years ago
liuweiwen 33de8241a9 落地页 5 years ago
liuweiwen d1a59714d9 落地页 5 years ago
liuweiwen 22179ddfd6 落地页前端修改 5 years ago
liuweiwen eb9b94f18f 超级签登录跳转 5 years ago
liuweiwen d68b9f34c3 落地页图片替换 5 years ago
liuweiwen a06537a9da 手机官网css 5 years ago
liuweiwen 0f8e3946c1 落地页css 5 years ago
liuweiwen d0341414f6 落地页css修改 5 years ago
liuweiwen 2ac6228073 pc官网 官网】----【账户充值】点击家长监护/客服帮助，无反馈 5 years ago
liuweiwen d838b6fc22 手机官网-发送验证码字体 5 years ago
chenzhi 15ce00396f 优化官网支付 5 years ago
chenxiaojun e6210336c8 推广平台->游戏管理->游戏详情--样式调整 5 years ago
chenxiaojun 840dc085a4 推广平台->游戏管理->游戏详情--样式调整 5 years ago
“用lww 1b2a9c7f9b pc官网修改 5 years ago
“用lww 595c64e831 pc官网修改 5 years ago
“用lww 6e1db7caa6 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
“用lww 0168a52b68 手机官网-页面更改 5 years ago
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
 5 years ago
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新 5 years ago
chenxiaojun 49270427ee 推广平台->数据汇总->充值玩家--更新 5 years ago
“用lww 07a33ab051 手机官网-落地页 5 years ago
“用lww 28db83f646 Merge remote-tracking branch 'origin/dev' into dev_lww 5 years ago
“用lww 97543cebb8 pc官网-充值页面修改 5 years ago
yulingwei 26d0d0d6cb merge 5 years ago
yulingwei a9f06b1d57 修改批量锁定问题 5 years ago
chenzhi 2a417c2746 123 5 years ago
chenxiaojun b4a1a24dda 推广平台->游戏管理->专服|混服--样式调整 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhengchanglong 1e2635cff2 手机官网修改 5 years ago
zhengchanglong 00858df9fb PC官网修改 5 years ago
zyx 0d090ded9b 礼包界面 5 years ago
chenzhi 5d454e5429 我的游戏 5 years ago
chenzhi bf728438d7 优化 5 years ago
chenzhi 9764d361f1 123 5 years ago
chenzhi 40001277bc login 5 years ago
chenzhi 3098558fe0 lww代码合并 5 years ago
sunke 84448998dd tubiao 5 years ago
sunke f5dd537074 图标判断 5 years ago
zhengchanglong d2f547eb9c Merge branch 'feature/promote' into dev 5 years ago
sunke fe9336b055 common.js 5 years ago
“用lww 7962cc62b4 pc端官网修改 5 years ago
“用lww cf78ecd0cc pc端官网修改 5 years ago
“用lww 9ef65ced5c Merge branch 'feature/promote' of D:\workspace\git\platform with conflicts. 5 years ago
chenzhi c11814f902 修改背景 5 years ago
zhengchanglong f21403a05b Merge branch 'dev_lww' into feature/promote 5 years ago
“用lww e019e23ca4 pc端官网修改 5 years ago
sunke f948bfbb7d 下载器内容 5 years ago
ELF 070cc2e7c2 修改bug 5 years ago