sunke
|
21ad2f0341
|
提现状态
|
5 years ago |
“用lww
|
3180406491
|
pc官网-公司logo可点击跳首页
|
5 years ago |
chenxiaojun
|
0c41644d7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
chenxiaojun
|
57709068fa
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
zhengchanglong
|
b602142a81
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
chenxiaojun
|
ca2935763b
|
推广平台->财务管理->提现记录--添加撤销提现
|
5 years ago |
|
“用lww
|
1b2a9c7f9b
|
pc官网修改
|
5 years ago |
|
“用lww
|
595c64e831
|
pc官网修改
|
5 years ago |
zhengyongxing
|
8e18e8faac
|
推广员统计官方渠道添加
|
5 years ago |
|
sunke
|
1ccf59fa26
|
提现明细状态说明
|
5 years ago |
|
zhengchanglong
|
1ae5fa0f20
|
Merge branch 'dev_lww' into dev
|
5 years ago |
|
sunke
|
63dc4a15d8
|
导出状态修改
|
5 years ago |
|
“用lww
|
6e1db7caa6
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
“用lww
|
0168a52b68
|
手机官网-页面更改
|
5 years ago |
|
chenxiaojun
|
4a4a6501ce
|
分成比例
|
5 years ago |
|
chenxiaojun
|
e0c0f50c7d
|
分成比例
|
5 years ago |
|
chenxiaojun
|
5fcad13fce
|
根据时间统计玩家充值
|
5 years ago |
|
chenxiaojun
|
2123b29479
|
根据时间统计玩家充值
|
5 years ago |
chenzhi
|
df9d1415df
|
[修复]推广员充值统计无promote_id问题
|
5 years ago |
|
sunke
|
0983eb633c
|
设备号
|
5 years ago |
|
sunke
|
b1a870d773
|
排序
|
5 years ago |
|
sunke
|
36ff63bb33
|
角色查询
|
5 years ago |
|
chenxiaojun
|
98fe853743
|
推广平台->数据管理--更新
|
5 years ago |
|
chenxiaojun
|
80f76c4490
|
推广平台->数据管理--更新
|
5 years ago |
|
sunke
|
623bc0d44f
|
充值
|
5 years ago |
|
chenxiaojun
|
67864f82a0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
a2dc77645f
|
推广平台->数据管理--更新
|
5 years ago |
|
zhengyongxing
|
0b05701798
|
推广员首页统计修改
|
5 years ago |
|
sunke
|
750cefcb54
|
充值
|
5 years ago |
 ELF
