Commit aeed5157 by 刘海龙

Merge branch 'master' of http://132.232.91.252:9999/ice/quxiu

# Conflicts:
#	themes/simplebootx/Appapi/Rechange/index.html
parents 9603dc2e 0628ebc8
...@@ -33,6 +33,13 @@ class RechangeController extends HomebaseController ...@@ -33,6 +33,13 @@ class RechangeController extends HomebaseController
// 'cert_client' => __DIR__ . '/apiclient_cert.pem', // optional, 退款,红包等情况时需要用到 // 'cert_client' => __DIR__ . '/apiclient_cert.pem', // optional, 退款,红包等情况时需要用到
// 'cert_key' => __DIR__ . '/apiclient_key.pem',// optional, 退款,红包等情况时需要用到 // 'cert_key' => __DIR__ . '/apiclient_key.pem',// optional, 退款,红包等情况时需要用到
], ],
'alipay' => [
'app_id' => '2021001155692232',
'notify_url' => '/',
// 'return_url' => 'http://yansongda.cn/return.php',
'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkXI1E4BN+iJecnOHMkSwMDPQWkoyqqYJujea5DYKViQ5jVh2CGjGwxnwsDobWR3z015mbw1rmw9ioi0TjeefUZmyi17BmlFyJPMLNy5O0hv1Bo+SnQE1PAbgWakYecXhpaeIGBf3YTF/qq5lZHPP7PMTNn11s6BXKoXMPqD9jv+PObG8PJWxh/oUMCBlthOCkEBsOqe0nNtHdXHG45dAa5NwqjGg2B+Q6AaCBkKDmbiwWGXTtu7gHZnzTpuKaZudCaF335Iu7PAfH6hMQxroes26F+dxPwA+FTaczp8RA0c7F5tZBcrXkW3S8gnKWSlZu9do1ZmoaiggRN26c57bQIDAQAB',
'private_key' => 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCL3lwAq5DY7YFFr8rCtFEK7zl1cbKLPFcQyrBReuVjROo6wMIT0I+/2zUOew5M/8h/nhf8OSFRNypjWzC57h98aO6i6fG5nfPWYn0+I9Dl/kZXEdljgT0pg3nBQ0fOvnxc6tLVC7DXn3qVMJ++z9wolme65KwVPdn4KJAgBtliz13Be48+kYYnnNtxSJfKbr4X6oCZlGFgr2p4fWyddqJb0+//kc18p5o/clqXO/aWwXnWcWwVuBZbxIqvhF7mGj+SwTI/+T1sPTUI/hlcMIv8TGVB40lVZSDgb/a6/nQKezdvHX8+p/krTyQwQ5B/4u24lkISPLSwop5TRGRsusnnAgMBAAECggEASx3/sUhzAV4EyGVR8uGeiM3TwRRv/EFKzTTeHtRu77JqTWWKldOz8CkNRJqoIohYqNlCLm6MSy7ib/vgnmqZtFoyl4InFTYUZ7X7Z20a2vqF0ms+oicdrvbyY+37WbiJ1+kxk8O0lQkMb6Vula7SoWWtjf0TwlC2iIVYairjgyHpR+t3KceX0cto+hE1Bbcq394VPAddHqQbIXYp83IEGozXdtn70xPhNfyIZ51AmpKIOGSjmwZi24+sFUrhGtcVKYeopHOtsl/4HpWLZ5+SCZM7JA9nfX5GmMKXdc67mjRkE/2BYe9hOPybZV7Prz0A2m2vPZMOyWU/8M/wHsu76QKBgQDOU4MF0eJuVbBvItyryH1G0zdqqpwWhQQKFmxOt/BHiSz5DoUPPu6jh0H2190Xjg86FkUV4f7lT7MfSktO0ZV8vnH1QDMvDKCRNgIt4FXgbOE0A3cokdz8s7rbd7oJ8F34cI5PIcYuFHDogR9BF4vh7uLN4wHRltJMhYBikWKidQKBgQCtit6koeILtt9Nucg4U8+GL4yJRCEQ0vJyLyEk7OwL9gtyIA+6QT62EzAPOuzpLJ5Mu/Dtk8/IkN5ExjECIcTvC/0BKvInQzKEqT6pARKvRp4qgbCJflPd+rOqLl6YdJv5jY5txebau0xC9Sks98mI/tQxjwonLu9utwIbinr3awKBgC/mhYGhY484B5kVn+OlzSfXO4NhDpHP2cs5v3VbEMaa2z0LGOscMiz25uKW5PZl/bT/nJRi/llgcnZuOiOXVrw6PpywhfGDXfe4cTMTZPyQaow3zb82dfaZB2WSWzeZfUeDYhaPAcKK7lecOpRTEh+m5TLlY/OzrykiyVaY6CxNAoGBAJi7VUMzLcv9f/3Z+bqJGGUSR+8uxKMX5ERV8iebVAsa2evxB6Z2cYiwzmU5CPQWTqNd7KZKpl3wEY4Zl1w2+CkiNeLnNwMTAsz6XqlCxnz3+4+RYBtB0PHWCHVIJfyq8/LngGhf+dKbcHylYz2uPfKRw5JyPw9JIXQhIHu4noxNAoGAEG+IFWJJlOMuFWrsWQ3sqQ6VUNA1magFzndOd6rXpJTBS/jN1V6xyGujylmxA9XpzyCNakgzMcaaDFKon0MsHJKPHKLbhB0EYj4HZDUvlil3FeeOadZLhBUvO6tX1yG7bQCWh2BzBkP/pghixKaZLLdtbU/BN3oul1lTx7BYGT8=',
],
]; ];
} }
...@@ -49,10 +56,25 @@ class RechangeController extends HomebaseController ...@@ -49,10 +56,25 @@ class RechangeController extends HomebaseController
'total_fee' => '1', // 订单金额,**单位:分** 'total_fee' => '1', // 订单金额,**单位:分**
'body' => '测试支付', // 订单描述 'body' => '测试支付', // 订单描述
// 'spbill_create_ip' => '', // 支付人的 IP // 'spbill_create_ip' => '', // 支付人的 IP
]) ]),
];
echo json_encode(["ret" => 200, 'data' => $data, 'msg' => '']);
die;
}
public function alipay()
{
$data = [
'html' => $this->getPay()->driver('alipay')->gateway('wap')->pay([
'out_trade_no' => time(), // 订单号
'total_amount' => '0.01', // 订单金额,
'subject' => '测试支付', // 订单描述
// 'spbill_create_ip' => '', // 支付人的 IP
]),
]; ];
echo json_encode(array("ret"=>200,'data'=>$data,'msg'=>'')); echo json_encode(["ret" => 200, 'data' => $data, 'msg' => '']);
die; die;
} }
} }
......
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
</div> </div>
<div class="foot"> <div class="foot">
<div class="foot_left"> <div class="foot_left" @click="alipay">
<img src="__PUBLIC__/appapi/pay/img/zfb-icon.png" > <img src="__PUBLIC__/appapi/pay/img/zfb-icon.png" >
<span>支付宝</span> <span>支付宝</span>
</div> </div>
<div class="foot_right"> <div class="foot_right" @click="wx">
<img src="__PUBLIC__/appapi/pay/img/wx-icon.png" > <img src="__PUBLIC__/appapi/pay/img/wx-icon.png" >
<span>微信支付</span> <span >微信支付</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -99,19 +99,62 @@ ...@@ -99,19 +99,62 @@
sel_money(index){ sel_money(index){
this.sel_num = index this.sel_num = index
}, },
wx() {
let _this = this;
$.ajax({
url:"/index.php?g=Appapi&m=rechange&a=wx",
dataType:"json",
data: {
},
type:"POST",
success:function(data){
console.log(data);
if(data.ret==200){
let d = data.data;
window.location.href = d.ulr;
}else{
layer.msg(data.msg);
}
},
error:function(e){
layer.msg(e.msg);
}
})
},
alipay() {
let _this = this;
$.ajax({
url:"/index.php?g=Appapi&m=rechange&a=alipay",
dataType:"json",
data: {
},
type:"POST",
success:function(data){
console.log(data);
if(data.ret==200){
let d = data.data;
var reHtml= d.html;
var div = document.createElement('div');
div.innerHTML =reHtml;
document.body.appendChild(div);
document.forms[0].submit();
}else{
layer.msg(data.msg);
}
},
error:function(e){
layer.msg(e.msg);
}
})
}
}, },
watch: { watch: {
//数据监测函数 //数据监测函数
}, },
created: function() { created: function() {
//加载触发函数 //加载触发函数
  var ua = navigator.userAgent.toLowerCase();
console.log(ua)
  if(ua.match(/MicroMessenger/i)=='micromessenger') {
    alert('在微信里打开');
  } else {
     alert('不在微信里打开');
  }
} }
}); });
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment