diff --git a/application/onlinechip/controller/Order.php b/application/onlinechip/controller/Order.php index 92c8f6f..2b35bab 100644 --- a/application/onlinechip/controller/Order.php +++ b/application/onlinechip/controller/Order.php @@ -35,10 +35,23 @@ class Order Extends Controller{ } $pay_method = $area_list[$user['area_id']]['pay']; if($user && $user['api_token'] == $api_token){ - $this->assign('online_order_fac',$pay_list[$pay_method]['online_order_fac']); - $this->assign('payMethod',$pay_list[$pay_method]['type']); - $this->assign('client',1); - $this->assign('user_info',$user); + $payMethod = $pay_list[$pay_method]['type']; + $pay_routes = []; + foreach($payMethod as $k => $v){ + $pay_routes[$k] = $pay_list[$pay_method]['online_order_fac']; + } + // 越南地区追加 USDT (Epay) + if($user['area_id'] == 3 && !empty($pay_list['epay']['type'])){ + foreach($pay_list['epay']['type'] as $k => $v){ + $payMethod[$k] = $v; + $pay_routes[$k] = $pay_list['epay']['online_order_fac']; + } + } + $this->assign('online_order_fac', $pay_list[$pay_method]['online_order_fac']); + $this->assign('payMethod', $payMethod); + $this->assign('pay_routes', $pay_routes); + $this->assign('client', 1); + $this->assign('user_info', $user); return $this->fetch(); }else{ exit('页面错误,请退出再登录!'); @@ -56,10 +69,26 @@ class Order Extends Controller{ } $pay_method = $area_list[$user['area_id']]['pay']; if($user && $user['api_token'] == $api_token){ - $this->assign('online_order_fac',$pay_list[$pay_method]['online_order_fac']); - $this->assign('payMethod',$pay_list[$pay_method]['type']); - $this->assign('client',2); - $this->assign('user_info',$user); + // 主通道(按 area_list 的 pay 配置) + $payMethod = $pay_list[$pay_method]['type']; + $pay_routes = []; + foreach($payMethod as $k => $v){ + $pay_routes[$k] = $pay_list[$pay_method]['online_order_fac']; + } + + // 越南地区追加 USDT (Epay) 通道作为第二选项 + if($user['area_id'] == 3 && !empty($pay_list['epay']['type'])){ + foreach($pay_list['epay']['type'] as $k => $v){ + $payMethod[$k] = $v; + $pay_routes[$k] = $pay_list['epay']['online_order_fac']; + } + } + + $this->assign('online_order_fac', $pay_list[$pay_method]['online_order_fac']); // 兼容旧模板 + $this->assign('payMethod', $payMethod); + $this->assign('pay_routes', $pay_routes); + $this->assign('client', 2); + $this->assign('user_info', $user); return $this->fetch(); }else{ exit('页面错误,请退出再登录!'); diff --git a/application/onlinechip/view/order/wappay.html b/application/onlinechip/view/order/wappay.html index 28e83e5..44f8296 100644 --- a/application/onlinechip/view/order/wappay.html +++ b/application/onlinechip/view/order/wappay.html @@ -204,7 +204,7 @@ @@ -233,7 +233,8 @@ query.price = price; query.username = username; query.pay_type = pay_type; - url = '/order/'; + // 每种支付方式对应的 online_order 路由可能不同 + url = $('#pay_type option:selected').data('url') || '/order/'; //var winRef = window.open("","_blank"); $.ajax({ url:url,