elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,847 Commits
1 Branch
0 Tags
154 MiB
Commit Graph

908 Commits (da5e8b9050700fc752213e7e104bf66fbefeb7f0)

Author SHA1 Message Date
zhanglingsheng 33c3fd1d0d 游戏联动查询
zhanglingsheng 6ddf42181c 游戏查询联动
zhanglingsheng 24d47089dd 游戏预充值
chenzhi 5257528b87 Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission
chenzhi da79ff4441 优化角色权限2
zhengyongxing deaeed6027 数据授权修改内容提交
zhengyongxing 6dc8366018 数据授权修改内容提交
zhanglingsheng a15e62988b 游戏预充值-导出
chenzhi 1623f3ae65 优化多会长统计1
zhanglingsheng eaf1cb3f17 游戏区服联动修改
liuweiwen 6b1bbe4c20 数据授权修改
zhanglingsheng 47628f2981 游戏充值预下单
zhanglingsheng fb425d3e91 游戏充值预下单
zhengyongxing 21412df14e Merge branch 'dev_permission' of 47.111.118.107:/srv/git/platform into dev_permission
zhengyongxing 3aa3c3f66b 数据授权修改
zhanglingsheng e949a4a60b 游戏充值预下单
zhanglingsheng 95f7acd6ff 游戏充值预下单
zhanglingsheng 65e1ddbd93 游戏充值预下单
zhengchanglong 732ba257ec 修改身份证加密显示方式
zhengchanglong f88a5c7f6e Merge branch 'dev' into release-1.0.0
zhengchanglong 8a241cceb8 修改身份证加密显示方式
liuweiwen de7d34576d 添加数据权限 
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
liuweiwen 24e322c139 Merge remote-tracking branch 'origin/dev_permission' into dev_permission
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 2b336dd560 数据文件删除
zhengyongxing 4a5a6a90d0 Merge branches 'dev_permission' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_permission 
 Conflicts:
	Data/update.sql
