zhengchanglong
|
f88a5c7f6e
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
8a241cceb8
|
修改身份证加密显示方式
|
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 |
|
zhanglingsheng
|
3a20c68117
|
游戏充值预下单修改
|
5 years ago |
|
liuweiwen
|
dabfc64dc9
|
Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
146b9e518a
|
解决落地页视频不置顶无视频显示视频框，滚动层被游戏截图挡住
|
5 years ago |
|
chenzhi
|
db6131a135
|
暂存
|
5 years ago |
|
chenxiaojun
|
01ef816ee1
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
zhengyongxing
|
46538019d4
|
管理后台新开发功能修改
|
5 years ago |
|
zhengchanglong
|
6fa8392766
|
Merge branch 'master_zcl' into release-1.0.0
|
5 years ago |
|
zhengchanglong
|
ec0fb0d0b4
|
Merge branch 'master_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
65b5fc4a26
|
隐藏游戏充值列表部分字段
|
5 years ago |
|
chenxiaojun
|
69fd83a2f0
|
推广平台>数据管理>充值玩家--更新
|
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
|
f05034486c
|
推广平台>数据管理>充值玩家
|
5 years ago |
|
sunke
|
660397bf4f
|
双乾支付
|
5 years ago |
|
sunke
|
2cef293427
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
|
5 years ago |
|
sunke
|
2c17a4c24f
|
双乾支付
|
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 |
|
chenxiaojun
|
be9619e25a
|
推广平台>落地页--更新
|
5 years ago |
|
zhengchanglong
|
d265c9b03f
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
chenxiaojun
|
25ea7569cd
|
推广平台>落地页--更新
|
5 years ago |
|
zhengchanglong
|
381fa8d633
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
zhengchanglong
|
ed584bfb2f
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
zhengchanglong
|
a55efe582b
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
chenxiaojun
|
aa67148398
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
a93d11d871
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
44e912d9dc
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
50e0d22a8f
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
3719548d78
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
5a4d26a6e5
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
9d3a818fab
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
aebd5bd396
|
推广平台>落地页--更新
|
5 years ago |
|
zhengchanglong
|
c32c1780e6
|
管理后台-用户组-玩家列表敏感信息加密显示
|
5 years ago |
|
chenxiaojun
|
3f2433fa4a
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
d4d3d3fe5d
|
推广平台>落地页--更新
|
5 years ago |
|
chenzhi
|
ab29dafffc
|
补链旧数据脚本
|
5 years ago |
|
sunke
|
cbca0b0d51
|
行为日志检索修复
|
5 years ago |
|
chenxiaojun
|
f9b6f0a793
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
e9c804413f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenzhi
|
9df450f8cc
|
优化订单日期内多个推广员无法补链
|
5 years ago |
|
zhengyongxing
|
b2d1c27054
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
|
zhengyongxing
|
8b2d04f986
|
管理后台新开发功能修改
|
5 years ago |
|
sunke
|
54f288133e
|
下载修改
|
5 years ago |
|
zhengyongxing
|
e2e685e8c3
|
管理后台新开发功能修改
|
5 years ago |
 ELF
|
0a7054c4f9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
32a73f0386
|
Merge branch 'hotfix/close-shift-player' into dev
|
5 years ago |
|
ELF
|
ad7c276fdf
|
测试
|
5 years ago |
|
chenzhi
|
60c7bdce34
|
新增补链时判断是否已结算
|
5 years ago |
|
chenxiaojun
|
131c670731
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
756e0a342e
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
cb253e1ee9
|
推广平台>落地页更新
|
5 years ago |
|
chenxiaojun
|
946c99ff61
|
推广平台>落地页更新
|
5 years ago |
|
chenxiaojun
|
8b1ff62ca5
|
推广平台>落地页更新
|
5 years ago |
|
chenxiaojun
|
9475a54dec
|
推广平台>落地页更新
|
5 years ago |
|
liuweiwen
|
08e2cc6eaf
|
pc官网样式调整
|
5 years ago |
|
sunke
|
d426395607
|
充值玩家下载增加游戏累计登陆天数
|
5 years ago |
|
ELF
|
050ecd3bc4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
254022ed6d
|
Merge branch 'hotfix/mend_amount' into dev
|
5 years ago |
|
ELF
|
bb2996dbee
|
迁移忽略结算
|
5 years ago |
|
chenxiaojun
|
9d09913bd0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
64eb3ce4cb
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
b27906d470
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenzhi
|
1ccbd03a0f
|
超级签新增支付方式
|
5 years ago |
|
sunke
|
49408030f0
|
行为日志
|
5 years ago |
|
liuweiwen
|
b992d5a744
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
98f7653f2a
|
pc官网-》家长监护-》更换家长监护引导内容
|
5 years ago |
|
zhanglingsheng
|
cf7440e87e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
ad97083c9f
|
行为日志文案
|
5 years ago |
|
zhengyongxing
|
f225cff461
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Data/update.sql
|
5 years ago |
|
chenxiaojun
|
a389f9a245
|
推广平台>落地页>安卓添加视频
|
5 years ago |
|
chenxiaojun
|
ff2481cdc4
|
推广平台>落地页>安卓添加视频
|
5 years ago |
|
chenzhi
|
08a97a2f9f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
ELF
|
991861e488
|
解决冲突
|
5 years ago |
|
ELF
|
289b40329f
|
添加换绑时金额
|
5 years ago |
|
chenzhi
|
0c62e80e67
|
优化总览表格高度
|
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
|
11177b895c
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
liuweiwen
|
f8df1d57dd
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
188abdcbdd
|
落地页视频置顶判断
|
5 years ago |
|
zhengyongxing
|
7b12780d9c
|
管理后台新开发功能修改
|
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 |
|
chenxiaojun
|
3b5a915bda
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
chenzhi
|
1010fe2674
|
推广补链新增查询条件
|
5 years ago |
|
chenzhi
|
3d672db381
|
推广补链新增一系列查询条件
|
5 years ago |
|
ELF
|
c61a3e200a
|
解决冲突
|
5 years ago |
|
ELF
|
c451921b92
|
后台添加IOS打包方式选择
|
5 years ago |
|
liuweiwen
|
cdeea23034
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
14644b44a2
|
落地页图片改为使用游戏截图
|
5 years ago |
|
zhanglingsheng
|
f8498638ad
|
游戏充值行为日志
|
5 years ago |
|
zhanglingsheng
|
f392ad4de0
|
游戏充值行为日志
|
5 years ago |
|
zhanglingsheng
|
ac0132575f
|
Merge branch 'hotfix/log' into dev
|
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 |
|
liuweiwen
|
c31ae44f79
|
落地页去掉App购买
|
5 years ago |
|
chenxiaojun
|
4047208871
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
ELF
|
92accdc727
|
修改
|
5 years ago |
|
chenzhi
|
5359e67860
|
优化补链记录为ajax
|
5 years ago |
|
ELF
|
a2de4bed7b
|
切换IOS新旧打包方式
|
5 years ago |
|
liuweiwen
|
aff492b470
|
超级签新增需求-》后台增加超级签级签状态，手机端验证状态是否可下载与显示
|
5 years ago |
|
liuweiwen
|
04bd089bd9
|
上传视频格式提示
|
5 years ago |