Commit Graph

4817 Commits (3423aff9dc69dfb579776641a0379789c4727b6d)
 

Author SHA1 Message Date
ELF 09d64cf9eb Merge branch 'dev' into release-1.0.1
zhengchanglong c367a965f2 Merge branch 'dev-cz' into dev
chenzhi 61f4bec085 login
zyx f00ff01f95 php版本问题bug
ELF 6bf4f26c15 Merge branch 'release-1.0.1'
ELF a1a5510bfb Merge branch 'dev' into release-1.0.1
zhengchanglong 433219c3f6 Merge branch 'dev-cz' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong 46e5b1198c 修改金额
zyx 5ef6cda158 首页开服信息区分平台bug修正
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改
zhengchanglong be9586bc5b 支付流程修改
zhengchanglong f0dc10cd60 支付流程修改
zyx 84327c1315 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx ae1986b4a8 已读日志为零时不显示
chenzhi 4539c163a4 首页alert恢复
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值
zhengchanglong e30580791e 超级前购买测试金额改为0.01
zyx dd3e56d27c Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zyx 72036e51e3 首页时间问题修正,快捷菜单10个限制添加
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev
zhengchanglong 86040c88c6 超级签购买错误信息页面
chenzhi d24fa30651 优化
tpingzhang 9ac3bf3397 测试
tpingzhang b5b43b0875 支付状态
zhengchanglong 7863eb1be3 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
zhengchanglong 5f5be5d57e 超级签充值流程修改
chenzhi 5a25e5dec1 验证码简化
chenzhi 992ef831b5 验证码简化
tpingzhang 5be8421011 旧版
tpingzhang e9f8449468 eregi php5.3 废弃
preg_match
apple 支付页面
zhengchanglong 2ba3b915b9 超级前充值金额修改
ELF 11515e87e2 Merge branch 'release-1.0.1'
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
chenzhi 95fc99816f 价格
chenzhi b112a5548f 123
ELF 2638929031 通过帐号隐藏目录
chenzhi cc78f094ad 去除blank
chenzhi e4b72a1847 新增blank页
chenzhi 629c803e87 Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
chenzhi b5484a07c6 blank
chenzhi 5236c7a6f1 优化css1
zyx 5d5879021f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
 Conflicts:
	Application/Admin/View/Giftbag/add.html
elf@home f7aaa9030e 修改bug
elf@home 4c5473a27f 修改bug
zhengchanglong f338c3d210 超级签充值金额修改
zhengchanglong c261e88932 Merge branch 'dev-cz' into dev
chenzhi f4a26b2cc2 账号验证
zhengchanglong caf5f0aff1 Merge branch 'dev-cz' into dev_zcl