Commit Graph

123 Commits (d46fa808c01c73dfb3ba6ffc20a6bc4f52317685)

Author SHA1 Message Date
zhengchanglong 9cebace169 Merge branch 'dev-cz' into dev
tpingzhang 99f4d30af0 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 41075f8abc Merge branch 'serveridnull' into dev
chenzhi b8945e8655 修复bug
tpingzhang f7ca69eba6 支付回调域名
zhengchanglong c3cb46cab0 超级签充值BUG修复
tpingzhang f05e7a3149 支付回调域名
tpingzhang ba644484e7 Merge branch 'serveridnull' into dev
tpingzhang 81f85e672d 支付回调域名
tpingzhang bd10995fad Merge branch 'serveridnull' into dev
tpingzhang 8a5f833335 apple alipay
tpingzhang 6fbc15359b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 63f8e24208 解决冲突
tpingzhang cdb5e1e699 去掉pay_header
tpingzhang a6c99cda3a 1,修改server_id传0 增加game_player_id
2,微信限额》=3000
3,小程序
zhengchanglong ae6a18303a 超级签名充值测试金额改为0.01
zhengchanglong 059900320b 超级签回跳地址是否需要https判断
zhengchanglong a6398b488f Merge branch 'dev_zcl' into dev
# Conflicts:
#	Data/update.sql
ELF db956a2d77 修改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
zhengchanglong 67291fb95e 超级签BUG修复
“‘ 9316dedc6c 修复
“‘ 96ca80221b 修复
“‘ 56f567e47f 支付
zhengchanglong 2dc6304ec3 超级签微信支付
zhengchanglong 9ffb5fd753 New branch commit
tpingzhang e14c736d6b 域名
tpingzhang 60fb35a8b3 小程序支付
优先抵扣平台币
微信支付限额
支付回调客户端
tpingzhang 8670b8974f 超级签 登入状态验证
tpingzhang efae40fa2e 重复点击充值
平台币充值提示问题。
tpingzhang 9978371b58 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang 28937dd832 微信小程序支付显示安卓
save返回
liaojinling 22783c3168 sdk添加注册日志
tpingzhang 0c67f0e6de 安装不验证user_id
tpingzhang 51cc306872 二级域名
tpingzhang cdbd86373f 修改微信跳转bug
tpingzhang 32b325eb36 回调不做登入验证
tpingzhang 77c1f1c6d9 二级域名修改
tpingzhang 38b57d8ad6 修改超级签支付url
ELF 9fdbdc539e 修改oa接口排序
tpingzhang a002276baf 超级签关联推广ID
tpingzhang 57f1929bf9 解决支付宝wap 支付返回 bug。android ios 都有
tpingzhang af8a0e3e2d 微信回调app
支付金额回调验证
tpingzhang 3925ffbb83 1015版本回退处理
tpingzhang 7351c3a6fa 1015版本回退处理
tpingzhang c3a8f6b508 优先扣除绑币、平台币
超级签
兼容应用内应用外跳转
tpingzhang 0f41a508be Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang dbbfc165c0 优先扣除绑币 平台币 微信支付限额3000
Your Name dac383b78d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
Your Name 8702d87819 sdk chinaChar
ELF bfadef687f 添加功能
ELF 962c8e38c4 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 606903c56c 删除调试信息
tpingzhang 098860c384 身份认证
tpingzhang 3283f5e3bd 快捷支付
ELF 120f024629 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF dc4ef313ab 修改oa接口日志记录方式
zhengchanglong f28101fb35 支付跳转修改
zhengchanglong 1a62aed2d4 支付跳转修改
zhengchanglong c5221795ec 超级签H5修改
ELF 75b292b906 修改
ELF d61f98df7b 修改内容
ELF ba7511897a 修改
ELF 2ffa024c4c initial