Commit Graph

41 Commits (51d1d730e1c3b1b6703d296676f6210d1a89756e)

Author SHA1 Message Date
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
zhengchanglong 433219c3f6 Merge branch 'dev-cz' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev
zhengchanglong 86040c88c6 超级签购买错误信息页面
zhengchanglong 7863eb1be3 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Public/Sdk/css/ssg/common.css
#	Public/Sdk/images/ssg/blank/blankimg.png
tpingzhang e9f8449468 eregi php5.3 废弃
preg_match
apple 支付页面
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
chenzhi e4b72a1847 新增blank页
zhengchanglong caf5f0aff1 Merge branch 'dev-cz' into dev_zcl
chenzhi 8f5f4ba9bc 礼包领取
zhengchanglong f80ebc8583 修改超级签名BUG
chenzhi b8945e8655 修复bug
chenzhi b01ff154ea 新增礼包
chenzhi 953cb6b988 流程样式
chenzhi 712498aff9 下载
chenzhi 0669d15e3e Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev-cz
chenzhi 4ac6442777 更新
zhengchanglong 9fd85bb4b5 完善超级签支付业务
zhengchanglong fb7a8f809c Merge branch 'dev-cz' of 47.111.118.107:/srv/git/platform into dev_zcl
zhengchanglong 3bfb23b360 超级签支付
chenzhi da8aee73c6 增加弹框
zhengchanglong 308903d396 Merge branch 'dev-cz' into dev_zcl
# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php
“‘ 96ca80221b 修复
“‘ 56f567e47f 支付
zhengchanglong 2dc6304ec3 超级签微信支付
tpingzhang 60fb35a8b3 小程序支付
优先抵扣平台币
微信支付限额
支付回调客户端
tpingzhang efae40fa2e 重复点击充值
平台币充值提示问题。
tpingzhang cdbd86373f 修改微信跳转bug
tpingzhang 38b57d8ad6 修改超级签支付url
tpingzhang 57f1929bf9 解决支付宝wap 支付返回 bug。android ios 都有
tpingzhang 7351c3a6fa 1015版本回退处理
tpingzhang c3a8f6b508 优先扣除绑币、平台币
超级签
兼容应用内应用外跳转
tpingzhang 3283f5e3bd 快捷支付
zhengchanglong f28101fb35 支付跳转修改
zhengchanglong 1a62aed2d4 支付跳转修改
zhengchanglong c5221795ec 超级签H5修改
ELF ba7511897a 修改
ELF 2ffa024c4c initial