zhengchanglong
|
f88a5c7f6e
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
8a241cceb8
|
修改身份证加密显示方式
|
5 years ago |
tpingzhang
|
cbf74bca5d
|
苹果内购
|
5 years ago |
liuweiwen
|
de7d34576d
|
添加数据权限
推广员-推广员管理-推广补链
推广员-数据管理
推广员-结算管理
|
5 years ago |
chenxiaojun
|
0797a18e87
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
dd536f9556
|
推广平台>数据管理>充值玩家--更新
|
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
|
42881595aa
|
获取当前管理员有权限查看所有推广员id
|
5 years ago |
|
zhengchanglong
|
6851933966
|
新建分支
|
5 years ago |
|
zhengyongxing
|
d545c22c3b
|
数据管理功能提交
|
5 years ago |
|
liuweiwen
|
166a868543
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
zhengyongxing
|
5df3a59df4
|
扶持发放添加导出功能
|
5 years ago |
|
chenxiaojun
|
e0f5404a83
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
462dd061b7
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
b5b4f020a7
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
78b0f66d37
|
推广平台>落地页--更新
|
5 years ago |
|
zhengyongxing
|
6f584f8323
|
数据权限功能提交
|
5 years ago |
|
chenzhi
|
c251867ba6
|
修改用户列表重复搜索区服不存在bug
|
5 years ago |
|
liuweiwen
|
46aa23514e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
7cfa9175da
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
b21ec3859f
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
liuweiwen
|
cdf8f51007
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
d6b7bc811d
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
ea07864f98
|
管理后台>游戏>新增落地页视频封面 推广平台>落地页--更新
|
5 years ago |
sunke
|
b47eced096
|
日志分页
|
5 years ago |
|
liuweiwen
|
1686c7c3c0
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
liuweiwen
|
587da83973
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
zhanglingsheng
|
43d49b10a0
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
|
5 years ago |
|
zhanglingsheng
|
5d01cb1ff5
|
游戏充值预下单
|
5 years ago |
|
liuweiwen
|
c6ffac041f
|
官网充值页面弹窗提示修改：alert改为popmsg.msg
|
5 years ago |
|
zhanglingsheng
|
50dbc200e5
|
时间转换函数全部精确到秒
|
5 years ago |
|
sunke
|
0cb7a40ea9
|
行为日志角色id
|
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 |
|
sunke
|
92523d7429
|
充值状态
|
5 years ago |
|
sunke
|
4c1471f6bb
|
行为日志
|
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 |
|
zhengchanglong
|
ba4339977e
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
zhengyongxing
|
24dab9158b
|
管理后台bug修改
|
5 years ago |
|
liuweiwen
|
f5316aee55
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
zhanglingsheng
|
812532a52d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |