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 |
|
chenxiaojun
|
39378b1926
|
推广平台->财务管理->提现记录--样式调整
|
5 years ago |
|
chenxiaojun
|
f7d0109ee7
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
5caf75afb9
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
8ac33bb9e4
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
chenxiaojun
|
fd53997094
|
管理后台->充值->平台币订单->平台币回收--更新
|
5 years ago |
|
zhengchanglong
|
0b8dfcdc89
|
管理后台时时实时注册查询修改
|
5 years ago |
|
chenxiaojun
|
e96bd42ef6
|
管理后台->游戏--去除CP分成比例同步
|
5 years ago |
|
chenxiaojun
|
25b319f87c
|
管理后台->游戏--去除CP分成比例同步
|
5 years ago |
|
zhengyongxing
|
0b15e9edd5
|
推广后台管理中心修正
|
5 years ago |
|
chenxiaojun
|
6ad8277aa0
|
管理后台--更新
|
5 years ago |
|
chenxiaojun
|
2e7ecfa53c
|
管理后台--更新
|
5 years ago |
|
zhengyongxing
|
0b93ee2db9
|
推广后台订单查询隐藏操作
|
5 years ago |
|
zhengyongxing
|
1a29dddd0d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengyongxing
|
110d88d76f
|
推广后台角色查询玩家账号加密
|
5 years ago |
|
sunke
|
ee8a954566
|
查看消费记录滚动
|
5 years ago |
|
zhengyongxing
|
1528d0488b
|
推广后台首页当月新增金额修正
|
5 years ago |
|
zhengyongxing
|
77da9cf429
|
推广后台bug修正
|
5 years ago |
|
yulingwei
|
a7f6d8b7a4
|
upt
|
5 years ago |
|
elf@home
|
06486d458c
|
修改bug
|
5 years ago |
|
elf@home
|
1036589f3b
|
修改代码
|
5 years ago |
|
chenxiaojun
|
c68716bbae
|
推广平台->数据管理->每日概况|数据汇总--区服检索更新
|
5 years ago |
|
chenxiaojun
|
cd1f93e394
|
推广平台->数据管理->每日概况|数据汇总--区服检索更新
|
5 years ago |
|
ELF
|
2c24a9740b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
3af8fe116d
|
修改bu
|
5 years ago |
|
zhengchanglong
|
e7985f366b
|
管理中心菜单权限开放
|
5 years ago |
|
zhengchanglong
|
531494029f
|
管理中心菜单权限开放
|
5 years ago |