 ELF
|
b4168a23f1
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
chenzhi
|
498de9ab75
|
同步dev
|
5 years ago |
|
chenzhi
|
ab2252375d
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
chenzhi
|
c8fb1bb207
|
修改
|
5 years ago |
chenxiaojun
|
681c401686
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
chenxiaojun
|
42d330bbc4
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
chenxiaojun
|
b1b10645fc
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
ELF
|
689cc08b69
|
修改
|
5 years ago |
sunke
|
8633efd7d6
|
增加部门长分级
|
5 years ago |
|
chenxiaojun
|
bf7c353692
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
ELF
|
00966dc9e4
|
修改
|
5 years ago |
|
ELF
|
22dcca566b
|
修改
|
5 years ago |
|
chenxiaojun
|
a14b18f54f
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
zhengchanglong
|
e69bc5f459
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
sunke
|
9844d5a740
|
订单查询
|
5 years ago |
|
sunke
|
f15c6e68eb
|
注册明细，订单查询 修改等级结构
|
5 years ago |
|
chenxiaojun
|
fffbdb739b
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
ELF
|
6d68ddfe07
|
Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
ELF
|
3abbe94774
|
修改bug
|
5 years ago |
|
chenxiaojun
|
9c1eeb2448
|
推广后台->游戏管理->专服管理|混服管理 -- 更新
|
5 years ago |
|
ELF
|
5b62b99765
|
三级变四级
|
5 years ago |
|
chenxiaojun
|
9169a2084b
|
推广后台->数据管理->每日概况|数据汇总->合计更新
|
5 years ago |
zyx
|
224c745ba8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
a3d0c81d4b
|
修改
|
5 years ago |
|
chenzhi
|
f5ac904a49
|
优化扶持
|
5 years ago |
|
zyx
|
d7c9744872
|
扶持号时间格式修改
|
5 years ago |
|
zyx
|
ecc93af47c
|
测试资源排序添加
|
5 years ago |
|
chenxiaojun
|
032e5de877
|
推广平台->注册明细->bug修复
|
5 years ago |
|
chenxiaojun
|
8b2e384fb6
|
推广平台->注册明细->bug修复
|
5 years ago |
|
zyx
|
7e37560efe
|
公告计数负数问题改正
|
5 years ago |
|
chenxiaojun
|
1ec9c156cf
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
|
chenxiaojun
|
27665e5b14
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
|
chenxiaojun
|
37188cb085
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
36b9b51817
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
zyx
|
31039bdeab
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
0d35370ade
|
扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序
|
5 years ago |
|
zhengchanglong
|
af68a2ef10
|
推官员首页优化
|
5 years ago |
|
chenxiaojun
|
155df3336d
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
c3c2f91c30
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
zyx
|
4a23e1dd8a
|
日志管理bug修复
|
5 years ago |
|
zyx
|
a16c77181c
|
优化首页计算代码
|
5 years ago |
|
zyx
|
c461190682
|
首页用户注册充值信息修正,昨日注册用户
|
5 years ago |
|
zyx
|
219596843b
|
首页用户注册充值信息修正,昨日注册用户
|
5 years ago |
|
zyx
|
c6da6fb705
|
首页用户注册充值信息修正
|
5 years ago |
|
chenxiaojun
|
f46a76649c
|
推广平台->84推广员开权限
|
5 years ago |
|
chenxiaojun
|
74f88da239
|
推广平台->84推广员开权限
|
5 years ago |
|
ELF
|
eb09c67dd4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
5ff559cf11
|
修改bug
|
5 years ago |
|
chenxiaojun
|
e92790a89f
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
5 years ago |
|
chenxiaojun
|
d56bebdaa6
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
5 years ago |
|
zyx
|
0112a0151c
|
首页用户注册充值信息修正
|
5 years ago |
jbrazz
|
c1ab4e789c
|
Merge branch 'featrue/fix_bug' into dev
|
5 years ago |
|
jbrazz
|
9bc5127223
|
upt
|
5 years ago |
|
chenxiaojun
|
641dcd5b65
|
推广员后台->每日概况->游戏检索bug
|
5 years ago |
|
chenxiaojun
|
db424fde84
|
推广员后台->每日概况->游戏检索bug
|
5 years ago |
|
ELF
|
b7964e19d0
|
修改bug
|
5 years ago |
|
ELF
|
4d0359aaba
|
修改bug
|
5 years ago |
|
ELF
|
b29d62a4ac
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
chenxiaojun
|
5bb7e9850f
|
推广员后台->区服排序
|
5 years ago |
|
chenxiaojun
|
c3d4c112d6
|
推广员后台->区服排序
|
5 years ago |
|
ELF
|
157676f268
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
260e45f4d9
|
Merge branch 'hotfix/query' into dev
|
5 years ago |
|
ELF
|
2816054361
|
修改bug
|
5 years ago |
|
zyx
|
bb3109f5d3
|
测试账号冻结状态需要的字段修改
|
5 years ago |
|
zyx
|
3c1b1673f2
|
测试资源申请页面检索数据修正，检索都统一改为模糊查询，文章详情页隐藏首页，添加返回按钮
|
5 years ago |
|
ELF
|
c888915daa
|
Merge branch 'hotfix/query' into dev
|
5 years ago |
|
ELF
|
ece317d6fa
|
修改bug
|
5 years ago |
|
zyx
|
91b773d974
|
开服信息，平台显示修正
|
5 years ago |
|
zyx
|
9eb36bd81f
|
组长账号显示测试资源
|
5 years ago |
|
chenxiaojun
|
7d8f7b53e6
|
ios13.1绑定提示修改 下级推广员查询bug修复
|
5 years ago |
|
chenxiaojun
|
cff2dc911a
|
获取下级推广员bug修改
|
5 years ago |
|
zyx
|
66ced8930e
|
首页bug解决
|
5 years ago |
|
ELF
|
24b1441632
|
修改超级签链接
|
5 years ago |
|
zyx
|
dd3e56d27c
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
72036e51e3
|
首页时间问题修正，快捷菜单10个限制添加
|
5 years ago |
|
ELF
|
2638929031
|
通过帐号隐藏目录
|
5 years ago |
|
elf@home
|
f7aaa9030e
|
修改bug
|
5 years ago |
|
elf@home
|
4c5473a27f
|
修改bug
|
5 years ago |
|
chenxiaojun
|
a7f2695665
|
无检索条件默认包括本账号
|
5 years ago |
|
chenxiaojun
|
e3d0e885f2
|
无检索条件默认包括本账号
|
5 years ago |
|
zhengchanglong
|
a6398b488f
|
Merge branch 'dev_zcl' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
ELF
|
db956a2d77
|
修改bug
|
5 years ago |
|
ELF
|
cc9aa1a640
|
解决冲突
|
5 years ago |
|
zyx
|
bd572379b0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
5c5d879710
|
资源日志bug修复
|
5 years ago |
|
ELF
|
84174b18e9
|
修改bug
|
5 years ago |
|
chenzhi
|
d8095f3397
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
zyx
|
f64225cff0
|
测试功能移交到总管理后台，扶持号管理bug修正
|
5 years ago |
|
ELF
|
91866f4433
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
d9e7a55af4
|
修改bug
|
5 years ago |
|
chenxiaojun
|
80e2a7e0fa
|
订单查询、注册明细->组长与推广员组合检索bug修复
|
5 years ago |
|
chenxiaojun
|
57c9c7419a
|
订单查询、注册明细->组长与推广员组合检索bug修复
|
5 years ago |
|
chenxiaojun
|
837d168f2d
|
每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
|
5 years ago |
|
chenxiaojun
|
307146cd3c
|
每日概况、数据汇总、订单查询、注册明细 组长检索bug修复
|
5 years ago |
|
chenxiaojun
|
203e2df7c8
|
数据管理->订单查询->支付方式检索bug修复
|
5 years ago |
|
chenxiaojun
|
a01c8f04b8
|
数据管理->订单查询->支付方式检索bug修复
|
5 years ago |
|
zhengchanglong
|
308903d396
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Application/Sdk/Controller/Ipa365Controller.class.php
|
5 years ago |
|
zhengchanglong
|
bb0a399ef7
|
推广员平台币支付 支付宝支付账户信息重配置文件读取
|
5 years ago |
|
ELF
|
b2f357608f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c715996821
|
修改bug
|
5 years ago |
|
chenxiaojun
|
4e7904c3de
|
订单查询支付方式修改
|
5 years ago |
|
zyx
|
e4be69d796
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
zyx
|
3ed9092e07
|
首页功能隐藏
|
5 years ago |
|
chenxiaojun
|
b426a6e153
|
订单查询 注册明细
|
5 years ago |
|
chenxiaojun
|
5e75ed2480
|
订单查询 注册明细
|
5 years ago |
|
zyx
|
eab8135549
|
首页添加日志及未读提醒功能
|
5 years ago |
|
ELF
|
5dd9df5cd5
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
8bea436dee
|
修改
|
5 years ago |
|
chenxiaojun
|
66b86e074e
|
数据汇总 每日概况
|
5 years ago |
|
chenxiaojun
|
52d9da8f1d
|
数据汇总 每日概况
|
5 years ago |
|
ELF
|
580a531bc4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
24cbe37faa
|
修改bugt
|
5 years ago |
|
chenxiaojun
|
329c9d1514
|
数据汇总 每日概况
|
5 years ago |
|
chenxiaojun
|
3fc4438754
|
数据汇总 每日概况
|
5 years ago |
|
chenxiaojun
|
9ef95cdabf
|
数据汇总 每日概况
|
5 years ago |
|
chenxiaojun
|
a5bd8c25c4
|
数据汇总 每日概况
|
5 years ago |
|
ELF
|
4c4d3255d7
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
8ce7442062
|
修改bug
|
5 years ago |
|
chenxiaojun
|
c678968253
|
数据汇总
|
5 years ago |
|
chenxiaojun
|
e53268815c
|
数据汇总
|
5 years ago |
|
chenxiaojun
|
9de8e33ba9
|
数据汇总
|
5 years ago |
|
chenxiaojun
|
809778b449
|
数据汇总更新
|
5 years ago |
|
ELF
|
e610500db6
|
修改时间插件默认值显示bug
|
5 years ago |
|
ELF
|
06bfdbca93
|
解决冲突
|
5 years ago |
|
elf@home
|
cda67249ac
|
修改
|
5 years ago |
|
ELF
|
d3412cc3ce
|
测试
|
5 years ago |
|
zyx
|
700ac00fbc
|
测试资源title标签补全
|
5 years ago |
|
sunke
|
ae666881ed
|
修改专区防错
|
5 years ago |
|
chenxiaojun
|
007f2ec003
|
批量添加下级游戏bug修复
|
5 years ago |
|
chenxiaojun
|
7f7d054dfc
|
批量添加下级游戏bug修复
|
5 years ago |
|
chenxiaojun
|
ddd7b9805f
|
批量添加下级游戏bug修复
|
5 years ago |
|
chenxiaojun
|
98392b21b8
|
批量添加下级游戏bug修复
|
5 years ago |
|
chenxiaojun
|
2fcca7fcaa
|
落地页
|
5 years ago |
|
chenxiaojun
|
7c360e40f6
|
落地页测试
|
5 years ago |
|
chenxiaojun
|
93cf48ef8e
|
落地页测试
|
5 years ago |
|
chenxiaojun
|
1e014fe0b0
|
落地页
|
5 years ago |
|
zyx
|
98a0ea3631
|
后台菜单修改提交
|
5 years ago |
|
zyx
|
1aec352b50
|
防护日志功能添加，扶持号功能修改
|
5 years ago |
|
“‘
|
70a4ba3244
|
修复密码bug
|
5 years ago |
|
“‘
|
b9bd9655b7
|
测试资源记录及发放
|
5 years ago |
|
ELF
|
ab4dc74784
|
修改
|
5 years ago |
|
“‘
|
c28cef6ee4
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
0dc0063092
|
修改arpu
|
5 years ago |
|
“‘
|
efccda637b
|
测试资源测试
|
5 years ago |
|
chenxiaojun
|
3a9adbae03
|
更新->下级添加游戏bug修复
|
5 years ago |
|
chenxiaojun
|
b5ed51bed1
|
更新->下级添加游戏bug修复
|
5 years ago |
|
chenxiaojun
|
ae8bb7880d
|
更新->添加下级游戏bug修复
|
5 years ago |
|
chenxiaojun
|
91d5166af3
|
更新->下级添加游戏bug修复
|
5 years ago |
|
ELF
|
88a7df1119
|
修改
|
5 years ago |
|
“‘
|
fb95cebcf5
|
新增目录
|
5 years ago |
|
“‘
|
89ae55f554
|
新增测试资源申请
|
5 years ago |
|
zyx
|
926c72f8af
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform
|
5 years ago |
|
zyx
|
5cfd492676
|
10.11支持号管理功能修改提交
|
5 years ago |
|
chenxiaojun
|
5d57c4a78b
|
更新->数据汇总 每日概况
|
5 years ago |
|
chenxiaojun
|
fe331aebad
|
更新->数据汇总 每日概况
|
5 years ago |
|
ELF
|
b268f1fce6
|
数据统计
|
5 years ago |
|
chenxiaojun
|
59de455dea
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
a1476436d2
|
新增->游戏分包打包顺序
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
82d40f4e8b
|
新增->游戏分包打包顺序
|
5 years ago |
|
zyx
|
e3d2e4b1b3
|
支持号管理功能提交
|
5 years ago |
|
ELF
|
fc73d458c9
|
业绩
|
5 years ago |
|
chenxiaojun
|
62d38bf08e
|
新增->设置'会长下级游戏展示'
# Conflicts:
# Data/update.sql
|
5 years ago |
|
chenxiaojun
|
6970e36395
|
游戏管理->设置
|
5 years ago |
|
chenxiaojun
|
b9a29a5032
|
游戏管理->设置
|
5 years ago |
|
18850253506@163.com
|
4a96cf7871
|
资料专区
|
5 years ago |
|
chenxiaojun
|
622264a820
|
订单查询更新
|
5 years ago |
|
chenxiaojun
|
73a604c815
|
更新
|
5 years ago |
|
chenxiaojun
|
41291daa3f
|
更新
|
5 years ago |
|
ELF
|
e020b09e4d
|
测试
|
5 years ago |
|
chenxiaojun
|
1cfba9a3b5
|
更新
|
5 years ago |
|
chenxiaojun
|
93b3affa75
|
混服模块 分成比例模块
|
5 years ago |
|
zhengchanglong
|
c6753aaa9e
|
推广员首页开服信息添加AJAX分页
|
5 years ago |
|
zhengchanglong
|
0b046abc68
|
推广员首页开服信息添加AJAX分页
|
5 years ago |
|
zhengchanglong
|
0a3bdd9c3e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
elf@home
|
2bc1f3c567
|
修改内容
|
5 years ago |
|
liaojinling
|
5861fb19c5
|
修改首页
|
5 years ago |
|
chenxiaojun
|
aca0919aea
|
落地页更新
|
5 years ago |
|
chenxiaojun
|
529b8882a8
|
落地页更新
|
5 years ago |
|
chenxiaojun
|
c596052b59
|
落地页更新
|
5 years ago |
|
chenxiaojun
|
61964dc848
|
落地页更新
|
5 years ago |
|
chenxiaojun
|
5a24c8a52c
|
落地页更新
|
5 years ago |
|
chenxiaojun
|
1c6297f5a8
|
落地页更新
|
5 years ago |
|
ELF
|
f27fc012d9
|
修改
|
5 years ago |
|
ELF
|
38e83a2f97
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
1931bd6197
|
修改
|
5 years ago |
tpingzhang
|
a002276baf
|
超级签关联推广ID
|
5 years ago |
|
chenxiaojun
|
0e192a2f75
|
我的游戏更新
|
5 years ago |
|
ELF
|
d29984aaeb
|
测试
|
5 years ago |
|
chenxiaojun
|
8187faf89f
|
本地分包删除
|
5 years ago |
|
zhengchanglong
|
4c5e803a8a
|
平台币充值 线下支付凭证唯一验证
|
5 years ago |
|
chenxiaojun
|
7880da772e
|
去除账户信息的‘填写支付宝账号’操作
|
5 years ago |
|
chenxiaojun
|
c0d1b6ef86
|
更新：每日概况 注册明细
|
5 years ago |
|
chenxiaojun
|
db80c32938
|
每日概况
|
5 years ago |
|
zhengchanglong
|
234151a9ce
|
平台币线下充值功能修改
|
5 years ago |
|
chenxiaojun
|
7afc18daae
|
更新：充值明细 注册明细 数据汇总 每日概况
|
5 years ago |
|
ELF
|
261f2f7294
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
71dba327c2
|
推广员后台首页消息列表添加分页
|
5 years ago |
|
ELF
|
15dc9998c0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
8bbf1f8df4
|
推广员管理后台首页修改
|
5 years ago |
|
ELF
|
9e609c9278
|
新功能
|
5 years ago |
|
zhengchanglong
|
dc65aa0766
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
5229da60f1
|
推广员管理后台首页业务
|
5 years ago |
|
elf@home
|
9f88ac7c11
|
查询功能
|
5 years ago |
|
ELF
|
bfadef687f
|
添加功能
|
5 years ago |
|
chenxiaojun
|
4b29ec1b63
|
添加游戏更新
|
5 years ago |
|
chenxiaojun
|
2003c388d1
|
落地页、游戏下架更新
|
5 years ago |
|
ELF
|
ead247849d
|
落地页QQ微信分享
|
5 years ago |
|
zhengchanglong
|
b01eb1ab90
|
新建分支测试
|
5 years ago |
|
zhengchanglong
|
8914494ccd
|
测试
|
5 years ago |
|
zhengchanglong
|
8b8df2f4f0
|
测试资源管理
|
5 years ago |
|
ELF
|
ba7511897a
|
修改
|
5 years ago |
|
ELF
|
2c4bfa283a
|
测试
|
5 years ago |
|
ELF
|
8375c8f6e7
|
测试
|
5 years ago |
|
ELF
|
74fb7a431c
|
测试
|
5 years ago |
|
ELF
|
173191c24c
|
测试
|
5 years ago |
|
ELF
|
2ffa024c4c
|
initial
|
5 years ago |