Commit Graph

88 Commits (7863eb1be37d2acc388e31416d6ec48285bddbc7)

Author SHA1 Message Date
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 超级签充值流程修改
zhengchanglong e2fc2e5128 修改超级签充值流程
chenzhi ca79a3f627 css ok
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
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