sunke
|
9844d5a740
|
订单查询
|
5 years ago |
|
sunke
|
f15c6e68eb
|
注册明细，订单查询 修改等级结构
|
5 years ago |
chenzhi
|
185f0ca30e
|
优化强制更新
|
5 years ago |
|
chenzhi
|
2983f5b93f
|
新增强制更新某月份
|
5 years ago |
|
chenzhi
|
e0857168f8
|
优化接口终结
|
5 years ago |
|
chenzhi
|
cce64d646b
|
1
|
5 years ago |
zyx
|
82323a7138
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
54a01da982
|
财务管理功能完善
|
5 years ago |
|
chenzhi
|
483ccdffa2
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
4cf967fbcd
|
优化数据获取
|
5 years ago |
|
zyx
|
fe8a60093f
|
新增渠道模板提交
|
5 years ago |
|
zyx
|
d3de669837
|
'代码合并'
|
5 years ago |
jbrazz
|
8859c847f6
|
upt
|
5 years ago |
chenxiaojun
|
750a6dc596
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
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 |
zhengchanglong
|
5c8573df37
|
修改月份列表
|
5 years ago |
|
chenxiaojun
|
9c1eeb2448
|
推广后台->游戏管理->专服管理|混服管理 -- 更新
|
5 years ago |
|
chenzhi
|
06395bcb9d
|
123
|
5 years ago |
|
chenzhi
|
3b70468942
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
9803b418b9
|
优化统计
|
5 years ago |
|
ELF
|
5b62b99765
|
三级变四级
|
5 years ago |
|
chenxiaojun
|
49daffbbe4
|
推广后台->数据管理->每日概况|数据汇总->合计更新
|
5 years ago |
|
chenxiaojun
|
9169a2084b
|
推广后台->数据管理->每日概况|数据汇总->合计更新
|
5 years ago |
|
chenxiaojun
|
3be42d0186
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
|
chenxiaojun
|
e247c7dedf
|
管理后台->统计->新增->其他注册统计|官方渠道统计
|
5 years ago |
|
zyx
|
24cdd7086b
|
'合并代码'
|
5 years ago |
|
chenzhi
|
b41fbb05b7
|
123
|
5 years ago |
|
sunke
|
021673f657
|
图片上传补充
|
5 years ago |
|
chenzhi
|
50efce9315
|
更新spen root
|
5 years ago |
|
chenzhi
|
f6f47748bc
|
优化时间戳
|
5 years ago |
|
chenxiaojun
|
28969fd024
|
管理后台->游戏管理->合作方管理->批量删除更新
|
5 years ago |
|
chenxiaojun
|
19f10c574d
|
管理后台->游戏管理->合作方管理->批量删除更新
|
5 years ago |
|
chenzhi
|
b3f2069e94
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
d273c5af27
|
spendAPI优化
|
5 years ago |
|
sunke
|
692a1bcc11
|
webuploader插件
|
5 years ago |
|
zyx
|
c65aa8d69a
|
财务管理bug修正，导出功能，合作方列表添加
|
5 years ago |
|
zyx
|
224c745ba8
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
b39efb2d18
|
同步代码
|
5 years ago |
|
chenzhi
|
1783cb0b71
|
恢复
|
5 years ago |
|
chenzhi
|
28e15792e4
|
123
|
5 years ago |
|
chenzhi
|
d708a6302f
|
123
|
5 years ago |
|
zyx
|
abeb6acde9
|
git测试
|
5 years ago |
|
zyx
|
2c4e20911e
|
Merge remote-tracking branch 'origin/dev_zyx' into dev_zyx
# Conflicts:
# Application/Admin/Controller/FinanceController.class.php
|
5 years ago |
|
zyx
|
882041495e
|
git测试
|
5 years ago |
|
chenzhi
|
bee4544f70
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
c2c92b4c95
|
xiuag
|
5 years ago |
|
zyx
|
bedd841eda
|
财务管理功能添加
|
5 years ago |
|
zyx
|
81c137a1bc
|
财务管理功能添加
|
5 years ago |
|
chenzhi
|
3d38e78160
|
123
|
5 years ago |
|
zyx
|
112316c395
|
财务管理功能添加
|
5 years ago |
|
chenxiaojun
|
20c8165888
|
管理后台->游戏管理->合作方管理->批量删除bug修改
|
5 years ago |
|
chenxiaojun
|
0963c69f4d
|
管理后台->游戏管理->合作方管理->新增批量删除
|
5 years ago |
|
chenxiaojun
|
41d45995b0
|
管理后台->游戏管理->合作方管理更新
|
5 years ago |
|
chenxiaojun
|
dd10535a07
|
管理后台->游戏管理->新增合作方管理
|
5 years ago |
|
chenzhi
|
a3d0c81d4b
|
修改
|
5 years ago |
|
chenzhi
|
f5ac904a49
|
优化扶持
|
5 years ago |
|
zyx
|
d7c9744872
|
扶持号时间格式修改
|
5 years ago |
|
zyx
|
ae9a01f325
|
管理后台代码回滚
|
5 years ago |
|
zyx
|
8b4bb3baab
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
1ce876c39f
|
管理后台测试资源bug修正
|
5 years ago |
|
chenxiaojun
|
fbe8a764f1
|
管理后台->删除溪谷入口
|
5 years ago |
|
chenxiaojun
|
a04f291471
|
管理后台->删除溪谷入口
|
5 years ago |
|
zyx
|
96effb3525
|
管理后台测试资源bug修正
|
5 years ago |
|
zyx
|
5c435bad74
|
公用文件添加排序
|
5 years ago |
|
zyx
|
ecc93af47c
|
测试资源排序添加
|
5 years ago |
|
ELF
|
6e1a768721
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
e4f1ed99f8
|
修改后台登录页
|
5 years ago |
Your Name
|
6cb3a9ad75
|
SDK菜单
|
5 years ago |
|
Your Name
|
c1a9c3918e
|
SDK菜单
|
5 years ago |
|
chenxiaojun
|
032e5de877
|
推广平台->注册明细->bug修复
|
5 years ago |
|
chenxiaojun
|
8b2e384fb6
|
推广平台->注册明细->bug修复
|
5 years ago |
|
zyx
|
7e37560efe
|
公告计数负数问题改正
|
5 years ago |
|
zyx
|
56deca114f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
2f2158dbe0
|
详情页公告提示修正
|
5 years ago |
|
chenxiaojun
|
1ec9c156cf
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
|
chenxiaojun
|
27665e5b14
|
推广平台->数据汇总|每日概况->bug修复
|
5 years ago |
|
ELF
|
6df44afb16
|
功能隐藏
|
5 years ago |
|
zyx
|
b0411e3704
|
详情页公告提示修正
|
5 years ago |
|
zyx
|
0ffbc8aff9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
048e37fdd7
|
详情页公告提示修正
|
5 years ago |
|
ELF
|
437909d53a
|
测试
|
5 years ago |
|
chenxiaojun
|
37188cb085
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
36b9b51817
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
zyx
|
95731bba09
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
387f729773
|
首页公告提示修正
|
5 years ago |
|
ELF
|
674dcc9e55
|
Merge branch 'hotfix/pc' into dev
|
5 years ago |
|
ELF
|
390974a557
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
4917458099
|
Merge branch 'hotfix/query' into dev
|
5 years ago |
|
ELF
|
c6a52282d5
|
修改bug
|
5 years ago |
|
zyx
|
5637b496e9
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
36de2e17c5
|
扶持号js逻辑修正
|
5 years ago |
|
zhengchanglong
|
954928b7f2
|
推广员首页优化
|
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
|
9ba9710670
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
af06ea8364
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
155df3336d
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
c3c2f91c30
|
推广平台->数据汇总|每日概况|订单查询|注册明细->检索调整
|
5 years ago |
|
chenxiaojun
|
3226b01dfb
|
推广平台->数据汇总|每日概况->列表名词解释调整
|
5 years ago |
|
chenxiaojun
|
cf5e6c849b
|
推广平台->数据汇总|每日概况->列表名词解释调整
|
5 years ago |
|
chenxiaojun
|
456c4c925e
|
手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
|
5 years ago |
|
chenxiaojun
|
63b27d8c1d
|
手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
|
5 years ago |
|
zyx
|
4a23e1dd8a
|
日志管理bug修复
|
5 years ago |
|
zyx
|
a16c77181c
|
优化首页计算代码
|
5 years ago |
|
zyx
|
7ead67f8cb
|
快捷图标代码修正
|
5 years ago |
|
zyx
|
c461190682
|
首页用户注册充值信息修正,昨日注册用户
|
5 years ago |
|
zyx
|
219596843b
|
首页用户注册充值信息修正,昨日注册用户
|
5 years ago |
|
zyx
|
c6da6fb705
|
首页用户注册充值信息修正
|
5 years ago |
|
jbrazz
|
5527b0bc31
|
Merge branch 'hotfix/promote_query' into dev
|
5 years ago |
|
jbrazz
|
736c0fd432
|
fix
|
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
|
9500fbbc80
|
用户手机号注册规则修改
|
5 years ago |
|
chenxiaojun
|
c4f7a928f9
|
用户手机号注册规则修改
|
5 years ago |
|
zhengchanglong
|
5dbfb59f3f
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
a5899444a7
|
Merge branch 'dev_zyx' into dev
# Conflicts:
# Application/Admin/Controller/TestResourceController.class.php
|
5 years ago |
|
chenzhi
|
2f124bffbb
|
coin_num
|
5 years ago |
|
chenxiaojun
|
df3c2d823c
|
推广员后台->2推广员开权限
|
5 years ago |
|
chenxiaojun
|
cd29b17e03
|
推广员后台->2推广员开权限
|
5 years ago |
|
chenxiaojun
|
e92790a89f
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
5 years ago |
|
chenxiaojun
|
d56bebdaa6
|
推广员后台->订单查询|注册明细->玩家账号检索修改为完整查询|玩家账号列表添加玩家ID显示
|
5 years ago |
|
chenzhi
|
751ab77dc9
|
Merge branch 'dev_zcl' of 47.111.118.107:/srv/git/platform into dev_zcl
|
5 years ago |
|
chenzhi
|
e3d9d382d9
|
新增线下充值审核
|
5 years ago |
|
zyx
|
0112a0151c
|
首页用户注册充值信息修正
|
5 years ago |
|
zhengchanglong
|
c9fead3389
|
修改 tab_coin_pay_order 表字段
|
5 years ago |
|
zyx
|
44bb1c3e19
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
0a9dbe6a78
|
管理后台菜单bug修复
|
5 years ago |
|
chenxiaojun
|
16bb3cfc13
|
PC官网->平台币充值简介样式修改
|
5 years ago |
|
chenxiaojun
|
8db91a21ee
|
PC官网->平台币充值简介样式修改
|
5 years ago |
|
chenxiaojun
|
c7979cada0
|
PC官网->平台币充值简介样式修改
|
5 years ago |
|
chenxiaojun
|
82c5bd30da
|
PC/手机官网->平台币充值简介修改
|
5 years ago |
|
zyx
|
2a52aa42ae
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
ba6fc9634b
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
c8f101f40c
|
管理后台添加测试资源
|
5 years ago |
|
zhengchanglong
|
732777305e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
6154654a35
|
SDK登录BUG修复
|
5 years ago |
|
chenxiaojun
|
32ba151ac5
|
手机官网->平台币充值简介修改
|
5 years ago |
|
chenxiaojun
|
85839b7e94
|
手机官网->平台币充值简介修改
|
5 years ago |
|
chenxiaojun
|
ecf43d6e7a
|
PC官网->平台币充值简介修改
|
5 years ago |
|
chenxiaojun
|
66e011e101
|
PC官网->平台币充值简介修改
|
5 years ago |
tpingzhang
|
29883f60ac
|
修改重复插入问题 增加唯一索引 记录重复插入异常
|
5 years ago |
|
jbrazz
|
c1ab4e789c
|
Merge branch 'featrue/fix_bug' into dev
|
5 years ago |
|
jbrazz
|
9bc5127223
|
upt
|
5 years ago |
|
zhengchanglong
|
4b2e492340
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
dee6c2e60d
|
扶持号SDK登录安全防护业务
|
5 years ago |