From f79c3413d81782d6cf9bd06dee77f053c08436ca Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Oct 2020 14:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Config.php              |  9 +++++++
 app/wechat/view/config/options.html           | 14 ++++++-----
 .../config/{options_tst.html => testapi.html} | 24 +++++++------------
 app/wechat/view/keys/index.html               | 11 ++++-----
 4 files changed, 29 insertions(+), 29 deletions(-)
 rename app/wechat/view/config/{options_tst.html => testapi.html} (75%)

diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php
index f905ade84..aff51e588 100644
--- a/app/wechat/controller/Config.php
+++ b/app/wechat/controller/Config.php
@@ -75,6 +75,15 @@ class Config extends Controller
         }
     }
 
+    /**
+     * 接口功能测试
+     * @auth true
+     */
+    public function testapi()
+    {
+        $this->fetch();
+    }
+
     /**
      * 配置微信支付
      * @auth true
diff --git a/app/wechat/view/config/options.html b/app/wechat/view/config/options.html
index 3f08046eb..82e01c054 100644
--- a/app/wechat/view/config/options.html
+++ b/app/wechat/view/config/options.html
@@ -1,24 +1,26 @@
 {extend name="../../admin/view/main"}
 
-{block name="content"}
+{block name="button"}
+<!--{if auth("testapi")}-->
+<button data-modal="{:url('testapi')}" class='layui-btn layui-btn-sm layui-btn-primary'>接口功能测试</button>
+<!--{/if}-->
+{/block}
 
+{block name="content"}
 <div class="think-box-shadow layui-form">
-    <div class="layui-input-block nowrap">
-        {foreach ['api'=>'微信公众平台直接模式','thr'=>'微信开放平台授权模式','test'=>'微信接口功能测试'] as $k=>$v}
+    <div class="nowrap" style="margin-left:99px">
+        {foreach ['api'=>'微信公众平台直接模式','thr'=>'微信开放平台授权模式'] as $k=>$v}
         <input type="radio" data-wechat-type="{$k}" name="wechat.type" value="{$k}" title="{$v}" lay-filter="wechat_type">
         {/foreach}
         <p class="help-block">请选择微信对接方式，其中微信开放平台授权模式是需要微信开放平台支持，还需要搭建微信授权服务！</p>
     </div>
 </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="test">{include file='config/options_tst'}</div>
     </div>
 </div>
-
 {/block}
 
 {block name='script'}
diff --git a/app/wechat/view/config/options_tst.html b/app/wechat/view/config/testapi.html
similarity index 75%
rename from app/wechat/view/config/options_tst.html
rename to app/wechat/view/config/testapi.html
index cdc331b6c..3023a9d4c 100644
--- a/app/wechat/view/config/options_tst.html
+++ b/app/wechat/view/config/testapi.html
@@ -1,23 +1,16 @@
-<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card noshadow' autocomplete="off">
-
-    <div class="layui-card-header border-0">
-        <div class="layui-bg-gray padding-col-20 border-radius-5">
-            微信常用功能测试案例，请使用微信扫描下面的二维码进行测试，具体请检查公众号是否拥有对应的产品功能。
-        </div>
-    </div>
-
-    <div class="layui-card-body">
+<div class='layui-card noshadow'>
+    <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">微信开放平台授权</p>
+                <p class="font-w7 color-green">微信开放平台授权</p>
                 <p>JSSDK 签名测试需要在开放平台配置当前的授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a></p>
             </div>
             <div class="margin-bottom-15">
-                <p class="font-w7">公众号平台接口域名授权</p>
-                <p>网页授权及 JSSDK 签名都需要在公众号平台配置授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a></p>
+                <p class="font-w7 color-green">公众号平台域名授权</p>
+                <p>网页授权及 JSSDK 签名都需要在公众号平台授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a></p>
             </div>
-            <div class="margin-bottom-15">
-                <p class="font-w7">支付测试配置</p>
+            <div class="margin-bottom-0">
+                <p class="font-w7 color-green">微信商户支付测试配置</p>
                 <p>JSAPI 支付测试需要在微信商户平台配置支付目录：<a data-copy="{:url('wechat/api.test/',[],'',true)}">{:sysuri('wechat/api.test/index',[],'',true)}</a></p>
                 <p>扫码支付①需要在微信商户平台配置支付通知地址：<a data-copy="{:url('wechat/api.test/scan_one_notify',[],'',true)}">{:url('wechat/api.test/scan_one_notify',[],'',true)}</a></p>
             </div>
@@ -44,6 +37,5 @@
                 <p class="text-center">扫码支付②</p>
             </div>
         </div>
-
     </div>
-</form>
+</div>
\ No newline at end of file
diff --git a/app/wechat/view/keys/index.html b/app/wechat/view/keys/index.html
index 93888e937..2527ef4c7 100644
--- a/app/wechat/view/keys/index.html
+++ b/app/wechat/view/keys/index.html
@@ -1,15 +1,12 @@
 {extend name="../../admin/view/main"}
 
 {block name="button"}
-
-{if auth("add")}
+<!--{if auth("add")}-->
 <button data-open="{:url('add')}" class='layui-btn layui-btn-sm layui-btn-primary'>添加规则</button>
-{/if}
-
-{if auth("remove")}
+<!--{/if}-->
+<!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些规则吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除规则</button>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name='content'}