yulingwei
|
e26f517df1
|
冲突解决
|
5 years ago |
|
yulingwei
|
dfe52865bd
|
upt
|
5 years ago |
 ELF
|
055e246f70
|
修改bug
|
5 years ago |
|
yulingwei
|
469a037b0f
|
merge
|
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
|
9ca131aaaa
|
修改推廣員bug
|
5 years ago |
sunke
|
3dbacf225b
|
指标下载处理
|
5 years ago |
|
sunke
|
ffd29e2662
|
指标导出处理
|
5 years ago |
|
sunke
|
712010b241
|
推广员指标
|
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 |
|
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
|
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 |
|
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
|
4dd5967be9
|
推广员指标管理
|
5 years ago |
|
chenxiaojun
|
30c40d004b
|
推广员指标管理--更新
|
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
|
29789f5ef6
|
公会分成管理--更新
|
5 years ago |
|
sunke
|
dbf04c25c5
|
错误修改
|
5 years ago |
|
chenxiaojun
|
b367b4a8d3
|
公会分成管理--更新
|
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
|
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 |
|
sunke
|
5f6611fc30
|
资质认证
|
5 years ago |
|
chenxiaojun
|
c42e0be4cd
|
更新
|
5 years ago |
|
chenxiaojun
|
7550bafdf7
|
充值玩家--更新
|
5 years ago |
|
sunke
|
4c4f46ed4b
|
添加条件 过滤
|
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
|
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 |
|
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
|
c054595a94
|
修改微信分享bug
|
5 years ago |
|
ELF
|
9bf45ae0d3
|
修改
|
5 years ago |
|
chenxiaojun
|
40da308a08
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
cc83e0e585
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
ee6c6e62b2
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
5cf9ad9fd1
|
充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
31e045bdba
|
充值玩家--更新
|
5 years ago |
|
ELF
|
31723fbc0b
|
修改bug
|
5 years ago |
|
ELF
|
a1862fd240
|
修改
|
5 years ago |
|
ELF
|
48b18db141
|
修改落地页
|
5 years ago |
|
ELF
|
6e55b657a4
|
修改落地页
|
5 years ago |
|
ELF
|
182a241f4e
|
修改落地页
|
5 years ago |
|
chenxiaojun
|
92b0bc2c87
|
公会分成管理--更新
|
5 years ago |
|
chenxiaojun
|
ec273ab157
|
公会分成管理--更新
|
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 |
|
sunke
|
7e68257724
|
充值玩家
|
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 |
|
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 |
|
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 |
|
ELF
|
56d261288d
|
Merge branch 'release-1.0.0'
|
5 years ago |
|
sunke
|
ec2bbab76f
|
sever
|
5 years ago |
|
chenxiaojun
|
48614da52d
|
推广平台>数据管理>充值玩家--更新
|
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 |
|
zhengchanglong
|
ff1981ba59
|
Merge branch 'release-1.0.0' into dev
|
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
|
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 |
|
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 |
|
sunke
|
fa5a47ea75
|
数据问题行为日志
|
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 |
|
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 |
|
chenxiaojun
|
01ef816ee1
|
推广平台>数据管理>订单查询--更新
|
5 years ago |
|
chenxiaojun
|
69fd83a2f0
|
推广平台>数据管理>充值玩家--更新
|
5 years ago |
|
chenxiaojun
|
f05034486c
|
推广平台>数据管理>充值玩家
|
5 years ago |