sunke
|
20d8fb5599
|
冲突
|
5 years ago |
 liaojinling
|
7513d427f0
|
修改冲突
|
5 years ago |
zhengyongxing
|
059742043c
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
liaojinling
|
c637a8bfe0
|
打包
|
5 years ago |
liuweiwen
|
1752e16f8d
|
落地页安卓使用旧版本
|
5 years ago |
chenxiaojun
|
3c72aebe83
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
c8d515a0ee
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
sunke
|
33184df45c
|
Merge branch 'hotfix/download'
|
5 years ago |
|
sunke
|
8d4d689491
|
充值
|
5 years ago |
|
sunke
|
d062affc16
|
bug
|
5 years ago |
|
chenxiaojun
|
7de0b54773
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
781d6d408a
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1a4bdc424a
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
sunke
|
a49f313113
|
时间提示
|
5 years ago |
|
ELF
|
8d3d0ad726
|
Merge branch 'master' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
ELF
|
4afe365e40
|
Merge branch 'hotfix/add_bans_type'
|
5 years ago |
|
sunke
|
5597410ac2
|
bug
|
5 years ago |
|
sunke
|
255f68836e
|
时间
|
5 years ago |
|
liuweiwen
|
6d360b356e
|
登录跳转购买超级签页面
|
5 years ago |
|
liuweiwen
|
56f2c422aa
|
优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，（一句话简介）限制字数（最多30字）
|
5 years ago |
|
liuweiwen
|
24ce610949
|
优化 — 【游戏】【游戏管理】【游戏列表】— 点击【编辑】，名词更改 — （游戏详情介绍）改为（游戏简介）
|
5 years ago |
|
liuweiwen
|
d9782182ca
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
aa81eda2fc
|
落地页简介改详细介绍
|
5 years ago |
|
sunke
|
a782121581
|
排版
|
5 years ago |
|
liuweiwen
|
538272d4ad
|
落地页
|
5 years ago |
|
liuweiwen
|
fc3ab7e74d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
53e919bd68
|
落地页简介
|
5 years ago |
chenzhi
|
a80611ae4f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
473953daff
|
实名认证10.0
|
5 years ago |
|
sunke
|
e5891a9d45
|
结算明细
|
5 years ago |
|
sunke
|
876268c3b7
|
结算
|
5 years ago |
|
chenzhi
|
e20aae90d0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
65f71b7a33
|
实名认证9.0
|
5 years ago |
|
liuweiwen
|
d5974f973f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
0455c80d1a
|
手机官网联系客服
|
5 years ago |
|
chenzhi
|
7cbec414db
|
实名认证8.0
|
5 years ago |
|
chenzhi
|
356af04937
|
实名认证7.0
|
5 years ago |
|
chenzhi
|
94a7c4104c
|
实名认证测试7.0
|
5 years ago |
|
chenzhi
|
21536d2ff3
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
6368693b48
|
实名6.0
|
5 years ago |
|
ELF
|
9cf1ab13db
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
a02b9f1f1a
|
Merge branch 'hotfix/oldpack' into dev
|
5 years ago |
|
chenxiaojun
|
7b0c453c71
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
13be456146
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
25dd1aea9a
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
ELF
|
8903dd889e
|
Merge branch 'hotfix/oldpack'
|
5 years ago |
|
chenxiaojun
|
3c6e62851c
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
ELF
|
d8722b25b9
|
修改bug
|
5 years ago |
|
liuweiwen
|
fdacdd3323
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
72517da1e6
|
落地页
|
5 years ago |
|
chenxiaojun
|
14129a0021
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4b21dcd239
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenzhi
|
02e527d15b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
250b9ab881
|
实名认证5.0
|
5 years ago |
|
chenxiaojun
|
42ae540dc3
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
518cc1beb3
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1c5849ba48
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
sunke
|
686673bd3f
|
时间错误
|
5 years ago |
|
chenzhi
|
c08a01d7e8
|
实名认证5.0
|
5 years ago |
|
liuweiwen
|
8ee710e12c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenzhi
|
5ba92f1e82
|
实名认证3.0
|
5 years ago |
|
liuweiwen
|
028b5542e3
|
落地页
|
5 years ago |
|
chenzhi
|
abcc7a8cd1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
dbb410103d
|
实名认证2.0
|
5 years ago |
|
liuweiwen
|
61c2269ffc
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
9fdd4d9b2c
|
落地页
|
5 years ago |
|
chenxiaojun
|
536ee9627f
|
脚本：用户推广员数据刷新
|
5 years ago |
|
chenxiaojun
|
845df466f6
|
脚本：用户推广员数据刷新
|
5 years ago |
|
chenxiaojun
|
968bf2c067
|
脚本：用户推广员数据刷新
|
5 years ago |
|
chenxiaojun
|
71df93a12f
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenzhi
|
d4ae936ca4
|
实名认证1.0
|
5 years ago |
|
chenxiaojun
|
0ea1cf04ec
|
推广平台->数据管理-充值统计|财务管理-结算明细--合计
|
5 years ago |
|
chenxiaojun
|
04920395d5
|
推广平台->数据管理->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
eb8afe99ff
|
推广平台->数据管理->财务管理-结算明细--更新
|
5 years ago |
|
chenzhi
|
c0a0610ae7
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
07e2940e62
|
实名认证接口设置
|
5 years ago |
|
chenxiaojun
|
a7c80b84c2
|
脚本：用户推广员数据刷新
|
5 years ago |
|
chenxiaojun
|
167e056f9a
|
脚本：用户推广员数据刷新
|
5 years ago |
|
chenxiaojun
|
014a0e2f34
|
脚本：用户推广员数据刷新
|
5 years ago |
|
sunke
|
d59c934b09
|
充值次数
|
5 years ago |
|
sunke
|
c77660e57b
|
玩家充值时间重设
|
5 years ago |
|
liuweiwen
|
f8c957b071
|
落地页-点我去信任
|
5 years ago |
|
liuweiwen
|
0abb2cce0c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
a5fd2ac163
|
落地页评分改用百分比
|
5 years ago |
|
chenxiaojun
|
73ca6f1f3f
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
chenxiaojun
|
83267e230a
|
推广平台->数据管理->数据管理->订单查询--更新
|
5 years ago |
|
sunke
|
806cded7d6
|
默认时间
|
5 years ago |
|
liuweiwen
|
44fa7bf8ad
|
落地页评分动态变化
|
5 years ago |
|
liuweiwen
|
7ed4586e26
|
点击头像不提示
|
5 years ago |
|
chenzhi
|
086a364f41
|
移动官网实名认证
|
5 years ago |
|
sunke
|
5d981f76c6
|
订单号修改
|
5 years ago |
|
chenxiaojun
|
6cce4d7e05
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
chenxiaojun
|
1af46a74ee
|
推广平台->数据管理->数据管理->订单查询--更新
|
5 years ago |
|
liuweiwen
|
466153f51a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
16d91ec2ee
|
后台游戏评分限制
|
5 years ago |
|
sunke
|
b3ac26ba80
|
合计区分类型
|
5 years ago |
|
chenxiaojun
|
f596288f31
|
推广平台->数据管理->财务管理-结算明细--更新
|
5 years ago |
|
chenxiaojun
|
47f9db945c
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
c9f28cba9b
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
5b8c016a9b
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
174f90bff4
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
sunke
|
b4e14251ce
|
增加合计
|
5 years ago |
|
zhengyongxing
|
2cc68f3086
|
Merge branch 'master' of 47.111.118.107:/srv/git/platform into dev
Conflicts:
Application/Admin/Controller/StatController.class.php
|
5 years ago |
|
zhengyongxing
|
245e07fc3f
|
设备统计脚本bug修正
|
5 years ago |
|
ELF
|
695b7c8895
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
liuweiwen
|
2ac6228073
|
pc官网 官网】----【账户充值】点击家长监护/客服帮助，无反馈
|
5 years ago |
|
ELF
|
d95171b3ec
|
Merge branch 'hotfix/add_bans_type' into dev
|
5 years ago |
|
ELF
|
81a968947b
|
修改bug
|
5 years ago |
|
chenxiaojun
|
e6798245bc
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
1a2bc7b4c5
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
c5a5bc5c69
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
ca5da52a4d
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
d600886e91
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
80115e9c38
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
ELF
|
de27e846eb
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
cf31d4cc57
|
Merge branch 'hotfix/add_bans_type' into dev
|
5 years ago |
|
ELF
|
bd46fd325b
|
后台添加禁用落地页下载页地址
|
5 years ago |
|
chenxiaojun
|
ab524feffb
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
dfc2181286
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
ae8daa1c45
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
1c22d8db2d
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
chenxiaojun
|
d07f617775
|
推广平台->数据管理-订单查询|数据管理-充值统计|财务管理-结算明细--新增合计
|
5 years ago |
|
ELF
|
f3f497a21d
|
Merge branch 'hotfix/oldpack' into dev
|
5 years ago |
yulingwei
|
1fcf563731
|
Merge branch 'hotfix/add_bans_type' into dev
|
5 years ago |
|
yulingwei
|
fa9d40f87a
|
新增风控标识
|
5 years ago |
|
chenxiaojun
|
1707d4d162
|
ios13.1
|
5 years ago |
|
chenxiaojun
|
ac4d3b36c7
|
ios13.1
|
5 years ago |
|
chenxiaojun
|
820f80f066
|
ios13.1
|
5 years ago |
|
chenxiaojun
|
acf2ff1310
|
ios13.1
|
5 years ago |
|
zhengyongxing
|
ad8dd94e32
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
liaojinling
|
d5dc2396f2
|
修改
|
5 years ago |
|
liaojinling
|
ca4f1954e4
|
修改bug
|
5 years ago |
|
liaojinling
|
1204b1a0e8
|
修改
|
5 years ago |
|
liaojinling
|
3cfce8675e
|
修改每分钟打包数量
|
5 years ago |
|
liaojinling
|
5b743b5455
|
修改
|
5 years ago |
|
liaojinling
|
9a25fd0a04
|
修改bug
|
5 years ago |
|
liaojinling
|
fe6dd1ddff
|
改成旧的打包方式
|
5 years ago |
|
chenxiaojun
|
1fc9f3b6b2
|
手机注册
|
5 years ago |
|
chenxiaojun
|
ce01823c6b
|
日志
|
5 years ago |
|
chenxiaojun
|
ca8c4e331f
|
手机注册
|
5 years ago |
|
chenxiaojun
|
f9b9694a4a
|
日志
|
5 years ago |
|
chenxiaojun
|
1e534d8c5e
|
手机注册
|
5 years ago |
|
chenxiaojun
|
28cd4aeeda
|
日志
|
5 years ago |
|
chenxiaojun
|
676ab5dcd2
|
手机注册
|
5 years ago |
|
chenxiaojun
|
c384a88c48
|
手机注册
|
5 years ago |
|
chenxiaojun
|
3754e5504a
|
手机注册
|
5 years ago |
|
chenzhi
|
5413551650
|
优化官网支付
|
5 years ago |
|
chenzhi
|
777a7c8344
|
官网支付结果优化
|
5 years ago |
|
chenzhi
|
98249f462a
|
优化官网支付
|
5 years ago |
|
zhengyongxing
|
55918dfc24
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
57ca1269d6
|
登录导出优化
|
5 years ago |
|
liuweiwen
|
8d5297bd99
|
落地页
|
5 years ago |
|
liuweiwen
|
e834c37cb3
|
落地页
|
5 years ago |
|
liuweiwen
|
dd43bed0ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
ffadabf078
|
落地页
|
5 years ago |
|
chenzhi
|
5d178571cc
|
优化官网支付显示
|
5 years ago |
|
chenzhi
|
b9ab5330c0
|
优化官网支付缩放问题
|
5 years ago |
|
liuweiwen
|
8a7b1a9768
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenzhi
|
15ce00396f
|
优化官网支付
|
5 years ago |
|
liuweiwen
|
43c1f7832a
|
落地页
|
5 years ago |
|
chenxiaojun
|
c91bab8bed
|
推广平台->游戏管理--自动复制修改
|
5 years ago |
|
chenxiaojun
|
324e880056
|
推广平台->游戏管理--自动复制修改
|
5 years ago |
|
zhengyongxing
|
56d3718c14
|
用户登录记录
|
5 years ago |
|
liuweiwen
|
b61587868b
|
上传广告图片
|
5 years ago |
|
liuweiwen
|
1bd90da914
|
【统计】-【数据分析】-【ARPU分析】页面数据异常
|
5 years ago |
|
liuweiwen
|
8fd70a94e7
|
落地页
|
5 years ago |
|
liuweiwen
|
f11150be0c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
9568f390ba
|
新版落地页
|
5 years ago |
|
zhengyongxing
|
9e26a06ed2
|
统计bug修正
|
5 years ago |
|
zhengyongxing
|
e8477373ff
|
定时脚本bug
|
5 years ago |
|
sunke
|
b012ec2baf
|
增加合计下载
|
5 years ago |
|
liuweiwen
|
3dddaf247d
|
后台还原游戏充值导出
|
5 years ago |
|
liuweiwen
|
95d55a37d7
|
pc热门游戏显示从推荐改为热门
|
5 years ago |
|
liuweiwen
|
b764260647
|
后台上传官网附件
|
5 years ago |
|
liuweiwen
|
790b49c95b
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
192ad84897
|
后台-》平台币充值导出时间
|
5 years ago |
chenzhi
|
81e56063c7
|
优化取消补链提示
|
5 years ago |
|
zhengyongxing
|
9abca632ae
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Admin/Controller/ExportController.class.php
|
5 years ago |
|
chenxiaojun
|
757526ea05
|
推广平台->数据管理->充值玩家--时间检索范围限制
|
5 years ago |
|
chenxiaojun
|
ce86f56cc5
|
推广平台->数据管理->充值玩家--时间检索范围限制
|
5 years ago |
|
zhengyongxing
|
9db27712e2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
14f69c408e
|
登录记录导出
|
5 years ago |
|
ELF
|
c6ce82ab0e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
ef60ca85cf
|
修改
|
5 years ago |
|
liuweiwen
|
a150015972
|
pc官网 热门游戏，多款游戏全部显示
|
5 years ago |
|
zhengyongxing
|
fd15fde141
|
登录记录导出修改
|
5 years ago |
|
liuweiwen
|
a21f2c218c
|
pc官网 官网】----【账户充值】点击家长监护/客服帮助，无反馈
|
5 years ago |
|
liuweiwen
|
bdc5d99f6e
|
pc官网 客服中心，搜索框，字体异常
|
5 years ago |
|
liuweiwen
|
935cb50c2b
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
b61fdf2e97
|
手机官网绑定手机页面发送验证码样式调整
|
5 years ago |
|
chenzhi
|
d64b627883
|
游戏充值新增文字说明
|
5 years ago |
|
liuweiwen
|
f33ad199f7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
a71b46eb6f
|
pc官网充值支付方式写死
|
5 years ago |
|
ELF
|
8efc96c899
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
a91a5d5759
|
修改
|
5 years ago |
|
liuweiwen
|
8d52d52785
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
liuweiwen
|
e962786e07
|
后台-【充值】-【平台币充值】导出充值时间出错
|
5 years ago |
|
chenzhi
|
8b718c47c5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
ef25027213
|
补链新增切分时间
|
5 years ago |
|
ELF
|
7dfaaa2740
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |