Commit Graph

179 Commits (855e943ccb82c7b2367496e15e87f0c385d5eea4)

Author SHA1 Message Date
“用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