|
d70bf7bf42
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0d91f0aa5c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
391b997f18
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
chenxiaojun
|
bd6932d8d4
|
推广平台->财务管理->提现记录--增加重新审核
|
5 years ago |
|
ELF
|
ef9cb4e2c4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
710d7028f1
|
修改
|
5 years ago |
|
chenxiaojun
|
85eeed62f0
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
638a206ad6
|
推广平台->数据汇总--bug更新
|
5 years ago |
yulingwei
|
8fee02fc4c
|
修改时间
|
5 years ago |
|
chenxiaojun
|
2a93ed6ec2
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e24550b993
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e8dfa6f92e
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
c923a58536
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
9b51fd6145
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
chenxiaojun
|
e7f9d1b6f3
|
推广平台->数据汇总--bug更新
|
5 years ago |
|
sunke
|
ef1857d752
|
bug
|
5 years ago |
|
chenzhi
|
8007d9954f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
849fd77ac6
|
优化推广员统计的方法
|
5 years ago |
|
ELF
|
3ad71f99bf
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
112d7462bc
|
修改bug
|
5 years ago |
|
chenxiaojun
|
950bd81e5e
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
47af5037b7
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengyongxing
|
3cabc6ab95
|
注册修改
|
5 years ago |
|
zhengyongxing
|
d7550495b1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
6c2c048952
|
普通注册密码规则修改
|
5 years ago |
|
chenxiaojun
|
4342e240c0
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
chenxiaojun
|
1a110770dc
|
推广平台->数据汇总->充值玩家--添加排序功能
|
5 years ago |
|
ELF
|
1c2458841d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
5a98b86a07
|
修改bug
|
5 years ago |
|
zhengyongxing
|
be09214f7a
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
479a7537a8
|
登录sdk主页跳转
|
5 years ago |
|
zhengyongxing
|
ee40286108
|
登录sdk主页跳转
|
5 years ago |
|
zhengchanglong
|
4120344388
|
超级签下载页无礼包不显示礼包特权
|
5 years ago |
|
zhengchanglong
|
7e01b0208c
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
7265a2961e
|
超级签页面UI修改
|
5 years ago |
|
chenxiaojun
|
3e68880ac0
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
09ab8bf8ad
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0571347aeb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
d9659ea975
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
a53970efcf
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
49270427ee
|
推广平台->数据汇总->充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
c63873c171
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
1ed48003ac
|
超级签充值BUG修复
|
5 years ago |
|
sunke
|
bf3f7f70fa
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
1e090fc6dd
|
时间格式
|
5 years ago |
|
yulingwei
|
0e1abdfa94
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
feecf9199d
|
电子邮箱改为选填
|
5 years ago |
|
sunke
|
7220083d84
|
公告
|
5 years ago |
|
zhengyongxing
|
66776fef98
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
89b67c06a4
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
ELF
|
809191e0f2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
e2a2a07f03
|
修改bug
|
5 years ago |
|
sunke
|
a87eca6363
|
创建时间
|
5 years ago |
|
sunke
|
7610314927
|
数据管理
|
5 years ago |
|
zhengchanglong
|
d191552c1f
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
ddacae349e
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
8af46f08c2
|
优化推广员统计1
|
5 years ago |
|
zhengchanglong
|
387be649de
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
256545a59a
|
123
|
5 years ago |
|
“用lww
|
019ae56f40
|
手机官网-落地页
|
5 years ago |
|
zhengyongxing
|
5c97bb7610
|
数据分析bug修正
|
5 years ago |
|
zhengyongxing
|
db40381bb1
|
定时器接口时间区间修正
|
5 years ago |
|
sunke
|
401edecd61
|
target_level
|
5 years ago |
|
“用lww
|
07a33ab051
|
手机官网-落地页
|
5 years ago |
|
sunke
|
5241f98c68
|
平台币转移
|
5 years ago |
|
zhengyongxing
|
4f27c2fb29
|
统计bug修正
|
5 years ago |
|
zhengchanglong
|
b7fdcf38f6
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
d230f0e047
|
Merge branch 'dev_zyx' into dev_zcl
|
5 years ago |
|
zhengyongxing
|
08b2ba432a
|
统计数据修正
|
5 years ago |
|
sunke
|
dd7a55bf38
|
账号修改
|
5 years ago |
|
sunke
|
a770dc14e5
|
安全中心
|
5 years ago |
|
sunke
|
e244b43c92
|
推广员账号
|
5 years ago |
|
zhengchanglong
|
b432423068
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
28ab1af0b8
|
Merge branch 'dev-cz' into dev_zcl
|
5 years ago |
|
chenzhi
|
e9e718abbb
|
同上
|
5 years ago |
|
chenzhi
|
0e72821a89
|
修改推广后台平台币充值手续费费率
|
5 years ago |
|
sunke
|
f4bf575663
|
时间格式
|
5 years ago |
|
“用lww
|
28db83f646
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
sunke
|
bfb236892c
|
提交方式
|
5 years ago |
|
“用lww
|
97543cebb8
|
pc官网-充值页面修改
|
5 years ago |
|
sunke
|
5a83adb06d
|
下载注释
|
5 years ago |
|
sunke
|
193631bbb2
|
大小写问题
|
5 years ago |
|
ELF
|
51d1d730e1
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c0f19228d2
|
修改bug
|
5 years ago |
|
chenxiaojun
|
925d80ac66
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
26d0d0d6cb
|
merge
|
5 years ago |
|
chenxiaojun
|
0875ed5a9a
|
管理后台->用户->玩家组->角色查询--更新
|
5 years ago |
|
yulingwei
|
a9f06b1d57
|
修改批量锁定问题
|
5 years ago |
|
zhengchanglong
|
36c4e476ea
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
3f869ccb2e
|
Merge branch 'dev-cz' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenzhi
|
df03c05651
|
修正统计bug
|
5 years ago |
|
zhengyongxing
|
118f706440
|
脚本去除部分输出
|
5 years ago |
|
zhengchanglong
|
15695d5b5d
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenxiaojun
|
0e81ba6401
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
7e0cd3c297
|
推广平台->数据管理--标题调整
|
5 years ago |
|
chenxiaojun
|
21070ac3a4
|
推广平台->财务管理--标题调整
|
5 years ago |
|
chenxiaojun
|
0f5da378fc
|
推广平台->财务管理--标题调整
|
5 years ago |
|
zhengyongxing
|
0edc4452e3
|
Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Mobile/Controller/SsgController.class.php
|
5 years ago |
|
chenzhi
|
2a417c2746
|
123
|
5 years ago |
|
sunke
|
b73472fd9d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
sunke
|
426d8e4fae
|
bug
|
5 years ago |
|
ELF
|
6403bc9859
|
修改
|
5 years ago |
|
ELF
|
d2cb9b9a2b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0b4416f057
|
修改bug
|
5 years ago |
|
chenzhi
|
e61a8af93d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
313cd11796
|
恢复
|
5 years ago |
|
ELF
|
9d5b0e235a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
639e7117b8
|
修改bug
|
5 years ago |
|
chenzhi
|
4ecbec2f49
|
回掉1.0
|
5 years ago |
|
chenzhi
|
48be6af89b
|
回掉0.4
|
5 years ago |
|
chenzhi
|
f8f5c3b4e0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
222b9d2ec6
|
回0.3
|
5 years ago |
|
ELF
|
2abdcd6147
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
de00fe5e48
|
修改bug
|
5 years ago |
|
chenzhi
|
13700e6123
|
回调0.2
|
5 years ago |
|
chenzhi
|
397eab9c30
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
ca5fe30969
|
回调0.1
|
5 years ago |
|
ELF
|
2254610041
|
修改bug
|
5 years ago |
|
chenzhi
|
4c2931c8d3
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
e986b5de58
|
123
|
5 years ago |
|
zhengyongxing
|
8e8e59c61c
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
zhengyongxing
|
4e06af0acf
|
登录sdk，跳转至购买超级签，无需重新登陆
|
5 years ago |
|
zhengchanglong
|
286febdff6
|
Merge branch 'dev_lww' into dev
|
5 years ago |
zhanglingsheng
|
fb85d32c87
|
合并分支
|
5 years ago |
|
chenzhi
|
0649501b8a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
c211c493ed
|
1
|
5 years ago |
|
sunke
|
275c0a8022
|
下载提交方式修改
|
5 years ago |
|
chenzhi
|
4ebba110d9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
90253ddcf6
|
优化回调
|
5 years ago |
|
sunke
|
0688a046d3
|
修改bug
|
5 years ago |
|
chenzhi
|
995ea3f9a5
|
验证签名
|
5 years ago |
|
zhengchanglong
|
5d9d6542ad
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
chenzhi
|
fd53bdda15
|
解决回掉
|
5 years ago |
|
zhanglingsheng
|
a685e7340e
|
礼包列表过滤超级签
|
5 years ago |
|
“用lww
|
8076110f31
|
手机注册-修改账号密码验证规则
|
5 years ago |
|
“用lww
|
ba506916d0
|
复制兑换码提示框修改
|
5 years ago |
|
chenzhi
|
8191f5a50f
|
提示测试
|
5 years ago |
|
yulingwei
|
a11c07c7a6
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
38680ddb05
|
更新
|
5 years ago |
|
zhengyongxing
|
1626123074
|
数据统计7日平均时长修正
|
5 years ago |
|
zhengchanglong
|
f8008a4b5e
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
64c059cccc
|
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
|
366f5b9add
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
chenxiaojun
|
b4a1a24dda
|
推广平台->游戏管理->专服|混服--样式调整
|
5 years ago |
|
yulingwei
|
24d3e6ab07
|
修改bug
|
5 years ago |
|
yulingwei
|
046beee6be
|
修改bug
|
5 years ago |
|
zhengchanglong
|
a4dc55f4e3
|
Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengchanglong
|
65014bb66a
|
Merge branch 'dev_lww' into dev_zcl
|
5 years ago |
|
zhengchanglong
|
974a9d93e4
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Data/update.sql
|
5 years ago |
|
zhengyongxing
|
f4cb9a98c8
|
数据管理启动机型代码优化
|
5 years ago |
|
zhengyongxing
|
2fb1effdcd
|
后台数据分析应用概况优化
|
5 years ago |
|
“用lww
|
c1b5569213
|
手机官网-手机注册与账号注册修改，昵称自动生成
|
5 years ago |
|
sunke
|
05bb9b4aa3
|
推广业绩导出修复
|
5 years ago |
|
chenxiaojun
|
232a6f7918
|
修改冲突
|
5 years ago |
|
chenxiaojun
|
5d2f499cfd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
aa8e612ead
|
超级签测试金额修改
|
5 years ago |
|
ELF
|
3ebaf13810
|
修改bug
|
5 years ago |
|
“用lww
|
ff976bb9eb
|
pc端问题反馈修改
|
5 years ago |
|
“用lww
|
a13e8a5152
|
Merge remote-tracking branch 'origin/dev' into dev_lww
|
5 years ago |
|
ELF
|
270e24346d
|
修改bug
|
5 years ago |
|
ELF
|
e575e3107c
|
调试
|
5 years ago |
|
ELF
|
b69699f5d0
|
代码还原
|
5 years ago |
|
ELF
|
1fd7023c5f
|
代码优化
|
5 years ago |
|
ELF
|
c75d1bf3ad
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
9e1c25a2a3
|
修改bug
|
5 years ago |
|
sunke
|
158d8e8fc2
|
认证图片隐藏
|
5 years ago |
|
chenzhi
|
255d830229
|
优化提示及输入ok
|
5 years ago |
|
chenzhi
|
16d1a28f67
|
优化提示2
|
5 years ago |
|
chenzhi
|
8be0cfb188
|
优化提示
|
5 years ago |
|
chenzhi
|
22b0738203
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
7149c94d19
|
测试
|
5 years ago |
|
sunke
|
d941477d47
|
时间检索 资质认证
|
5 years ago |
|
chenxiaojun
|
de9a8d6eb8
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
d5d555bde2
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenxiaojun
|
0a075aed45
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
chenzhi
|
6e522e08cd
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenzhi
|
a6f52ccdb8
|
优化注册管理员提示信息
|
5 years ago |
|
chenxiaojun
|
b606ee5765
|
推广平台->数据管理->订单查询|注册明细--更新
|
5 years ago |
|
zhanglingsheng
|
a514e5b5dc
|
支付方式添加快捷
|
5 years ago |
|
zhanglingsheng
|
e07e1ff2aa
|
支付方式添加快捷
|
5 years ago |
|
chenzhi
|
29d204bf97
|
修复添加管理员报错
|
5 years ago |
|
chenzhi
|
360cf3f3ba
|
优化前端展示
|
5 years ago |
|
chenxiaojun
|
d8acd44d08
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
chenxiaojun
|
67af68fc43
|
推广平台->数据管理->数据汇总--更新
|
5 years ago |
|
sunke
|
e31ad349ae
|
register get method
|
5 years ago |
|
chenzhi
|
04c5f17790
|
优化脚本
|
5 years ago |
|
ELF
|
b4afa5d8b2
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
065245d657
|
优化查询
|
5 years ago |
|
chenxiaojun
|
71fca054fd
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
|
chenxiaojun
|
15373077b7
|
推广平台->数据管理->每日概况|数据汇总--登录统计优化
|
5 years ago |
|
sunke
|
b64882554a
|
管理后台增加资质审核检索
|
5 years ago |
|
chenxiaojun
|
9f94d3f3ab
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
1c79152b5c
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
304aca17df
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenxiaojun
|
1cfa474b83
|
推广平台->登录统计--暂时去除区服检索
|
5 years ago |
|
chenzhi
|
37d8f72c6d
|
优化首页展示
|
5 years ago |
|
sunke
|
dc35008201
|
资质认证
|
5 years ago |
|
sunke
|
fe3dc2f378
|
充值玩家导出默认时间
|
5 years ago |
|
sunke
|
60d1a4ced8
|
防错
|
5 years ago |
|
sunke
|
7d080f9d73
|
基础信息
|
5 years ago |
|
sunke
|
0b8f3450c6
|
审核后台
|
5 years ago |
|
zhengchanglong
|
e5c3ee02ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
25b32a6036
|
官网监护提醒修改
|
5 years ago |
|
chenzhi
|
e1739209e3
|
1
|
5 years ago |
|
“用lww
|
8120d41204
|
Merge remote-tracking branch 'origin/dev' into dev_lww
# Conflicts:
# Application/Common/Conf/seo_media_config.php
# Application/Mobile/View/Index/introduce.html
# Application/Mobile/View/User/login.html
# Application/Mobile/View/User/recharge.html
# Application/Mobile/View/User/step1.html
# Application/Mobile/View/User/userset.html
# Public/Mobile/css/common-cz.css
# Public/Mobile/js/home.js
|
5 years ago |
|
chenzhi
|
521a343fc3
|
123
|
5 years ago |
|
“用lww
|
176aa70c8d
|
去除vbs代码
|
5 years ago |
|
chenzhi
|
39e682e69e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
chenxiaojun
|
395cd01d0d
|
推广平台->数据管理->订单查询|注册明细--优化
|
5 years ago |
|
chenxiaojun
|
0ec50eeee1
|
推广平台->数据管理->订单查询|注册明细--优化
|
5 years ago |
|
sunke
|
52a668f546
|
异步时间
|
5 years ago |
|
sunke
|
c7804aa905
|
时间限制
|
5 years ago |
|
sunke
|
9dec8e702d
|
认证信息
|
5 years ago |
|
sunke
|
d2d211737f
|
bug
|
5 years ago |
|
sunke
|
eac235d498
|
身份认证后台
|
5 years ago |
|
sunke
|
8df42a80c1
|
bug
|
5 years ago |
|
sunke
|
486be7e3ed
|
bug
|
5 years ago |
|
ELF
|
afbdec3d5d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
a1c1cb44ae
|
修改bug
|
5 years ago |
|
sunke
|
bb1ce4bf14
|
bug
|
5 years ago |
|
sunke
|
303a176f8b
|
bug
|
5 years ago |
|
ELF
|
adb10b2959
|
修改bug
|
5 years ago |
|
ELF
|
8d56157601
|
修改bug
|
5 years ago |
|
ELF
|
f322f98773
|
修改
|
5 years ago |
|
ELF
|
01dfe50442
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
3092dcb237
|
修改
|
5 years ago |
|
chenxiaojun
|
bbe32dd3b2
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
|
chenxiaojun
|
936424a482
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
|
chenxiaojun
|
e2b7d7edb0
|
管理后台->推广员->财务管理->推广提现--结算详情分
|
5 years ago |
|
chenxiaojun
|
232760c351
|
推广平台->数据管理->每日概况|数据汇总--sql优化
|
5 years ago |
|
zhengchanglong
|
cfe66517d5
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengyongxing
|
392c42f356
|
数据管理玩家充值玩家账号加密
|
5 years ago |
|
zhengchanglong
|
d95fd1b1a7
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
00858df9fb
|
PC官网修改
|
5 years ago |
|
ELF
|
0cbc9e5d8a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
7acf0e13bf
|
修改bug
|
5 years ago |
|
sunke
|
e9b234df02
|
下载数据加密
|
5 years ago |
|
zhanglingsheng
|
d0a0068039
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
94cc0bacbf
|
SDK菜单链接修改
|
5 years ago |
|
chenxiaojun
|
9933463c70
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
chenxiaojun
|
f9d26bab7c
|
管理后台->推广员->财务管理->推广提现--结算详情分页
|
5 years ago |
|
sunke
|
787d7573f0
|
bug
|
5 years ago |
|
zhanglingsheng
|
21b02ca200
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
f074ce853b
|
sdk菜单配置修改
|
5 years ago |
|
yulingwei
|
82bdfadb7d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
yulingwei
|
2e0a8d2ad0
|
更新统计数据
|
5 years ago |
|
zhanglingsheng
|
5b3c01e1ba
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhanglingsheng
|
3453de757f
|
sdk菜单配置修改
|
5 years ago |
|
chenxiaojun
|
5e3cc42bc1
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
5 years ago |
|
chenxiaojun
|
cc572ca66e
|
管理后台->推广员->推广员编辑--二级密码名词解释更改
|
5 years ago |
|
ELF
|
14e36e31bb
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
1dbd96c15b
|
修改bug
|
5 years ago |
|
zhengyongxing
|
d386337922
|
管理中心重要的信息加密
|
5 years ago |
|
chenxiaojun
|
3d2b5c48f3
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
chenxiaojun
|
88afeea8a0
|
推广平台->数据管理->订单查询--更新
|
5 years ago |
|
ELF
|
2ae21b162f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
3d9d85d008
|
修改bug
|
5 years ago |
|
chenxiaojun
|
31f564c8e4
|
推广平台->安全管理->用户基本信息--权限设置
|
5 years ago |
|
chenxiaojun
|
de4b80588f
|
推广平台->安全管理->用户基本信息--权限设置
|
5 years ago |
|
chenxiaojun
|
7972eaa5da
|
推广平台->安全管理->用户基本信息--权限设置
|
5 years ago |
|
chenxiaojun
|
76d8a88ea3
|
推广平台->管理中心--更新
|
5 years ago |
|
chenxiaojun
|
b84134c68d
|
推广平台->管理中心--更新
|
5 years ago |
|
ELF
|
57b552f4f3
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
f7c7f9acc6
|
修改bug
|
5 years ago |
|
zhengyongxing
|
49cb4c86eb
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Conflicts:
Application/Home/View/default/Finance/withdrawRecord.html
|
5 years ago |
|
zhengyongxing
|
97b9a06e69
|
推广后台bug修正
|
5 years ago |
|
ELF
|
5602892a8f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
bc92414aab
|
修改bug
|
5 years ago |
|
chenxiaojun
|
576efcb3eb
|
推广平台->财务管理--更新
|
5 years ago |
|
chenxiaojun
|
662eb93763
|
推广平台->财务管理--更新
|
5 years ago |
|
chenxiaojun
|
30421feb34
|
推广平台->财务管理->提现记录--样式调整
|
5 years ago |