Commit Graph

96 Commits (5ba92f1e826cce577e998dfbeb2f3b9097574577)

Author SHA1 Message Date
chenzhi 5ba92f1e82 实名认证3.0
chenzhi dbb410103d 实名认证2.0
chenzhi d4ae936ca4 实名认证1.0
chenzhi 086a364f41 移动官网实名认证
chenxiaojun 1707d4d162 ios13.1
chenzhi 98249f462a 优化官网支付
liuweiwen ffadabf078 落地页
chenzhi fb0170048f ssg回调测试结束
chenzhi db6558bc76 ssg打印参数
zhengchanglong 87ee527a01 平台币充值费率修改
zhengchanglong 1ae5fa0f20 Merge branch 'dev_lww' into dev
“用lww 0168a52b68 手机官网-页面更改
zhengyongxing be09214f7a 登录sdk主页跳转
zhengyongxing 479a7537a8 登录sdk主页跳转
zhengyongxing ee40286108 登录sdk主页跳转
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 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
chenzhi 39e682e69e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengchanglong 2e5973cf3b 删除冗余文件
zyx 2b012aad08 我的礼包界面功能完善
chenzhi 5d454e5429 我的游戏
chenzhi 9764d361f1 123
chenzhi 44e2623efe 123
chenzhi 737e7786e8 移动官网手机及账号注册
dev_lww c94dc6b3a5 手机官网
“用lww fa69e8ba83 手机端官网修改
chenzhi 02151093af 修改
chenxiaojun c4f7a928f9 用户手机号注册规则修改
chenzhi a54a6b8b26 优化bug
zhengchanglong 8af781b9b4 修改超级签充值金额
zhengchanglong b46921447a 微信支付回跳修改
zhengchanglong 941303065d Merge branch 'dev_zcl' into dev
zhengchanglong eea9cc772c 微信支付回跳修改
zhengchanglong 58f489199c 删除冗余代码
zhengchanglong fe70974a54 修改超级前充值测试金额