Commit Graph

123 Commits (b8af3ea38484fa61b5c54ee8938e5c285dcf3c61)

Author SHA1 Message Date
chenzhi 5413551650 优化官网支付
chenzhi 777a7c8344 官网支付结果优化
chenzhi 98249f462a 优化官网支付
chenzhi 4ecbec2f49 回掉1.0
zhanglingsheng fb85d32c87 合并分支
chenzhi 995ea3f9a5 验证签名
zhanglingsheng a685e7340e 礼包列表过滤超级签
Your Name b54f73e4c2 OA获取信息
Your Name 31e90a9dee OA获取信息
Your Name f9eac7138f OA获取信息
Your Name 90105716d5 OA获取信息修改
Your Name 93bbc57ef2 OA获取信息修改
Your Name 94480951cb OA获取信息修改
tpingzhang 29883f60ac 修改重复插入问题 增加唯一索引 记录重复插入异常
zhengchanglong dee6c2e60d 扶持号SDK登录安全防护业务
zhengchanglong 68c9c492c5 微信支付回跳修改
zhengchanglong 8a7bcb13d3 Merge branch 'dev_zcl' into dev
zhengchanglong ee6e3a8624 修改测试金额
zhengchanglong 2b8cbf0021 Merge branch 'dev_zcl' into dev
zhengchanglong 433219c3f6 Merge branch 'dev-cz' into dev
chenzhi 2e8f7ba410 更新
zhengchanglong 46e5b1198c 修改金额
zhengchanglong 6a3b3cd114 超级签网页端充值地址修改
zhengchanglong be9586bc5b 支付流程修改
zhengchanglong f0dc10cd60 支付流程修改
tpingzhang 464e9f244b 正常充值不需要验证spend表 是否重复充值
zhengchanglong e30580791e 超级前购买测试金额改为0.01
zhengchanglong 4367052f77 Merge branch 'dev-cz' into dev
zhengchanglong 86040c88c6 超级签购买错误信息页面
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 超级签充值流程修改
tpingzhang 5be8421011 旧版
tpingzhang e9f8449468 eregi php5.3 废弃
preg_match
apple 支付页面
zhengchanglong 2ba3b915b9 超级前充值金额修改
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
chenzhi 95fc99816f 价格
chenzhi e4b72a1847 新增blank页
chenzhi 5236c7a6f1 优化css1
elf@home 4c5473a27f 修改bug
zhengchanglong f338c3d210 超级签充值金额修改
zhengchanglong caf5f0aff1 Merge branch 'dev-cz' into dev_zcl
chenzhi 8f5f4ba9bc 礼包领取
zhengchanglong f80ebc8583 修改超级签名BUG
zhengchanglong 0a62987665 修改超级签名BUG
ELF 145144ba51 解决冲突
ELF 4a403076b9 解决冲突
zhengchanglong a550435883 Merge remote-tracking branch 'origin/dev' into dev