liuweiwen 1212d3249e 添加数据权限 
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
chenzhi ff6c70e380 合并cz
zhengchanglong 9490c7a40d Merge branch 'dev' into release-1.0.0
liuweiwen 42881595aa 获取当前管理员有权限查看所有推广员id
zhengchanglong 6851933966 新建分支
zhengyongxing d545c22c3b 数据管理功能提交
liuweiwen 166a868543 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 5df3a59df4 扶持发放添加导出功能
zhengyongxing 6f584f8323 数据权限功能提交
chenzhi c251867ba6 修改用户列表重复搜索区服不存在bug
chenxiaojun 7cfa9175da 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun b21ec3859f 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun d6b7bc811d 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
chenxiaojun ea07864f98 管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
zhanglingsheng 5d01cb1ff5 游戏充值预下单
zhanglingsheng 6d2c4fc3a2 游戏充值预下单
zhengyongxing 7ec754e0eb Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng a5cc0f339f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 62502f0732 游戏充值预下单
zhengyongxing e6c45bc494 推广补链导出修改
zhengyongxing 6fbf14c9fe Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
zhengyongxing 24dab9158b 管理后台bug修改
zhanglingsheng 812532a52d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3a20c68117 游戏充值预下单修改
chenzhi db6131a135 暂存
zhengyongxing 46538019d4 管理后台新开发功能修改
zhengchanglong 6fa8392766 Merge branch 'master_zcl' into release-1.0.0
zhengchanglong ec0fb0d0b4 Merge branch 'master_zcl' into dev
zhengchanglong 65b5fc4a26 隐藏游戏充值列表部分字段
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
zhengchanglong 4e8abd5975 Merge branch 'master_zcl' into release-1.0.0 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong 996b9bceac Merge branch 'master_zcl' into dev 
# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php
zhengchanglong d265c9b03f 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong 381fa8d633 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong ed584bfb2f 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong a55efe582b 管理后台-用户组-玩家列表敏感信息加密显示
zhengchanglong c32c1780e6 管理后台-用户组-玩家列表敏感信息加密显示
chenzhi ab29dafffc 补链旧数据脚本
chenzhi 9df450f8cc 优化订单日期内多个推广员无法补链
zhengyongxing b2d1c27054 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
zhengyongxing 8b2d04f986 管理后台新开发功能修改
zhengyongxing e2e685e8c3 管理后台新开发功能修改
chenzhi 60c7bdce34 新增补链时判断是否已结算
chenxiaojun 9d09913bd0 推广平台>数据管理>充值玩家--更新
chenxiaojun 64eb3ce4cb 推广平台>数据管理>充值玩家--更新
chenxiaojun b27906d470 推广平台>数据管理>充值玩家--更新
chenzhi 1ccbd03a0f 超级签新增支付方式
zhanglingsheng cf7440e87e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ad97083c9f 行为日志文案
chenzhi 0c62e80e67 优化总览表格高度
zhengyongxing f112364f63 超级签功能bug修改
chenzhi 6188102e04 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 1bf6adb6c7 优化用户列表默认时间
zhengyongxing 11177b895c Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
liuweiwen 188abdcbdd 落地页视频置顶判断
zhengyongxing 7b12780d9c 管理后台新开发功能修改
zhengyongxing 976a697b24 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 1010fe2674 推广补链新增查询条件
chenzhi 3d672db381 推广补链新增一系列查询条件
ELF c451921b92 后台添加IOS打包方式选择
liuweiwen cdeea23034 Merge remote-tracking branch 'origin/dev' into dev
liuweiwen 14644b44a2 落地页图片改为使用游戏截图
zhanglingsheng f8498638ad 游戏充值行为日志
zhanglingsheng f392ad4de0 游戏充值行为日志
chenzhi 1649cd1e80 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi df50ce6352 补链csv导出
liuweiwen c31ae44f79 落地页去掉App购买
chenzhi 5359e67860 优化补链记录为ajax
liuweiwen aff492b470 超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
liuweiwen 04bd089bd9 上传视频格式提示
chenzhi f8cbe8d9ef 分开推广补链和补链记录
zhengyongxing fd187aa04f 白名单修改
chenzhi 68f4ffc559 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 70aab2f137 角色查询新增创角时间区间查询
chenzhi 6ad8154832 优化vip等级筛选时的玩家列表
zhengyongxing fa393d9c90 管理后台新增功能添加
liuweiwen 563b672c21 加提示
liuweiwen 14258a01a9 前端判断上传视频的大小与格式
liuweiwen a1bdc4b936 提示
chenzhi 95aa18a928 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
liuweiwen b0748243b9 编辑游戏-》上传视频
liuweiwen fb5d9afded 落地页视频上传和显示
liuweiwen e3fe1cc03f 后台管理-》编辑游戏-》上传视频 
手机端落地页显示视频
chenzhi 768c03c78d 优化总览导出为前端导出
liuweiwen 522ba58a4d 推广公司
liuweiwen 59b1e3149e 管理后台-推广公司搜索
liuweiwen ecdfd078fc Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi 48fac5ab4d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi c2fb23f9a2 优化用户列表结束
chenzhi d948dee3df 用户列表优化3
liuweiwen 3c6ca71bb6 解绑手机
chenzhi 20ff424e52 优化用户列表4
chenzhi 03a03fd61e 优化用户列表3
chenzhi d4968e4c72 优化推广员
zhengyongxing 4df0f91f43 管理后台上传图片修改
zhengyongxing a074b4a319 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing dce35b6ff1 管理后台游戏编辑上传图片限制大小
liuweiwen a7c5957201 推广公司管理
liuweiwen fd7481a940 风控管理样式调整
liuweiwen 93d46b74ae 样式调整
chenzhi 3f358bb818 优化用户列表2
liuweiwen 1693f7fa98 推广公司
chenzhi 4aa9ac6767 用户表优化1
liuweiwen d51725f1af 新增推广员时，新增推广所属公司
liuweiwen 3caf155a43 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing cfdea5db7c 管理后台导出数据一部分修改
zhengyongxing 30b3794ef4 管理后台导出数据bug修正
zhengyongxing 4f385a87c6 管理后台导出数据修改
zhengyongxing fbead8c3a1 推广补链导出修改
liuweiwen fb39008cb5 Merge remote-tracking branch 'origin/dev' into dev_lww
chenzhi d48b0f1341 优化统计
zhengyongxing 65fd27fe36 导出修改
zhengyongxing 2fb77092cf 管理后台导出数据一部分修改
chenzhi 25cb177aea 新增游戏区服开服预告
chenzhi dbc77d07e7 优化聚合排序
chenzhi cfa67f9e3e 总览统计结束
zhengchanglong a37c8aa945 Merge branch 'dev_zyx' into dev
zhengyongxing ba85fc8c76 游戏充值导出修正
chenzhi e1c29c73af 总览统计结束
ELF 3e7382542d 打包区分ios新旧包
liuweiwen 97a7aa7437 落地页
liuweiwen 6c529e7bbd 统计
chenzhi e763abbf92 123.
liuweiwen b4745a357c Merge branch 'dev' into dev_lww