From b3c296959298959ae16c6713fddd4bd5d2185374 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 5 Jan 2021 11:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Config.php              | 19 +++++++++---
 app/wechat/view/config/options.html           |  8 ++---
 ...options_api.html => options_form_api.html} |  1 -
 ...options_thr.html => options_form_thr.html} |  1 -
 app/wechat/view/config/options_test.html      | 31 +++++++++++++++++++
 app/wechat/view/config/payment.html           |  8 ++++-
 .../{testapi.html => payment_test.html}       | 15 +++------
 7 files changed, 60 insertions(+), 23 deletions(-)
 rename app/wechat/view/config/{options_api.html => options_form_api.html} (99%)
 rename app/wechat/view/config/{options_thr.html => options_form_thr.html} (99%)
 create mode 100644 app/wechat/view/config/options_test.html
 rename app/wechat/view/config/{testapi.html => payment_test.html} (78%)

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"}
-<!--{if auth("testapi")}-->
-<button data-modal="{:url('testapi')}" class='layui-btn layui-btn-sm layui-btn-primary'>接口功能测试</button>
+<!--{if auth("options_test")}-->
+<button data-modal="{:url('options_test')}" class='layui-btn layui-btn-sm layui-btn-primary'>微信授权测试</button>
 <!--{/if}-->
 {/block}
 
@@ -17,8 +17,8 @@
 </div>
 <div class="think-box-shadow margin-top-15">
     <div class="padding-top-20" style="width:850px">
-        <div class="layui-anim layui-anim-fadein" data-type="api">{include file='config/options_api'}</div>
-        <div class="layui-anim layui-anim-fadein" data-type="thr">{include file='config/options_thr'}</div>
+        <div class="layui-anim layui-anim-fadein" data-type="api">{include file='config/options_form_api'}</div>
+        <div class="layui-anim layui-anim-fadein" data-type="thr">{include file='config/options_form_thr'}</div>
     </div>
 </div>
 {/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 @@
         </div>
 
     </div>
-
 </form>
\ 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 @@
         </div>
 
     </div>
-
 </form>
\ 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 @@
+<div class='layui-card shadow-none margin-0'>
+    <div class="layui-card-body padding-40">
+        <div class="layui-bg-gray padding-20 border-radius-5">
+            <div class="margin-bottom-15">
+                <p class="font-w7 color-green">微信开放平台授权</p>
+                <p>JSSDK 签名测试需要在开放平台配置当前的授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a></p>
+            </div>
+            <div>
+                <p class="font-w7 color-green">公众号平台域名授权</p>
+                <p>网页授权及 JSSDK 签名都需要在公众号平台授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a></p>
+            </div>
+        </div>
+        <div class="text-center margin-top-20 test-qrcode-box">
+            <div class="inline-block padding-right-30 notselect">
+                <img alt="img" class="notselect" data-tips-image src="{:url('wechat/api.test/oauthQrc')}">
+                <p class="text-center">网页授权</p>
+            </div>
+            <div class="inline-block">
+                <img alt="img" class="notselect" data-tips-image src="{:url('wechat/api.test/jssdkQrc')}">
+                <p class="text-center">JSSDK 签名</p>
+            </div>
+        </div>
+    </div>
+</div>
+
+<style>
+    .test-qrcode-box img {
+        width: 130px;
+        height: 130px
+    }
+</style>
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"}
+<!--{if auth("payment_test")}-->
+<button data-modal="{:url('payment_test')}" class='layui-btn layui-btn-sm layui-btn-primary'>微信支付测试</button>
+<!--{/if}-->
+{/block}
+
 {block name="content"}
 <div class="think-box-shadow">
     <div class="layui-anim layui-anim-fadein padding-top-20" style="width:850px">
-        <form onsubmit="return false;" action="{:url('paymentsave')}" data-auto="true" method="post" class='layui-form layui-card shadow-none' autocomplete="off" lay-filter="payment">
+        <form onsubmit="return false;" action="{:url('payment_save')}" data-auto="true" method="post" class='layui-form layui-card shadow-none' autocomplete="off" lay-filter="payment">
 
             <div class="layui-card-header border-0">
                 <div class="layui-bg-gray padding-col-20 border-radius-5">
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 @@
-<div class='layui-card shadow-none'>
+<div class='layui-card shadow-none margin-0'>
     <div class="layui-card-body padding-40">
         <div class="layui-bg-gray padding-20 border-radius-5">
             <div class="margin-bottom-15">
@@ -16,19 +16,11 @@
             </div>
         </div>
         <div class="text-center margin-top-20 test-qrcode-box">
-            <div class="inline-block padding-right-15 notselect">
-                <img alt="" class="notselect" data-tips-image src="{:url('wechat/api.test/oauthQrc')}">
-                <p class="text-center">网页授权</p>
-            </div>
-            <div class="inline-block padding-right-15">
-                <img alt="img" class="notselect" data-tips-image src="{:url('wechat/api.test/jssdkQrc')}">
-                <p class="text-center">JSSDK签名</p>
-            </div>
-            <div class="inline-block padding-right-15">
+            <div class="inline-block padding-right-30">
                 <img alt="img" onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('wechat/api.test/jsapiQrc')}">
                 <p class="text-center">JSAPI支付</p>
             </div>
-            <div class="inline-block padding-right-15">
+            <div class="inline-block padding-right-30">
                 <img alt="img" onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('wechat/api.test/scanOneQrc')}">
                 <p class="text-center">扫码支付①</p>
             </div>
@@ -39,6 +31,7 @@
         </div>
     </div>
 </div>
+
 <style>
     .test-qrcode-box img {
         width: 130px;