chenzhi
|
a1f22ad756
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
2e4067e1de
|
测试
|
5 years ago |
zhengchanglong
|
3da91ecb0f
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
zyx
|
e8fc252599
|
组长统计搜索bug修正
|
5 years ago |
|
zhengchanglong
|
cd70dd7dd8
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
62311eb40d
|
月结统计bug修正
|
5 years ago |
|
zyx
|
515ffa25b9
|
月结统计bug修正
|
5 years ago |
|
chenzhi
|
3983a086ac
|
优化生成数据
|
5 years ago |
|
chenzhi
|
8796458ead
|
聚合新增月份
|
5 years ago |
chenxiaojun
|
381a2e0a67
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
chenxiaojun
|
bf7c353692
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
 ELF
|
00966dc9e4
|
修改
|
5 years ago |
Your Name
|
dce059abe5
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
7466b90d13
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
ed3ce2b4b5
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
c3762b420c
|
SDK菜单修改
|
5 years ago |
|
Your Name
|
2569850407
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
c90c397dd9
|
SDK菜单修改
|
5 years ago |
|
chenzhi
|
af05f08689
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
chenzhi
|
4f7077a3ec
|
10311331
|
5 years ago |
|
ELF
|
22dcca566b
|
修改
|
5 years ago |
|
zyx
|
f16bf0b606
|
月结统计筛选列表逻辑修正
|
5 years ago |
|
zyx
|
2adc07ec4a
|
组长月结统计页面文字修正
|
5 years ago |
|
zyx
|
4803bd4a1b
|
组长月结统计页面修正
|
5 years ago |
|
chenxiaojun
|
a14b18f54f
|
推广后台->数据管理->每日概况|数据汇总 -- 更新
|
5 years ago |
|
zhengchanglong
|
e69bc5f459
|
Merge branch 'dev_zyx' into dev
|
5 years ago |
|
zyx
|
63dff98660
|
月结统计导出bug修正
|
5 years ago |
|
zyx
|
1d59721ee2
|
月结统计导出bug修正
|
5 years ago |
|
zyx
|
b42f621dbc
|
财务管理功能提交
|
5 years ago |
|
zyx
|
da1686fe14
|
Merge branch 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
ee5dccfaeb
|
财务管理功能代码完善
|
5 years ago |
jbrazz
|
b78c6228b0
|
Merge branch 'hotfix/fix_bug' into dev
|
5 years ago |
|
jbrazz
|
d4c7727426
|
upt
|
5 years ago |
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 |
|
jbrazz
|
459b722c1c
|
upt
|
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 |
|
ELF
|
37ef999710
|
修改
|
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 |
|
chenxiaojun
|
641dcd5b65
|
推广员后台->每日概况->游戏检索bug
|
5 years ago |
|
chenxiaojun
|
db424fde84
|
推广员后台->每日概况->游戏检索bug
|
5 years ago |
|
jbrazz
|
953564d291
|
upt
|
5 years ago |
|
zyx
|
24d5bf34c7
|
添加站点功能修改快捷菜单的图标
|
5 years ago |
|
ELF
|
b7964e19d0
|
修改bug
|
5 years ago |
|
ELF
|
4d0359aaba
|
修改bug
|
5 years ago |
|
ELF
|
cd90807d58
|
Merge branch 'hotfix/promote' into dev
|
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
|
b8f93f74c6
|
隐藏推广员系统目录
|
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 |
|
zhengchanglong
|
ec07cedc5e
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
chenzhi
|
5d7385e77a
|
登陆bug优化
|
5 years ago |
|
zyx
|
e23943cfdb
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
bb3109f5d3
|
测试账号冻结状态需要的字段修改
|
5 years ago |
|
zhengchanglong
|
32595840c3
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
chenzhi
|
a54a6b8b26
|
优化bug
|
5 years ago |
|
ELF
|
53e0395674
|
修改
|
5 years ago |
|
zyx
|
5ffc0bf9b0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
560e13af03
|
更改文章详情的后退按钮的样式
|
5 years ago |
|
ELF
|
cdfbe61fa2
|
Merge branch 'hotfix/pc' into dev
|
5 years ago |
|
chenxiaojun
|
bb23bb2a03
|
推广员后台->检索bug修复
|
5 years ago |
|
chenxiaojun
|
a5873caf8d
|
推广员后台->检索bug修复
|
5 years ago |
|
jbrazz
|
2d94c4a539
|
fix
|
5 years ago |
|
chenxiaojun
|
1ba358fabb
|
管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
|
5 years ago |
|
chenxiaojun
|
c322f6ec7e
|
管理后台->新增混服管理查询 推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type
|
5 years ago |
|
zyx
|
3c1b1673f2
|
测试资源申请页面检索数据修正，检索都统一改为模糊查询，文章详情页隐藏首页，添加返回按钮
|
5 years ago |
|
ELF
|
608d24b732
|
开放测试帐号
|
5 years ago |
|
ELF
|
554793d95e
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
ELF
|
c888915daa
|
Merge branch 'hotfix/query' into dev
|
5 years ago |
|
ELF
|
ece317d6fa
|
修改bug
|
5 years ago |
|
chenxiaojun
|
a91c372a3b
|
修复关联游戏混服选项bug
|
5 years ago |
|
chenxiaojun
|
76bd557efd
|
修复关联游戏混服选项bug
|
5 years ago |
|
ELF
|
bcc34cbd0c
|
打包逻辑重构
|
5 years ago |
|
Your Name
|
51154dd533
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
22e7866644
|
SDK菜单添加
|
5 years ago |
|
zhengchanglong
|
8af781b9b4
|
修改超级签充值金额
|
5 years ago |
|
chenzhi
|
4dba7bcfeb
|
修复严重码bug
|
5 years ago |
|
Your Name
|
45ff545256
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
f1b5a2257d
|
SDK用户菜单-修改
|
5 years ago |
|
zhengchanglong
|
d2d7dec38a
|
超级签页面title修改
|
5 years ago |
|
zhengchanglong
|
b46921447a
|
微信支付回跳修改
|
5 years ago |
|
zhengchanglong
|
68c9c492c5
|
微信支付回跳修改
|
5 years ago |
|
zhengchanglong
|
941303065d
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
eea9cc772c
|
微信支付回跳修改
|
5 years ago |
|
zyx
|
97ccd1d57a
|
解决游戏公告无法发出的问题
|
5 years ago |
|
zyx
|
91b773d974
|
开服信息，平台显示修正
|
5 years ago |
|
zyx
|
7e27d35a97
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
9eb36bd81f
|
组长账号显示测试资源
|
5 years ago |
|
ELF
|
69a6f9612f
|
打包优化
|
5 years ago |
|
chenxiaojun
|
dbf0f67d19
|
官网->商务合作公司地址修改
|
5 years ago |
|
chenxiaojun
|
7d018b47af
|
官网->商务合作公司地址修改
|
5 years ago |
|
chenxiaojun
|
165d9dad62
|
官网->商务合作公司地址修改
|
5 years ago |
|
zyx
|
ccf7bfc65a
|
首页开服信息图标大小修改
|
5 years ago |
|
zhengchanglong
|
58f489199c
|
删除冗余代码
|
5 years ago |
|
Your Name
|
032b2b5197
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
b253d23ae3
|
SDK用户菜单字段名修改
|
5 years ago |
|
zyx
|
595112e6b5
|
快捷菜单关闭回调事件添加
|
5 years ago |
|
Your Name
|
277eea047d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
Your Name
|
971906dd29
|
SDK用户菜单
|
5 years ago |
|
zhengchanglong
|
4c04cdc8f6
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
745c034d3e
|
去除alert 弹框
|
5 years ago |
|
Your Name
|
2eff781166
|
SDK用户菜单
|
5 years ago |
|
Your Name
|
118340fa33
|
SDK用户菜单
|
5 years ago |
|
zhengchanglong
|
fe70974a54
|
修改超级前充值测试金额
|
5 years ago |
|
zhengchanglong
|
f9b9106ce5
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
8de8da4f38
|
超级签充值业务迁移mobile目录下
|
5 years ago |
|
chenxiaojun
|
f8206e3f7d
|
ios13.1绑定提示修改
|
5 years ago |
|
chenxiaojun
|
7d8f7b53e6
|
ios13.1绑定提示修改 下级推广员查询bug修复
|
5 years ago |
|
chenxiaojun
|
a29d153581
|
ios13.1绑定提示修改
|
5 years ago |
|
chenxiaojun
|
cff2dc911a
|
获取下级推广员bug修改
|
5 years ago |
|
zyx
|
6f7c814051
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
2c2446d38b
|
将首页开服信息icon改成80*80
|
5 years ago |
|
zyx
|
aeab84e426
|
将首页开服信息icon改成80*80
|
5 years ago |
|
chenxiaojun
|
fb19592de2
|
ios13.1绑定
|
5 years ago |
|
chenxiaojun
|
cdc7e284da
|
ios13.1绑定bug修复
|
5 years ago |
|
chenxiaojun
|
ea3e0015bf
|
ios13.1绑定
|
5 years ago |
|
zyx
|
a985da5c44
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
|
5 years ago |
|
zyx
|
66ced8930e
|
首页bug解决
|
5 years ago |
|
zhengchanglong
|
5889b69b71
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
0b70159a66
|
123
|
5 years ago |
|
chenzhi
|
ba4219dc64
|
更新忘记密码
|
5 years ago |
|
zhengchanglong
|
8a7bcb13d3
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
zhengchanglong
|
ee6e3a8624
|
修改测试金额
|
5 years ago |
|
zhengchanglong
|
2b8cbf0021
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
|
chenzhi
|
5f4dca0a77
|
1018修改
|
5 years ago |
|
elf@home
|
e94675c93c
|
修改
|
5 years ago |
|
elf@home
|
848e07238d
|
修改
|
5 years ago |
|
ELF
|
9b42942900
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zhengchanglong
|
ae911f62a0
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
5805880e0c
|
更新推广
|
5 years ago |
|
ELF
|
24b1441632
|
修改超级签链接
|
5 years ago |
|
zhengchanglong
|
c367a965f2
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
61f4bec085
|
login
|
5 years ago |
|
zyx
|
f00ff01f95
|
php版本问题bug
|
5 years ago |
|
zhengchanglong
|
433219c3f6
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
2e8f7ba410
|
更新
|
5 years ago |
|
zhengchanglong
|
46e5b1198c
|
修改金额
|
5 years ago |
|
zyx
|
5ef6cda158
|
首页开服信息区分平台bug修正
|
5 years ago |
|
zhengchanglong
|
6a3b3cd114
|
超级签网页端充值地址修改
|
5 years ago |
|
zhengchanglong
|
be9586bc5b
|
支付流程修改
|
5 years ago |
|
zhengchanglong
|
f0dc10cd60
|
支付流程修改
|
5 years ago |
|
zyx
|
84327c1315
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
ae1986b4a8
|
已读日志为零时不显示
|
5 years ago |
|
chenzhi
|
4539c163a4
|
首页alert恢复
|
5 years ago |
|
tpingzhang
|
464e9f244b
|
正常充值不需要验证spend表 是否重复充值
|
5 years ago |
|
zhengchanglong
|
e30580791e
|
超级前购买测试金额改为0.01
|
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 |
|
zhengchanglong
|
4367052f77
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
zhengchanglong
|
86040c88c6
|
超级签购买错误信息页面
|
5 years ago |
|
chenzhi
|
d24fa30651
|
优化
|
5 years ago |
|
tpingzhang
|
9ac3bf3397
|
测试
|
5 years ago |
|
tpingzhang
|
b5b43b0875
|
支付状态
|
5 years ago |
|
zhengchanglong
|
7863eb1be3
|
Merge branch 'dev-cz' into dev_zcl
# Conflicts:
# Public/Sdk/css/ssg/common.css
# Public/Sdk/images/ssg/blank/blankimg.png
|
5 years ago |
|
zhengchanglong
|
5f5be5d57e
|
超级签充值流程修改
|
5 years ago |
|
chenzhi
|
5a25e5dec1
|
验证码简化
|
5 years ago |
|
chenzhi
|
992ef831b5
|
验证码简化
|
5 years ago |
|
tpingzhang
|
5be8421011
|
旧版
|
5 years ago |
|
tpingzhang
|
e9f8449468
|
eregi php5.3 废弃
preg_match
apple 支付页面
|
5 years ago |
|
zhengchanglong
|
2ba3b915b9
|
超级前充值金额修改
|
5 years ago |
|
zhengchanglong
|
e2fc2e5128
|
修改超级签充值流程
|
5 years ago |
|
chenzhi
|
ca79a3f627
|
css ok
|
5 years ago |
|
chenzhi
|
95fc99816f
|
价格
|
5 years ago |
|
chenzhi
|
b112a5548f
|
123
|
5 years ago |
|
ELF
|
2638929031
|
通过帐号隐藏目录
|
5 years ago |
|
chenzhi
|
cc78f094ad
|
去除blank
|
5 years ago |
|
chenzhi
|
e4b72a1847
|
新增blank页
|
5 years ago |
|
chenzhi
|
629c803e87
|
Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
|
5 years ago |
|
chenzhi
|
b5484a07c6
|
blank
|
5 years ago |
|
chenzhi
|
5236c7a6f1
|
优化css1
|
5 years ago |
|
zyx
|
5d5879021f
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
Conflicts:
Application/Admin/View/Giftbag/add.html
|
5 years ago |
|
elf@home
|
f7aaa9030e
|
修改bug
|
5 years ago |
|
elf@home
|
4c5473a27f
|
修改bug
|
5 years ago |
|
zhengchanglong
|
f338c3d210
|
超级签充值金额修改
|
5 years ago |
|
zhengchanglong
|
c261e88932
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
f4a26b2cc2
|
账号验证
|
5 years ago |
|
zhengchanglong
|
caf5f0aff1
|
Merge branch 'dev-cz' into dev_zcl
|
5 years ago |
|
chenzhi
|
3757281985
|
弹窗
|
5 years ago |
|
chenzhi
|
0d50d94a42
|
123456
|
5 years ago |
|
chenzhi
|
e826b22d56
|
1234
|
5 years ago |
|
chenzhi
|
f87853a9f7
|
123
|
5 years ago |
|
chenzhi
|
8f5f4ba9bc
|
礼包领取
|
5 years ago |
|
zhengchanglong
|
f80ebc8583
|
修改超级签名BUG
|
5 years ago |
|
chenzhi
|
5635519c17
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
|
5 years ago |
|
zhengchanglong
|
0a62987665
|
修改超级签名BUG
|
5 years ago |
|
zhengchanglong
|
e3315ca26e
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zyx
|
0dbbfb763d
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
zyx
|
90665c3dc5
|
新增礼包bug修正
|
5 years ago |
|
chenzhi
|
a544978349
|
新增密码复杂度验证
|
5 years ago |
|
zhengchanglong
|
7a1b537d98
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
chenzhi
|
4441f2844c
|
bug3
|
5 years ago |
|
chenzhi
|
2693172cda
|
修复3
|
5 years ago |
|
chenzhi
|
b69ca03856
|
bug修复2
|
5 years ago |
|
ELF
|
145144ba51
|
解决冲突
|
5 years ago |
|
ELF
|
4a403076b9
|
解决冲突
|
5 years ago |
|
ELF
|
983b707d69
|
修改手机端显示
|
5 years ago |
|
zhengchanglong
|
a550435883
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
zhengchanglong
|
9cebace169
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
tpingzhang
|
99f4d30af0
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
tpingzhang
|
41075f8abc
|
Merge branch 'serveridnull' into dev
|
5 years ago |
|
chenzhi
|
b8945e8655
|
修复bug
|
5 years ago |