chenxiaojun
|
b3ba4f0edf
|
更新
|
5 years ago |
|
chenxiaojun
|
cf0680eddf
|
开服预告正序显示
|
5 years ago |
yulingwei
|
808a901d7f
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
|
yulingwei
|
56b0216ff0
|
修改问题
|
5 years ago |
|
chenxiaojun
|
864b200561
|
更新
|
5 years ago |
|
chenxiaojun
|
0c0d59dd43
|
财务管理--更新
|
5 years ago |
|
yulingwei
|
95ed53de77
|
修复部分问题
|
5 years ago |
|
yulingwei
|
5cb129e95f
|
修复冲突
|
5 years ago |
|
yulingwei
|
e3f0a24e43
|
弹窗推广后台更新
|
5 years ago |
sunke
|
dc03c8a07a
|
认证限制排除协议
|
5 years ago |
|
sunke
|
015e7bc506
|
强制资质认证优化
|
5 years ago |
|
sunke
|
df2919f44b
|
账号加密
|
5 years ago |
|
sunke
|
cbb1436e41
|
玩家账号加密
|
5 years ago |
 ELF
|
74fa3946ec
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
6cdde605cb
|
Merge branch 'hotfix/download_cdn' into dev
|
5 years ago |
|
ELF
|
fb64d574cb
|
修改包下载bug
|
5 years ago |
|
sunke
|
f172c3bfb2
|
新增会长强制认证功能
|
5 years ago |
|
ELF
|
6b7d1b9b51
|
Merge branch 'feature/add_cdn' into dev
|
5 years ago |
|
ELF
|
fe68d8e8c9
|
修改oss上传返回结果
|
5 years ago |
|
ELF
|
b220ac1c7f
|
Merge branch 'feature/add_cdn' into dev
|
5 years ago |
|
ELF
|
f472f5e9d3
|
文件保存改成cdn
|
5 years ago |
|
chenxiaojun
|
d792e34348
|
结算管理--更新
|
5 years ago |
|
chenxiaojun
|
90eed6f5ca
|
结算管理--更新
|
5 years ago |
|
ELF
|
7c5b3bb5e7
|
Merge branch 'feature/account_safe' into dev
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
chenxiaojun
|
0baf97f717
|
会长提现--更新
|
5 years ago |
|
chenxiaojun
|
e884214546
|
会长提现|公会分成管理--更新
|
5 years ago |
|
ELF
|
f1dc5f8920
|
推广员继承company_id
|
5 years ago |
|
ELF
|
561787a4ac
|
修改
|
5 years ago |
|
ELF
|
0a86f3a33c
|
修改样式
|
5 years ago |
|
ELF
|
67caddeef0
|
修改落地页样式
|
5 years ago |
|
ELF
|
c054595a94
|
修改微信分享bug
|
5 years ago |
|
ELF
|
9bf45ae0d3
|
修改
|
5 years ago |
|
ELF
|
660e0063f7
|
修改落地页
|
5 years ago |
|
ELF
|
3246745e58
|
Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0
|
5 years ago |
|
ELF
|
c72888181b
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
ELF
|
5e0c1c0f87
|
修改
|
5 years ago |
|
chenxiaojun
|
0bc657a5fc
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
40da308a08
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
cc83e0e585
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
d3a4933b5c
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ee6c6e62b2
|
充值玩家--更新
|
5 years ago |
|
ELF
|
1a8d66e2d7
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
ELF
|
cb63520de5
|
修改落地页
|
5 years ago |
|
ELF
|
a8643d20a0
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
ELF
|
db46d4b079
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
|
ELF
|
600d1a27f5
|
修改
|
5 years ago |
|
chenxiaojun
|
5cf9ad9fd1
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
31e045bdba
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
a15440e299
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
e3742a9d8a
|
充值玩家--更新
|
5 years ago |
|
ELF
|
b1844a0082
|
修改落地页
|
5 years ago |
|
ELF
|
31723fbc0b
|
修改bug
|
5 years ago |
|
ELF
|
aa0ec5758a
|
修改
|
5 years ago |
|
ELF
|
727795050c
|
修改
|
5 years ago |
|
ELF
|
cd6f6e5610
|
修改
|
5 years ago |
|
ELF
|
eddc5eb7a6
|
修改
|
5 years ago |
|
ELF
|
a1862fd240
|
修改
|
5 years ago |
|
ELF
|
4b46cd4563
|
修改
|
5 years ago |
|
ELF
|
4536b77714
|
修改
|
5 years ago |
|
ELF
|
18e39c5fc7
|
修改
|
5 years ago |
|
ELF
|
6621467b58
|
修改
|
5 years ago |
|
ELF
|
5c7d699353
|
修改落地页
|
5 years ago |
|
ELF
|
0405ada382
|
修改落地页
|
5 years ago |
|
ELF
|
1de7a0f3ac
|
修改落地页
|
5 years ago |
|
ELF
|
cb74200850
|
修改落地页
|
5 years ago |
|
ELF
|
d7b244e5d5
|
修改落地页
|
5 years ago |
|
ELF
|
48b18db141
|
修改落地页
|
5 years ago |
|
ELF
|
6e55b657a4
|
修改落地页
|
5 years ago |
|
ELF
|
182a241f4e
|
修改落地页
|
5 years ago |
liuweiwen
|
263937f83e
|
落地页增加登录注册等静态页面
|
5 years ago |
|
chenxiaojun
|
92b0bc2c87
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
ec273ab157
|
公会分成管理--更新
|
5 years ago |
zhengchanglong
|
ab5f7267e5
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
liuweiwen
|
7b4cd74a23
|
落地页
|
5 years ago |
|
zhengchanglong
|
4968ace29d
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Common/function.php
# Application/Home/Controller/DownloadController.class.php
|
5 years ago |
|
ELF
|
b36e1f1bc9
|
解决冲突
|
5 years ago |
|
ELF
|
c90851996c
|
修改bug
|
5 years ago |
|
chenxiaojun
|
5da02389ac
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
81306967d2
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
liuweiwen
|
73aebd513c
|
落地页测试
|
5 years ago |
|
liuweiwen
|
dabdbb6c98
|
落地页测试
|
5 years ago |
|
liuweiwen
|
b608f8587b
|
落地页测试
|
5 years ago |
|
liuweiwen
|
5bebb747f7
|
落地页样式调整测试
|
5 years ago |
|
sunke
|
7e68257724
|
充值玩家
|
5 years ago |
|
liuweiwen
|
1c047c80a6
|
落地页样式调整测试
|
5 years ago |
|
zhengchanglong
|
39b6e98f3b
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/BehaviorLogController.class.php
# Application/Admin/Controller/ExportController.class.php
# Data/update.sql
|
5 years ago |
|
liuweiwen
|
794480bebd
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
1b0256a404
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
1df4d24689
|
落地页样式调整测试
|
5 years ago |
|
liuweiwen
|
b1149ab14f
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
liuweiwen
|
39d2928dfd
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
liuweiwen
|
d68037b99d
|
落地页游戏截图没图片隐藏
|
5 years ago |
|
chenxiaojun
|
9843b5d885
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
28efebf8d0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7709163e03
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f132189ea4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
25ae12a72c
|
增加extend判断
|
5 years ago |
|
sunke
|
8ccb78e7af
|
线上行为日志bug
|
5 years ago |
|
sunke
|
b2ab2c9df0
|
隐藏信息
|
5 years ago |
|
sunke
|
1cd4e94840
|
平台币充值区服隐藏
|
5 years ago |
|
zhengchanglong
|
e08a2eb3ce
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/Controller/access_data_foldline.txt
# Data/update.sql
|
5 years ago |
|
sunke
|
74d1deb9a0
|
cp订单号
|
5 years ago |
|
sunke
|
0f997da819
|
订单号
|
5 years ago |
|
ELF
|
910e1db638
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
chenxiaojun
|
3d3b96abc1
|
安卓落地页视频样式修复
|
5 years ago |
|
chenxiaojun
|
cf8f6d007f
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into dev_cxj
|
5 years ago |
|
chenxiaojun
|
ef24feff13
|
安卓落地页视频样式修复
|
5 years ago |
|
ELF
|
56d261288d
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
sunke
|
ec2bbab76f
|
sever
|
5 years ago |
|
chenxiaojun
|
48614da52d
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4c04b68a32
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bc166771e4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
ELF
|
b861c7fb3e
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
ELF
|
22be3a5d95
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
chenxiaojun
|
a76214ee22
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1989915767
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
bb17441528
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ad0b88553b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
dae994d416
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
e9f8e40e48
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
ff1981ba59
|
Merge branch 'release-1.0.0' into dev
|
5 years ago |
|
chenxiaojun
|
7415853c7d
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
62c54cda7f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
zhengchanglong
|
0459b99da0
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
chenxiaojun
|
0da7f8e7df
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
60fff33fca
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
1b8fb8cad5
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
3e5588ff3d
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
chenxiaojun
|
894f174390
|
管理后台>推广员管理>公会分成管理--新增
|
5 years ago |
|
chenxiaojun
|
a19a7b530e
|
推广平台>数据管理>每日概况--更新
|
5 years ago |
|
sunke
|
fc2596a7cc
|
充值玩家当天时间包办
|
5 years ago |
|
chenxiaojun
|
3e0e2d29fc
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0f3038ea18
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
7d644de6e3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
4d070462ac
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
55c70afb40
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f854ca6bbb
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8261512ba3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f032257838
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
3ecf939c5b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
0679e5709b
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
yulingwei
|
838ef64dfe
|
Merge branch 'hotfix/search' into release-1.0.0
|
5 years ago |
|
chenxiaojun
|
c417fd5a64
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8fa2a6cef3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
elf@home
|
4d7366fdbc
|
Merge branch 'hotfix/open-shift' into dev
|
5 years ago |
|
elf@home
|
4123774a95
|
开放迁移推广账号
|
5 years ago |
|
yulingwei
|
36131961b4
|
Merge branch 'hotfix/search' into dev
|
5 years ago |
|
yulingwei
|
04dd31e945
|
修复选择问题
|
5 years ago |
|
liuweiwen
|
7293bf158f
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Admin/View/BehaviorLog/index.html
# Application/Home/Controller/QueryController.class.php
|
5 years ago |
|
liuweiwen
|
c5ea7c54ed
|
落地页关闭下载提示文字修改
|
5 years ago |
|
chenxiaojun
|
a29f6bfc14
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
d341789460
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
fee36cb7ff
|
防错
|
5 years ago |
|
chenxiaojun
|
4586105e49
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
8a8a193248
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
d795fb74f7
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
583756e9f7
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
deb3e4d189
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
5038291876
|
关联防错
|
5 years ago |
|
chenxiaojun
|
2771b705b4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
becddfca83
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
47bad41bfa
|
行为日志 时间检索
|
5 years ago |
|
chenxiaojun
|
f16949935f
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
39f068ebbe
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
b136ddcac3
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
107a32cdf4
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
sunke
|
fa5a47ea75
|
数据问题行为日志
|
5 years ago |
|
ELF
|
3ce289a194
|
隐藏玩家迁移功能
|
5 years ago |
|
ELF
|
33f42a611b
|
Merge branch 'release-1.0.0' of 47.111.118.107:/srv/git/platform into release-1.0.0
|
5 years ago |
|
ELF
|
9233d1568f
|
隐藏玩家迁移功能
|
5 years ago |
|
chenxiaojun
|
df7c165d12
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
chenxiaojun
|
dc2c4ee652
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
sunke
|
cb89467f6b
|
时间
|
5 years ago |
|
chenxiaojun
|
03edc87f4f
|
推广平台>数据管理>充值玩家--检索bug修复
|
5 years ago |
|
chenxiaojun
|
9c9396351b
|
推广平台>数据管理>订单查询--检索bug修复
|
5 years ago |
|
chenxiaojun
|
bec8203d47
|
推广平台>我的游戏--更新
|
5 years ago |
|
chenxiaojun
|
0797a18e87
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
dd536f9556
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
e0f5404a83
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
462dd061b7
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
b5b4f020a7
|
推广平台>落地页--更新
|
5 years ago |
|
chenxiaojun
|
78b0f66d37
|
推广平台>落地页--更新
|
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
|
587da83973
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
sunke
|
0cb7a40ea9
|
行为日志角色id
|
5 years ago |
|
sunke
|
92523d7429
|
充值状态
|
5 years ago |
|
sunke
|
4c1471f6bb
|
行为日志
|
5 years ago |
|
zhengchanglong
|
ba4339977e
|
Merge branch 'dev' into release-1.0.0
|
5 years ago |
|
liuweiwen
|
f5316aee55
|
Merge branch 'release-1.0.0' into dev
# Conflicts:
# Application/Home/Controller/QueryController.class.php
|
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 |
|
chenxiaojun
|
01ef816ee1
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
chenxiaojun
|
69fd83a2f0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f05034486c
|
推广平台>数据管理>充值玩家
|
5 years ago |
|
sunke
|
660397bf4f
|
双乾支付
|
5 years ago |
|
sunke
|
2c17a4c24f
|
双乾支付
|
5 years ago |