From 23f670cf44c72becd84dba1b510ebad025c3285a Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 14 Dec 2020 15:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/Payment.php     |  8 ++++++++
 app/data/service/PaymentService.php | 20 ++++++++++----------
 app/data/service/UserService.php    |  8 ++++----
 app/data/view/payment/form.html     | 10 ++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/data/controller/Payment.php b/app/data/controller/Payment.php
index 355043211..9d3eb5aad 100644
--- a/app/data/controller/Payment.php
+++ b/app/data/controller/Payment.php
@@ -3,6 +3,7 @@
 namespace app\data\controller;
 
 use app\data\service\PaymentService;
+use app\data\service\UserService;
 use think\admin\Controller;
 
 /**
@@ -73,6 +74,13 @@ class Payment extends Controller
     protected function _form_filter(array &$data)
     {
         if ($this->request->isGet()) {
+            foreach ($this->types as &$vo) {
+                $binds = [];
+                foreach ($vo['bind'] as $api) if (isset(UserService::TYPES[$api])) {
+                    $binds[$api] = UserService::TYPES[$api]['name'];
+                }
+                $vo['allow'] = join('、', $binds);
+            }
             $data['content'] = json_decode($data['content'] ?? '[]', true) ?: [];
         } else {
             $data['content'] = json_encode($this->request->post() ?: [], JSON_UNESCAPED_UNICODE);
diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php
index cacd44d45..6376ec9ce 100644
--- a/app/data/service/PaymentService.php
+++ b/app/data/service/PaymentService.php
@@ -25,16 +25,6 @@ abstract class PaymentService extends Service
 
     // 支付通道配置
     const TYPES = [
-        PaymentService::PAYMENT_JOINPAY_XCX   => [
-            'type' => 'WEIXIN_XCX',
-            'name' => '汇聚小程序JSAPI支付',
-            'bind' => [UserService::APITYPE_WXAPP],
-        ],
-        PaymentService::PAYMENT_JOINPAY_GZH   => [
-            'type' => 'WEIXIN_GZH',
-            'name' => '汇聚服务号JSAPI支付',
-            'bind' => [UserService::APITYPE_WECHAT],
-        ],
         PaymentService::PAYMENT_WECHAT_MWEB   => [
             'type' => 'MWEB',
             'name' => '微信商户H5支付',
@@ -50,6 +40,16 @@ abstract class PaymentService extends Service
             'name' => '微信商户JSAPI支付',
             'bind' => [UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT],
         ],
+        PaymentService::PAYMENT_JOINPAY_XCX   => [
+            'type' => 'WEIXIN_XCX',
+            'name' => '汇聚小程序JSAPI支付',
+            'bind' => [UserService::APITYPE_WXAPP],
+        ],
+        PaymentService::PAYMENT_JOINPAY_GZH   => [
+            'type' => 'WEIXIN_GZH',
+            'name' => '汇聚服务号JSAPI支付',
+            'bind' => [UserService::APITYPE_WECHAT],
+        ],
     ];
 
     /**
diff --git a/app/data/service/UserService.php b/app/data/service/UserService.php
index 5c5069b2f..e880f07d0 100644
--- a/app/data/service/UserService.php
+++ b/app/data/service/UserService.php
@@ -18,19 +18,19 @@ class UserService extends Service
 
     const TYPES = [
         UserService::APITYPE_WAP    => [
-            'name' => '手机浏览器访问',
+            'name' => '手机浏览器终端',
             'auth' => '',
         ],
         UserService::APITYPE_WEB    => [
-            'name' => '电脑浏览器访问',
+            'name' => '电脑浏览器终端',
             'auth' => '',
         ],
         UserService::APITYPE_WXAPP  => [
-            'name' => '微信小程序访问',
+            'name' => '微信小程序终端',
             'auth' => 'openid1',
         ],
         UserService::APITYPE_WECHAT => [
-            'name' => '微信服务号访问',
+            'name' => '微信服务号终端',
             'auth' => 'openid2',
         ],
     ];
diff --git a/app/data/view/payment/form.html b/app/data/view/payment/form.html
index bd8d4f5a9..35961bfbc 100644
--- a/app/data/view/payment/form.html
+++ b/app/data/view/payment/form.html
@@ -19,13 +19,14 @@
                 {foreach $types as $k => $v}
                 <label class="think-radio notselect">
                     {if $vo.type eq $k}
-                    <input data-payment-type checked type="radio" name="type" value="{$k}"> {$v.name}
+                    <input data-payment-type data-allow="{$v.allow}" checked type="radio" name="type" value="{$k}"> {$v.name}
                     {else}
-                    <input data-payment-type type="radio" name="type" value="{$k}"> {$v.name}
+                    <input data-payment-type data-allow="{$v.allow}" type="radio" name="type" value="{$k}"> {$v.name}
                     {/if}
                 </label>
                 {/foreach}
             </div>
+            <div class="help-block">此支付通道支持 <span class="color-blue" data-payment-info></span> 的终端用户通过 API 发起支付</div>
         </div>
 
         <div data-payment-type="wechat">{include file='payment/form_wechat'}</div>
@@ -55,14 +56,15 @@
 {block name='script'}
 <script>
     $('input[data-payment-type]').on('change', function () {
-        var type = $('input[data-payment-type]:checked').val() || '';
-        if (type.indexOf('wechat') > -1) {
+        var $radio = $('input[data-payment-type]:checked');
+        if ($radio.val().indexOf('wechat') > -1) {
             $('[data-payment-type="wechat"]').removeClass('layui-hide')
             $('[data-payment-type="joinpay"]').addClass('layui-hide');
         } else {
             $('[data-payment-type="wechat"]').addClass('layui-hide')
             $('[data-payment-type="joinpay"]').removeClass('layui-hide');
         }
+        $('[data-payment-info]').html($radio.data('allow'));
     }).trigger('change');
 </script>
 {/block}
\ No newline at end of file