diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php index 33182fa68..275bc4ba2 100644 --- a/app/wechat/controller/Config.php +++ b/app/wechat/controller/Config.php @@ -76,16 +76,16 @@ class Config extends Controller } /** - * 接口功能测试 + * 微信授权测试 * @auth true */ - public function testapi() + public function options_test() { $this->fetch(); } /** - * 配置微信支付 + * 微信支付配置 * @auth true * @menu true * @throws \think\admin\Exception @@ -111,14 +111,23 @@ class Config extends Controller } /** - * 修改微信支付 + * 微信支付测试 + * @auth true + */ + public function payment_test() + { + $this->fetch(); + } + + /** + * 微信支付修改 * @auth true * @throws \think\admin\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function paymentsave() + public function payment_save() { if ($this->request->isPost()) { if ($this->request->post('wechat.mch_ssl_type') === 'p12') { diff --git a/app/wechat/view/config/options.html b/app/wechat/view/config/options.html index 82e01c054..a6c8505b0 100644 --- a/app/wechat/view/config/options.html +++ b/app/wechat/view/config/options.html @@ -1,8 +1,8 @@ {extend name="../../admin/view/main"} {block name="button"} - - + + {/block} @@ -17,8 +17,8 @@
-
{include file='config/options_api'}
-
{include file='config/options_thr'}
+
{include file='config/options_form_api'}
+
{include file='config/options_form_thr'}
{/block} diff --git a/app/wechat/view/config/options_api.html b/app/wechat/view/config/options_form_api.html similarity index 99% rename from app/wechat/view/config/options_api.html rename to app/wechat/view/config/options_form_api.html index cb45c0d87..faa19f033 100644 --- a/app/wechat/view/config/options_api.html +++ b/app/wechat/view/config/options_form_api.html @@ -63,5 +63,4 @@ - \ No newline at end of file diff --git a/app/wechat/view/config/options_thr.html b/app/wechat/view/config/options_form_thr.html similarity index 99% rename from app/wechat/view/config/options_thr.html rename to app/wechat/view/config/options_form_thr.html index f0f17da6b..eddb2aea1 100644 --- a/app/wechat/view/config/options_thr.html +++ b/app/wechat/view/config/options_form_thr.html @@ -70,5 +70,4 @@ - \ No newline at end of file diff --git a/app/wechat/view/config/options_test.html b/app/wechat/view/config/options_test.html new file mode 100644 index 000000000..7f2f27a2b --- /dev/null +++ b/app/wechat/view/config/options_test.html @@ -0,0 +1,31 @@ +
+
+
+
+

微信开放平台授权

+

JSSDK 签名测试需要在开放平台配置当前的授权域名：{:request()->host()}

+
+
+

公众号平台域名授权

+

网页授权及 JSSDK 签名都需要在公众号平台授权域名：{:request()->host()}

+
+
+
+
+ img +

网页授权

+
+
+ img +

JSSDK 签名

+
+
+
+
+ + diff --git a/app/wechat/view/config/payment.html b/app/wechat/view/config/payment.html index def13a2b4..7eefdeaea 100644 --- a/app/wechat/view/config/payment.html +++ b/app/wechat/view/config/payment.html @@ -1,9 +1,15 @@ {extend name="../../admin/view/main"} +{block name="button"} + + + +{/block} + {block name="content"}
-
+
diff --git a/app/wechat/view/config/testapi.html b/app/wechat/view/config/payment_test.html similarity index 78% rename from app/wechat/view/config/testapi.html rename to app/wechat/view/config/payment_test.html index 7503c11ee..636623c7c 100644 --- a/app/wechat/view/config/testapi.html +++ b/app/wechat/view/config/payment_test.html @@ -1,4 +1,4 @@ -
+
@@ -16,19 +16,11 @@
-
- -

网页授权

-
-
- img -

JSSDK签名

-
-
+
img

JSAPI支付

-
+
img

扫码支付①

@@ -39,6 +31,7 @@
+