ELF
|
cd8d6d5a76
|
调试
|
5 years ago |
ELF
|
350fd45b40
|
Merge branch 'hotfix/log-landing-page' into release
|
5 years ago |
ELF
|
3ef3e8e819
|
落地页useragent记录
|
5 years ago |
ELF
|
02e85ac94c
|
Merge branch 'hotfix/log-landing-page' into release
|
5 years ago |
ELF
|
0105fafcb3
|
落地页useragent记录
|
5 years ago |
ELF
|
ae29e6ef53
|
Merge branch 'hotfix/landing-page' into release
|
5 years ago |
ELF
|
0010ca54f7
|
修改落地页样式
|
5 years ago |
ELF
|
7a6b996752
|
Merge branch 'hotfix/landing-page' into release
|
5 years ago |
ELF
|
04bbf3534b
|
修改落地页ios注册
|
5 years ago |
sunke
|
5dd81207cc
|
日志
|
5 years ago |
sunke
|
cb80f197ff
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_log
|
5 years ago |
sunke
|
715d8ace1c
|
下载中心修复
|
5 years ago |
liuweiwen
|
1f4f00d696
|
增加注释
|
5 years ago |
sunke
|
1f6de9be57
|
操作日志
|
5 years ago |
liuweiwen
|
5d05edbca6
|
资源自动审核扣除已审核额度,申请后续增加自动审核功能
|
5 years ago |
liuweiwen
|
7d879686af
|
自动审核规则调整,锁定显示红色字体
|
5 years ago |
liuweiwen
|
47cdce733c
|
推广后台-》测试资源申请-》符合规则的自动审核
|
5 years ago |
liuweiwen
|
aa8d296dd8
|
推广后台-》测试资源申请-》符合规则的自动审核
|
5 years ago |
sunke
|
6e2069dff9
|
电子文档样式问题
|
5 years ago |
chenxiaojun
|
ae9293e206
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
chenxiaojun
|
118aae4f83
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
chenxiaojun
|
43b5038778
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
chenxiaojun
|
23f38f6a07
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
chenxiaojun
|
3d35ce3769
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
chenxiaojun
|
a863f7ff99
|
推广平台>财务管理>提现记录--更新
|
5 years ago |
chenxiaojun
|
46d712cce7
|
推广平台>数据管理>推广员指标--更新
推广平台>财务管理>结算中心--更新
|
5 years ago |
ELF
|
e58bb1149f
|
修改落地页授权
|
5 years ago |
ELF
|
2967d023d7
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
ELF
|
ec4bc4d46e
|
修改极速版下载描述文字
|
5 years ago |
ELF
|
9d01a8d43b
|
修改提示语
|
5 years ago |
ELF
|
3fef1f7910
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
ELF
|
afb5c3b246
|
修改落地页样式
|
5 years ago |
yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
ELF
|
35b267027c
|
Merge branch 'hotfix/download_name' into release
|
5 years ago |
ELF
|
129a1103e2
|
修改beta版下载名称
|
5 years ago |
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
ELF
|
055e246f70
|
修改bug
|
5 years ago |
yulingwei
|
469a037b0f
|
merge
|
5 years ago |
chenxiaojun
|
13a39d1080
|
推广平台>数据管理>推广员指标--更新
|
5 years ago |
chenxiaojun
|
ed7a731ae5
|
推广平台>数据管理>推广员指标--更新
|
5 years ago |
chenxiaojun
|
db6aeb26eb
|
推广平台>数据管理>推广员指标--更新
|
5 years ago |
chenxiaojun
|
ff489f8a17
|
Merge remote-tracking branch 'origin/feature/promote_quota' into feature/promote_quota
|
5 years ago |
chenxiaojun
|
2defa249e8
|
推广平台>数据管理>推广员指标--更新
|
5 years ago |
ELF
|
7833847e72
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into release
|
5 years ago |
ELF
|
641e401c73
|
Merge branch 'feature/promote_group' into release
|
5 years ago |
ELF
|
9ca131aaaa
|
修改推廣員bug
|
5 years ago |
sunke
|
3dbacf225b
|
指标下载处理
|
5 years ago |
sunke
|
ffd29e2662
|
指标导出处理
|
5 years ago |
sunke
|
712010b241
|
推广员指标
|
5 years ago |
sunke
|
e2b6a09958
|
电子文档弹窗按钮
|
5 years ago |
sunke
|
afbba4d20b
|
电子文档弹窗按钮
|
5 years ago |
ELF
|
947c58952b
|
部门/组长删除搜索框
|
5 years ago |
ELF
|
c95f771ba0
|
解决冲突
|
5 years ago |
ELF
|
423b4ae77b
|
解决冲突
|
5 years ago |
ELF
|
227c6e6ef9
|
添加推广员搜索功能添加组名/部门名
|
5 years ago |
chenxiaojun
|
89c7855337
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
chenxiaojun
|
66d68b0b49
|
管理后台>推广员>结算管理>公会分成管理--更新
|
5 years ago |
sunke
|
8db53afc8b
|
电子文档及公司录入信息
|
5 years ago |
ELF
|
bbb31890f6
|
未收押金会长禁用落地页/下载页
|
5 years ago |
ELF
|
501b8099d4
|
解决冲突
|
5 years ago |
ELF
|
b4d35af3cb
|
推广员列表显示
|
5 years ago |
chenxiaojun
|
fa3a346096
|
推广平台>财务管理--更新
|
5 years ago |
chenxiaojun
|
e48056686d
|
推广平台>数据管理--新增推广员指标
|
5 years ago |
sunke
|
889a79a6b5
|
电子文档弹窗
|
5 years ago |
chenxiaojun
|
c57f67a43b
|
推广平台>财务管理>提现记录--更新
|
5 years ago |
liaojinling
|
843a429b43
|
下载添加部门/小组
|
5 years ago |
chenxiaojun
|
065821a2d9
|
推广平台>财务管理>结算中心--更新
|
5 years ago |
sk
|
edf8d07a4e
|
充值明细条件更变
|
5 years ago |
廖金灵
|
5d281e4647
|
Merge branch 'hotfix/close_promote_register' of wmtx/platform into master
清除推广员注册代码
|
5 years ago |
liaojinling
|
6cecac4862
|
清除推广员注册代码
|
5 years ago |
liaojinling
|
d789a175f8
|
推广员/组长添加备注
|
5 years ago |
chenxiaojun
|
4e1d6938f8
|
推广平台>数据管理>订单查询--bug修复
|
5 years ago |
sk
|
d98bfa04b9
|
资质认证电子文档
|
5 years ago |
chenxiaojun
|
f1fda49e9e
|
推广平台>财务管理--更新
|
5 years ago |
ELF
|
9ab7688056
|
调试
|
5 years ago |
ELF
|
7928282e99
|
调试
|
5 years ago |
ELF
|
b79ab76a39
|
调试
|
5 years ago |
ELF
|
8ff17d9872
|
修改bug
|
5 years ago |
ELF
|
13cb680955
|
修改bug
|
5 years ago |
ELF
|
d0e700d2e8
|
优化程序
|
5 years ago |
ELF
|
e8a0975981
|
解决冲突
|
5 years ago |
ELF
|
8136bff2f9
|
优化查询
|
5 years ago |
ELF
|
6993d164a3
|
解决冲突
|
5 years ago |
sunke
|
8b82e03328
|
下载刷新
|
5 years ago |
sunke
|
5b6e9da5d8
|
获取区服名
|
5 years ago |
ELF
|
0f5e3944c0
|
财务管理加入权限判断
|
5 years ago |
ELF
|
2b039e2b8a
|
优化程序
|
5 years ago |
ELF
|
709094c5be
|
修改bug
|
5 years ago |
ELF
|
b7cf4c28a7
|
修改
|
5 years ago |
ELF
|
526bbc1556
|
添加ios下载控制功能
|
5 years ago |
sunke
|
5974047e1c
|
推广员指标下载
|
5 years ago |
ELF
|
d3a3b8cdb7
|
修改
|
5 years ago |
chenxiaojun
|
8c43defff3
|
推广员指标管理--更新
|
5 years ago |
chenxiaojun
|
784f416ad5
|
推广员指标管理--更新
|
5 years ago |
chenxiaojun
|
5fbe482fba
|
推广员指标管理--更新
|
5 years ago |
chenxiaojun
|
47b7dc0d2f
|
市场总监联系方式
|
5 years ago |
chenxiaojun
|
4dd5967be9
|
推广员指标管理
|
5 years ago |
chenxiaojun
|
8780b57f45
|
推广员指标管理--更新
|
5 years ago |
chenxiaojun
|
30c40d004b
|
推广员指标管理--更新
|
5 years ago |
chenxiaojun
|
9a4a50fb9c
|
市场总监联系方式
|
5 years ago |
chenxiaojun
|
cd13156221
|
市场部联系方式
|
5 years ago |
ELF
|
79f9801351
|
修改落地页/下载页
|
5 years ago |
chenxiaojun
|
535f185e37
|
推广员指标管理
|
5 years ago |
ELF
|
0d45be780f
|
解决冲突
|
5 years ago |
chenxiaojun
|
5a75ea406a
|
更新
|
5 years ago |
sunke
|
10f3f8609d
|
手机号去重
|
5 years ago |
chenxiaojun
|
cf66e4323e
|
公会分成管理--更新
|
5 years ago |
chenxiaojun
|
c58e1c57de
|
财务管理--更新
|
5 years ago |
chenxiaojun
|
29789f5ef6
|
公会分成管理--更新
|
5 years ago |
chenxiaojun
|
b7dd9c5b45
|
财务管理--更新
|
5 years ago |
sunke
|
dbf04c25c5
|
错误修改
|
5 years ago |
chenxiaojun
|
b367b4a8d3
|
公会分成管理--更新
|
5 years ago |
chenxiaojun
|
df97ff401a
|
财务管理--更新
|
5 years ago |
sunke
|
126c7755db
|
资料填写地址默认
|
5 years ago |
chenxiaojun
|
693f8c9991
|
财务管理--更新
|
5 years ago |
sunke
|
7ac22521dd
|
姓名只留姓
|
5 years ago |
sunke
|
4793665896
|
充值信息根据会长权限显示导出部分
|
5 years ago |
chenxiaojun
|
4f63f45374
|
推广平台>数据管理>每日概况|数据汇总--更新
|
5 years ago |
ELF
|
7a1cd5bc94
|
添加完整的权限判断
|
5 years ago |
ELF
|
f0acbc1c24
|
充值信息根据会长权限显示
|
5 years ago |
ELF
|
b38eed342f
|
Merge branch 'release' into dev
|
5 years ago |
ELF
|
f27728b9dd
|
Merge branch 'hotfix/change_btn_color' into release
|
5 years ago |
ELF
|
f7a53c7562
|
Merge branch 'feature/account_safe' into release
|
5 years ago |
ELF
|
c4934613ae
|
解决冲突
|
5 years ago |
ELF
|
1ba77738f3
|
解决冲突
|
5 years ago |
ELF
|
b0bc4c0496
|
解决冲突
|
5 years ago |
ELF
|
0f44d9e95c
|
解决冲突
|
5 years ago |
ELF
|
152ccbc210
|
修改落地页按钮颜色
|
5 years ago |
sunke
|
5f6611fc30
|
资质认证
|
5 years ago |
chenxiaojun
|
c42e0be4cd
|
更新
|
5 years ago |
chenxiaojun
|
7550bafdf7
|
充值玩家--更新
|
5 years ago |
sunke
|
4c4f46ed4b
|
添加条件 过滤
|
5 years ago |
yulingwei
|
34debb1287
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
yulingwei
|
9910485523
|
修改
|
5 years ago |
sunke
|
c5febf0b9a
|
Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev
|
5 years ago |
sunke
|
10fb1aec73
|
过滤规则
|
5 years ago |
yulingwei
|
b5d71ae215
|
Merge branch 'feature/pop_rules' into dev
|
5 years ago |
yulingwei
|
7ea2a465bf
|
修复问题
|
5 years ago |
sunke
|
5b5c7876d2
|
会长权限
|
5 years ago |
chenxiaojun
|
0732ff3d6d
|
开服预告正序显示
|
5 years ago |
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 |