tping
|
7cd9477268
|
Merge branch 'hotfix/payment_rule' into hotfix/pament_rule23
# Conflicts:
# Application/Callback/Controller/Notify2Controller.class.php
# Application/Sdk/Controller/PayH5Controller.class.php
# Application/Sdk/Controller/SpendController.class.php
# ThinkPHP/Library/Think/Pay.class.php
|
4 years ago |
|
tping
|
bbd4451409
|
payrment_rule
|
4 years ago |
|
tping
|
dd5c304b06
|
payment_rule
|
4 years ago |
|
tping
|
4e1487ca1c
|
test
|
4 years ago |
|
tping
|
f1ad708be7
|
test
|
4 years ago |
|
tping
|
4a1b45ed2d
|
test
|
4 years ago |
|
tping
|
d244f178d4
|
test
|
4 years ago |
|
tping
|
8c49ada3ce
|
调试
|
4 years ago |
|
tping
|
b77256d66c
|
Merge branch 'hotfix/payment_rule' of 47.111.118.107:wmtx/sdk into hotfix/payment_rule
|
4 years ago |
|
tping
|
2ff26755a2
|
payment_rule test1
|
4 years ago |
|
tping
|
c2a6f80e92
|
payment_rule test
|
4 years ago |
|
tping
|
95bb9f9897
|
payment_rule
|
4 years ago |
|
tping
|
3f7f3e9b70
|
test
|
4 years ago |
|
tping
|
d07a27113b
|
支付规则 test
|
4 years ago |
万盟天下
|
acd0ea65c5
|
Merge branch 'hotfix/ali_jinbocai' of wmtx/sdk into master
根据工会切换支付宝商户
|
4 years ago |
 ELF
|
ef74b69937
|
修改
|
4 years ago |
|
ELF
|
76e8cd841a
|
修改
|
4 years ago |
|
ELF
|
c15be0c7d1
|
修改
|
4 years ago |
|
ELF
|
4f6f87642c
|
修改
|
4 years ago |
release_wmtx
|
17108496f1
|
修改
|
4 years ago |
|
release_wmtx
|
083e90c28b
|
修改公私钥
|
4 years ago |
|
release_wmtx
|
fe95293142
|
修改金菠菜公私钥
|
4 years ago |
|
ELF
|
c9d6e341c2
|
修改
|
4 years ago |
|
ELF
|
fb0adfd0e9
|
修改
|
4 years ago |
|
ELF
|
6f36d729fa
|
修改
|
4 years ago |
|
ELF
|
d8f943a05e
|
修改金菠菜回调
|
4 years ago |
|
ELF
|
85288930d1
|
根据工会切换阿里商户
|
4 years ago |
|
廖金灵
|
3e2ac1dc38
|
Merge branch 'hotfix/maket_admin' of wmtx/sdk into master
订单添加市场专员
|
4 years ago |
|
ELF
|
35c5f559f4
|
删除调试代码
|
4 years ago |
|
ELF
|
676735f386
|
修改
|
4 years ago |
|
ELF
|
68ed2b7931
|
修改
|
4 years ago |
|
ELF
|
1e32bdb9fd
|
调试
|
4 years ago |
|
ELF
|
101332faea
|
调试
|
4 years ago |
|
ELF
|
c6cb289af0
|
测试
|
4 years ago |
|
ELF
|
be3f92b0cf
|
修改
|
4 years ago |
|
ELF
|
527f70ae98
|
修改
|
4 years ago |
张谷诚
|
c0918497cd
|
Merge branch 'hotfix/tfandpaynotice' of wmtx/sdk into master
ft包规则及支付通知
|
4 years ago |
|
tping
|
0788f28db3
|
白名单显示处理
|
4 years ago |
|
tping
|
8fa93eb480
|
测试白名单+TF包 不显示相关
|
4 years ago |
|
张谷诚
|
6217cc08b9
|
Merge branch 'hotfix/user353996' of wmtx/sdk into master
将该玩家sdk平台币充值记录上所有记录都隐藏掉，不影响我们后台数据
|
5 years ago |
|
tping
|
1ffdab583c
|
353996 用户特殊处理 隐藏平台币充值记录
|
5 years ago |
|
tping
|
971e9219c0
|
测试白名单
|
5 years ago |
|
tping
|
652036ff58
|
玩家白名单
|
5 years ago |
|
tping
|
0ad81a415d
|
forbit_ip
|
5 years ago |
|
tping
|
6d939ecc90
|
tf
|
5 years ago |
|
张谷诚
|
5cbf811239
|
Merge branch 'hotfix/authnamepay' of wmtx/sdk into master
优化实名支付
|
5 years ago |
|
tping
|
23aba5e0e7
|
<div style="text-align:center;">未实名认证不可充值！</div><br/>请到“悬浮球->我的”进行实名认证
|
5 years ago |
|
tping
|
255651991c
|
未实名认证不允许充值
|
5 years ago |
|
廖金灵
|
c378dacfce
|
Merge branch 'hotfix/login_lock' of wmtx/sdk into master
修改登录锁定bug
|
5 years ago |
|
elf@home
|
7a92adf949
|
修改登录锁定bug
|
5 years ago |