zhanglingsheng
|
a15e62988b
|
游戏预充值-导出
|
5 years ago |
chenzhi
|
1623f3ae65
|
优化多会长统计1
|
5 years ago |
zhanglingsheng
|
eaf1cb3f17
|
游戏区服联动修改
|
5 years ago |
liuweiwen
|
6b1bbe4c20
|
数据授权修改
|
5 years ago |
zhanglingsheng
|
47628f2981
|
游戏充值预下单
|
5 years ago |
zhanglingsheng
|
fb425d3e91
|
游戏充值预下单
|
5 years ago |
zhanglingsheng
|
e949a4a60b
|
游戏充值预下单
|
5 years ago |
zhanglingsheng
|
95f7acd6ff
|
游戏充值预下单
|
5 years ago |
zhanglingsheng
|
65e1ddbd93
|
游戏充值预下单
|
5 years ago |
liuweiwen
|
de7d34576d
|
添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
|
5 years ago |
liuweiwen
|
24e322c139
|
Merge remote-tracking branch 'origin/dev_permission' into dev_permission
|
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
|
2b336dd560
|
数据文件删除
|
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 |
liuweiwen
|
1212d3249e
|
添加数据权限
推广员-推广员管理-推广员列表
推广员-推广员管理-游戏分包
|
5 years ago |
chenzhi
|
ff6c70e380
|
合并cz
|
5 years ago |
zhengchanglong
|
9490c7a40d
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
liuweiwen
|
166a868543
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
zhengyongxing
|
5df3a59df4
|
扶持发放添加导出功能
|
5 years ago |
zhengyongxing
|
6f584f8323
|
数据权限功能提交
|
5 years ago |
chenxiaojun
|
d6b7bc811d
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
chenxiaojun
|
ea07864f98
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
zhanglingsheng
|
5d01cb1ff5
|
游戏充值预下单
|
5 years ago |
zhanglingsheng
|
6d2c4fc3a2
|
游戏充值预下单
|
5 years ago |
zhengyongxing
|
7ec754e0eb
|
Merge branches 'dev' and 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zhanglingsheng
|
a5cc0f339f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zhanglingsheng
|
62502f0732
|
游戏充值预下单
|
5 years ago |
zhengyongxing
|
e6c45bc494
|
推广补链导出修改
|
5 years ago |
zhengyongxing
|
6fbf14c9fe
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
|
5 years ago |
zhengyongxing
|
24dab9158b
|
管理后台bug修改
|
5 years ago |
zhanglingsheng
|
812532a52d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
zhanglingsheng
|
3a20c68117
|
游戏充值预下单修改
|
5 years ago |
zhengyongxing
|
46538019d4
|
管理后台新开发功能修改
|
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 |
zhengchanglong
|
4e8abd5975
|
Merge branch 'master_zcl' into release-1.0.0
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/MemberController.class.php
|
5 years ago |
zhengchanglong
|
996b9bceac
|
Merge branch 'master_zcl' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Admin/Controller/MemberController.class.php
|
5 years ago |
zhengchanglong
|
a55efe582b
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
zhengchanglong
|
c32c1780e6
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
chenzhi
|
ab29dafffc
|
补链旧数据脚本
|
5 years ago |
chenzhi
|
9df450f8cc
|
优化订单日期内多个推广员无法补链
|
5 years ago |
zhengyongxing
|
8b2d04f986
|
管理后台新开发功能修改
|
5 years ago |
zhengyongxing
|
e2e685e8c3
|
管理后台新开发功能修改
|
5 years ago |
chenzhi
|
60c7bdce34
|
新增补链时判断是否已结算
|
5 years ago |
chenzhi
|
1ccbd03a0f
|
超级签新增支付方式
|
5 years ago |
zhengyongxing
|
f112364f63
|
超级签功能bug修改
|
5 years ago |
chenzhi
|
6188102e04
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
chenzhi
|
1bf6adb6c7
|
优化用户列表默认时间
|
5 years ago |
zhengyongxing
|
976a697b24
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
chenzhi
|
1010fe2674
|
推广补链新增查询条件
|
5 years ago |
chenzhi
|
3d672db381
|
推广补链新增一系列查询条件
|
5 years ago |
ELF
|
c451921b92
|
后台添加IOS打包方式选择
|
5 years ago |
zhanglingsheng
|
f8498638ad
|
游戏充值行为日志
|
5 years ago |
zhanglingsheng
|
f392ad4de0
|
游戏充值行为日志
|
5 years ago |
chenzhi
|
1649cd1e80
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
chenzhi
|
df50ce6352
|
补链csv导出
|
5 years ago |
chenzhi
|
5359e67860
|
优化补链记录为ajax
|
5 years ago |
liuweiwen
|
aff492b470
|
超级签新增需求-》后台增加超级签级签状态,手机端验证状态是否可下载与显示
|
5 years ago |
chenzhi
|
f8cbe8d9ef
|
分开推广补链和补链记录
|
5 years ago |
zhengyongxing
|
fd187aa04f
|
白名单修改
|
5 years ago |
chenzhi
|
70aab2f137
|
角色查询新增创角时间区间查询
|
5 years ago |
chenzhi
|
6ad8154832
|
优化vip等级筛选时的玩家列表
|
5 years ago |
zhengyongxing
|
fa393d9c90
|
管理后台新增功能添加
|
5 years ago |
chenzhi
|
95aa18a928
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
liuweiwen
|
fb5d9afded
|
落地页视频上传和显示
|
5 years ago |
liuweiwen
|
e3fe1cc03f
|
后台管理-》编辑游戏-》上传视频
手机端落地页显示视频
|
5 years ago |
liuweiwen
|
522ba58a4d
|
推广公司
|
5 years ago |
liuweiwen
|
59b1e3149e
|
管理后台-推广公司搜索
|
5 years ago |
liuweiwen
|
ecdfd078fc
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
chenzhi
|
48fac5ab4d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
chenzhi
|
c2fb23f9a2
|
优化用户列表结束
|
5 years ago |
chenzhi
|
d948dee3df
|
用户列表优化3
|
5 years ago |
chenzhi
|
20ff424e52
|
优化用户列表4
|
5 years ago |
chenzhi
|
03a03fd61e
|
优化用户列表3
|
5 years ago |
chenzhi
|
d4968e4c72
|
优化推广员
|
5 years ago |
zhengyongxing
|
dce35b6ff1
|
管理后台游戏编辑上传图片限制大小
|
5 years ago |
liuweiwen
|
a7c5957201
|
推广公司管理
|
5 years ago |
chenzhi
|
3f358bb818
|
优化用户列表2
|
5 years ago |
liuweiwen
|
1693f7fa98
|
推广公司
|
5 years ago |
chenzhi
|
4aa9ac6767
|
用户表优化1
|
5 years ago |
liuweiwen
|
d51725f1af
|
新增推广员时,新增推广所属公司
|
5 years ago |
liuweiwen
|
3caf155a43
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
zhengyongxing
|
cfdea5db7c
|
管理后台导出数据一部分修改
|
5 years ago |
zhengyongxing
|
30b3794ef4
|
管理后台导出数据bug修正
|
5 years ago |
zhengyongxing
|
4f385a87c6
|
管理后台导出数据修改
|
5 years ago |
zhengyongxing
|
fbead8c3a1
|
推广补链导出修改
|
5 years ago |
liuweiwen
|
fb39008cb5
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
chenzhi
|
d48b0f1341
|
优化统计
|
5 years ago |
zhengyongxing
|
65fd27fe36
|
导出修改
|
5 years ago |
zhengyongxing
|
2fb77092cf
|
管理后台导出数据一部分修改
|
5 years ago |
chenzhi
|
25cb177aea
|
新增游戏区服开服预告
|
5 years ago |
chenzhi
|
dbc77d07e7
|
优化聚合排序
|
5 years ago |
chenzhi
|
cfa67f9e3e
|
总览统计结束
|
5 years ago |
zhengchanglong
|
a37c8aa945
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zhengyongxing
|
ba85fc8c76
|
游戏充值导出修正
|
5 years ago |
chenzhi
|
e1c29c73af
|
总览统计结束
|
5 years ago |
ELF
|
3e7382542d
|
打包区分ios新旧包
|
5 years ago |
liuweiwen
|
6c529e7bbd
|
统计
|
5 years ago |
chenzhi
|
e763abbf92
|
123.
|
5 years ago |
liuweiwen
|
b4745a357c
|
Merge branch 'dev' into dev_lww
|
5 years ago |
chenzhi
|
68d23b469c
|
123
|
5 years ago |