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 |