165 Commits (8af46f08c21746e1f381fe217d01aa63bd669dab)

Author SHA1 Message Date
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
5 years ago
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
5 years ago
chenzhi 4c2931c8d3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev 5 years ago
chenzhi e986b5de58 123 5 years ago
zhengyongxing 8e8e59c61c 登录sdk,跳转至购买超级签,无需重新登陆 5 years ago
zhengyongxing 4e06af0acf 登录sdk,跳转至购买超级签,无需重新登陆 5 years ago
zhengchanglong 286febdff6 Merge branch 'dev_lww' into dev 5 years ago
chenzhi 90253ddcf6 优化回调 5 years ago
zhengchanglong 5d9d6542ad Merge branch 'dev_lww' into dev_zcl 5 years ago
“用lww 8076110f31 手机注册-修改账号密码验证规则 5 years ago
“用lww ba506916d0 复制兑换码提示框修改 5 years ago
zhengchanglong 65014bb66a Merge branch 'dev_lww' into dev_zcl 5 years ago
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Data/update.sql
5 years ago
“用lww c1b5569213 手机官网-手机注册与账号注册修改,昵称自动生成 5 years ago
zhengchanglong aa8e612ead 超级签测试金额修改 5 years ago
“用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
5 years ago
“用lww 176aa70c8d 去除vbs代码 5 years ago
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz 5 years ago
zhengchanglong 5a56b41330 Merge branch 'feature/promote' into dev 5 years ago
zyx cbe9117e3d 充值界面bug修复 5 years ago
zhengchanglong 2e5973cf3b 删除冗余文件 5 years ago
zyx 2b012aad08 我的礼包界面功能完善 5 years ago
zyx 0d090ded9b 礼包界面 5 years ago
chenzhi 5d454e5429 我的游戏 5 years ago
chenzhi ad6eb5b0d7 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi bf728438d7 优化 5 years ago
zyx 8f0ae7dd8b 充值界面模板嵌套 5 years ago
chenzhi 9764d361f1 123 5 years ago
chenzhi fbf8a76ec9 123 5 years ago
chenzhi 40001277bc login 5 years ago
chenzhi 0cd21feb28 Merge branch 'feature/promote' of 47.111.118.107:/srv/git/platform into feature/promote 5 years ago
chenzhi 44e2623efe 123 5 years ago
chenzhi 451ea9588e base 5 years ago
chenzhi 4b7d9202b7 123 5 years ago
zyx a0e27f9e7a 覆盖vbs脚本 5 years ago
chenzhi c3196b7be0 123 5 years ago
chenzhi b52eee941b 优化 5 years ago
chenzhi 3098558fe0 lww代码合并 5 years ago
chenzhi 4c2e1f294e 去vs 5 years ago
chenzhi 68eead8d31 123 5 years ago
chenzhi 63c5421d49 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww 5 years ago
chenzhi a28acf200d 个人中心 5 years ago
zhengchanglong 5af7ab4e5e Merge remote-tracking branch 'origin/dev_lww' into dev_lww 5 years ago
zhengchanglong d9e75cd4c0 充值 5 years ago
chenzhi 71c1ad1437 Merge branch 'dev_lww' of 47.111.118.107:/srv/git/platform into dev_lww 5 years ago
chenzhi 737e7786e8 移动官网手机及账号注册 5 years ago
zhengchanglong 0b188b12bb 充值 5 years ago
chenzhi 2e610bc245 优化手机注册1 5 years ago
chenzhi 8ad35726fb 账号注册ok 5 years ago
chenzhi ddad6f6bf4 优化注册 5 years ago