Commit Graph

250 Commits (1ccbd03a0fb3b451374d78d9f641e213e5a8931f)

Author SHA1 Message Date
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 手机官网-手机注册与账号注册修改,昵称自动生成
zhengchanglong aa8e612ead 超级签测试金额修改
“用lww 8120d41204 Merge remote-tracking branch 'origin/dev' into dev_lww
# Conflicts:
#	Application/Common/Conf/seo_media_config.php
#	Application/Mobile/View/Index/introduce.html
#	Application/Mobile/View/User/login.html
#	Application/Mobile/View/User/recharge.html
#	Application/Mobile/View/User/step1.html
#	Application/Mobile/View/User/userset.html
#	Public/Mobile/css/common-cz.css
#	Public/Mobile/js/home.js
“用lww 176aa70c8d 去除vbs代码
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev
zyx cbe9117e3d 充值界面bug修复
zhengchanglong 2e5973cf3b 删除冗余文件
zyx 2b012aad08 我的礼包界面功能完善
zyx 0d090ded9b 礼包界面
chenzhi 5d454e5429 我的游戏
chenzhi ad6eb5b0d7 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi bf728438d7 优化
zyx 8f0ae7dd8b 充值界面模板嵌套
chenzhi 9764d361f1 123
chenzhi fbf8a76ec9 123
chenzhi 40001277bc login
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote
chenzhi 44e2623efe 123
chenzhi 451ea9588e base
chenzhi 4b7d9202b7 123
zyx a0e27f9e7a 覆盖vbs脚本
chenzhi c3196b7be0 123
chenzhi b52eee941b 优化
chenzhi 3098558fe0 lww代码合并
chenzhi 4c2e1f294e 去vs
chenzhi 68eead8d31 123
chenzhi 63c5421d49 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi a28acf200d 个人中心
zhengchanglong 5af7ab4e5e Merge remote-tracking branch 'origin/dev_lww' into dev_lww
zhengchanglong d9e75cd4c0 充值
chenzhi 71c1ad1437 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww
chenzhi 737e7786e8 移动官网手机及账号注册
zhengchanglong 0b188b12bb 充值
chenzhi 2e610bc245 优化手机注册1
chenzhi 8ad35726fb 账号注册ok
chenzhi ddad6f6bf4 优化注册
dev_lww c94dc6b3a5 手机官网
dev_lww 584a228fb4 手机官网
“用lww fa69e8ba83 手机端官网修改
“用lww 0d83da8446 手机官网->首页->解决首页底部菜单由于引入bootstrap导致和其他页面不一致
“用lww 6d5bb2a9a1 手机官网-底部菜单高亮bug修复
chenzhi 02151093af 修改
chenxiaojun 63b27d8c1d 手机官网->(产品服务->去除搜索框和推荐|单张不轮播)(我的->新增超级签路口)
chenxiaojun c4f7a928f9 用户手机号注册规则修改
chenxiaojun 32ba151ac5 手机官网->平台币充值简介修改
chenxiaojun 85839b7e94 手机官网->平台币充值简介修改
chenzhi 5d7385e77a 登陆bug优化
chenzhi a54a6b8b26 优化bug
zhengchanglong 8af781b9b4 修改超级签充值金额
chenzhi 4dba7bcfeb 修复严重码bug
zhengchanglong d2d7dec38a 超级签页面title修改