zyx
|
bb3109f5d3
|
测试账号冻结状态需要的字段修改
|
5 years ago |
zhengchanglong
|
32595840c3
|
Merge branch 'dev_zcl' into dev
|
5 years ago |
chenzhi
|
a54a6b8b26
|
优化bug
|
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 |
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 |
|
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 |
|
zhengchanglong
|
604fe050d0
|
Merge branch 'dev-cz' into dev
|
5 years ago |
|
tpingzhang
|
f7ca69eba6
|
支付回调域名
|
5 years ago |
|
zhengchanglong
|
c3cb46cab0
|
超级签充值BUG修复
|
5 years ago |
|
tpingzhang
|
f05e7a3149
|
支付回调域名
|
5 years ago |
|
tpingzhang
|
ba644484e7
|
Merge branch 'serveridnull' into dev
|
5 years ago |