Commit Graph

201 Commits (71df93a12fce7450036c31ab637c6b4feb16d481)

Author SHA1 Message Date
yulingwei 1fcf563731 Merge branch 'hotfix/add_bans_type' into dev
chenxiaojun 820f80f066 ios13.1
chenxiaojun acf2ff1310 ios13.1
chenxiaojun 1fc9f3b6b2 手机注册
chenxiaojun ce01823c6b 日志
chenxiaojun ca8c4e331f 手机注册
chenxiaojun f9b9694a4a 日志
chenxiaojun 1e534d8c5e 手机注册
chenxiaojun 28cd4aeeda 日志
chenxiaojun 676ab5dcd2 手机注册
chenxiaojun c384a88c48 手机注册
chenxiaojun 3754e5504a 手机注册
chenzhi 98249f462a 优化官网支付
liuweiwen dd43bed0ee Merge remote-tracking branch 'origin/dev' into dev
liuweiwen ffadabf078 落地页
chenzhi 5d178571cc 优化官网支付显示
chenzhi b9ab5330c0 优化官网支付缩放问题
chenzhi 15ce00396f 优化官网支付
liuweiwen b61fdf2e97 手机官网绑定手机页面发送验证码样式调整
chenzhi fb0170048f ssg回调测试结束
chenzhi db6558bc76 ssg打印参数
zhengchanglong 87ee527a01 平台币充值费率修改
“用lww 1b2a9c7f9b pc官网修改
“用lww 6e1db7caa6 Merge remote-tracking branch 'origin/dev' into dev_lww
“用lww 0168a52b68 手机官网-页面更改
zhengyongxing 3cabc6ab95 注册修改
zhengyongxing 6c2c048952 普通注册密码规则修改
zhengyongxing be09214f7a 登录sdk主页跳转
zhengyongxing 479a7537a8 登录sdk主页跳转
zhengyongxing ee40286108 登录sdk主页跳转
zhengchanglong 4120344388 超级签下载页无礼包不显示礼包特权
zhengchanglong 7265a2961e 超级签页面UI修改
zhengchanglong 1ed48003ac 超级签充值BUG修复
zhengyongxing 66776fef98 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 89b67c06a4 登录sdk,跳转至购买超级签,无需重新登陆
“用lww 019ae56f40 手机官网-落地页
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
chenzhi 4c2931c8d3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi e986b5de58 123
zhengyongxing 8e8e59c61c 登录sdk,跳转至购买超级签,无需重新登陆
zhengyongxing 4e06af0acf 登录sdk,跳转至购买超级签,无需重新登陆
zhengchanglong 286febdff6 Merge branch 'dev_lww' into dev
chenzhi 90253ddcf6 优化回调
zhengchanglong 5d9d6542ad Merge branch 'dev_lww' into dev_zcl
“用lww 8076110f31 手机注册-修改账号密码验证规则
“用lww ba506916d0 复制兑换码提示框修改
zhengchanglong 65014bb66a Merge branch 'dev_lww' into dev_zcl
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
“用lww c1b5569213 手机官网-手机注册与账号注册修改,昵称自动生成