From 741ed8a1d65b7831d0a10b35647b6e70b6e9c7a5 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 27 Aug 2019 16:06:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8E=E5=8F=B0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/view/config/options_api.html       |  2 +-
 .../wechat/view/config/options_thr.html       |  2 +-
 application/wechat/view/fans/index.html       | 22 +++++++++----------
 .../wechat/view/fans/index_search.html        |  2 --
 application/wechat/view/keys/index.html       | 20 ++++++++---------
 .../wechat/view/keys/index_search.html        |  2 --
 application/wechat/view/menu/index.html       | 11 +++++-----
 7 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/application/wechat/view/config/options_api.html b/application/wechat/view/config/options_api.html
index f243097fa..6859fcdb0 100644
--- a/application/wechat/view/config/options_api.html
+++ b/application/wechat/view/config/options_api.html
@@ -54,9 +54,9 @@
         </div>
 
         <div class="hr-line-dashed"></div>
+        <input type="hidden" name="wechat_type" value="api">
 
         <div class="layui-form-item text-center">
-            <input type="hidden" name="wechat_type" value="api">
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
diff --git a/application/wechat/view/config/options_thr.html b/application/wechat/view/config/options_thr.html
index 19a82632a..62b2ab13a 100644
--- a/application/wechat/view/config/options_thr.html
+++ b/application/wechat/view/config/options_thr.html
@@ -57,9 +57,9 @@
         </div>
 
         <div class="hr-line-dashed"></div>
+        <input type="hidden" name="wechat_type" value="thr">
 
         <div class="layui-form-item text-center">
-            <input type="hidden" name="wechat_type" value="thr">
             <button class="layui-btn" type="submit">保存配置</button>
         </div>
 
diff --git a/application/wechat/view/fans/index.html b/application/wechat/view/fans/index.html
index be5a7d74c..5661d8e42 100644
--- a/application/wechat/view/fans/index.html
+++ b/application/wechat/view/fans/index.html
@@ -2,15 +2,15 @@
 
 {block name="button"}
 
-{if auth("wechat/fans/setblack")}
-<button data-action='{:url("setblack")}' data-rule="openid#{key}" data-csrf="{:systoken('wechat/fans/setblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量拉黑</button>
+{if auth("setblack")}
+<button data-action='{:url("setblack")}' data-rule="openid#{key}" data-csrf="{:systoken('setblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量拉黑</button>
 {/if}
 
-{if auth("wechat/fans/delblack")}
-<button data-action='{:url("delblack")}' data-rule="openid#{key}" data-csrf="{:systoken('wechat/fans/delblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>取消拉黑</button>
+{if auth("delblack")}
+<button data-action='{:url("delblack")}' data-rule="openid#{key}" data-csrf="{:systoken('delblack')}" class='layui-btn layui-btn-sm layui-btn-primary'>取消拉黑</button>
 {/if}
 
-{if auth("wechat/fans/sync")}
+{if auth("sync")}
 <button data-load='{:url("sync")}' class='layui-btn layui-btn-sm layui-btn-primary'>同步粉丝</button>
 {/if}
 
@@ -74,17 +74,17 @@
             <td class="nowrap">
 
                 {eq name='vo.is_black' value='0'}
-                <!--{if auth("wechat/fans/setblack")}-->
-                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('setblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/setblack')}">拉 黑</a>
+                <!--{if auth("setblack")}-->
+                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('setblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('setblack')}">拉 黑</a>
                 <!--{/if}-->
                 {else}
-                <!--{if auth("wechat/fans/delblack")}-->
-                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('delblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/delblack')}">拉 白</a>
+                <!--{if auth("delblack")}-->
+                <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('delblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('delblack')}">拉 白</a>
                 <!--{/if}-->
                 {/eq}
 
-                {if auth("wechat/fans/remove")}
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该粉丝吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/fans/remove')}">删 除</a>
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该粉丝吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                 {/if}
             </td>
         </tr>
diff --git a/application/wechat/view/fans/index_search.html b/application/wechat/view/fans/index_search.html
index e0f5d6acf..23e5612fb 100644
--- a/application/wechat/view/fans/index_search.html
+++ b/application/wechat/view/fans/index_search.html
@@ -1,4 +1,3 @@
-<!-- 表单搜索 开始 -->
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
@@ -58,4 +57,3 @@
     window.form.render();
     window.laydate.render({range: true, elem: '[name="subscribe_at"]'});
 </script>
-<!-- 表单搜索 结束 -->
diff --git a/application/wechat/view/keys/index.html b/application/wechat/view/keys/index.html
index abf61c1e7..f1b408849 100644
--- a/application/wechat/view/keys/index.html
+++ b/application/wechat/view/keys/index.html
@@ -2,12 +2,12 @@
 
 {block name="button"}
 
-{if auth("wechat/keys/add")}
+{if auth("add")}
 <button data-open="{:url('add')}" class='layui-btn layui-btn-sm layui-btn-primary'>添加规则</button>
 {/if}
 
-{if auth("wechat/keys/remove")}
-<button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('wechat/keys/remove')}" data-confirm="确定要删除这些规则吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除规则</button>
+{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}
 
 {/block}
@@ -69,18 +69,18 @@
             <td class='text-left nowrap'>{if $vo.status eq 0}<span class="color-desc">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}</td>
             <td class='text-left nowrap'>
 
-                {if auth("wechat/keys/edit")}
+                {if auth("edit")}
                 <a class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 {/if}
 
-                {if $vo.status eq 1 and auth("wechat/keys/forbid")}
-                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('wechat/keys/forbid')}">禁 用</a>
-                {elseif auth("wechat/keys/resume")}
-                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('wechat/keys/resume')}">启 用</a>
+                {if $vo.status eq 1 and auth("forbid")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('forbid')}">禁 用</a>
+                {elseif auth("resume")}
+                <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('resume')}">启 用</a>
                 {/if}
 
-                {if auth("wechat/keys/remove")}
-                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该规则吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/keys/remove')}">删 除</a>
+                {if auth("remove")}
+                <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该规则吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                 {/if}
 
             </td>
diff --git a/application/wechat/view/keys/index_search.html b/application/wechat/view/keys/index_search.html
index 6d26dd590..a716b9ba2 100644
--- a/application/wechat/view/keys/index_search.html
+++ b/application/wechat/view/keys/index_search.html
@@ -1,4 +1,3 @@
-<!-- 表单搜索 开始 -->
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
@@ -53,4 +52,3 @@
     window.form.render();
     window.laydate.render({range: true, elem: '[name="create_at"]'});
 </script>
-<!-- 表单搜索 结束 -->
diff --git a/application/wechat/view/menu/index.html b/application/wechat/view/menu/index.html
index c648af06f..40ecc8407 100644
--- a/application/wechat/view/menu/index.html
+++ b/application/wechat/view/menu/index.html
@@ -96,13 +96,14 @@
     </div>
 
     <div class="text-center margin-top-20">
-        <!--{if auth("wechat/menu/edit")}-->
+        {if auth("edit")}
         <button class="layui-btn menu-submit" ng-click="submit()">保存发布</button>
-        <!--{/if}-->
-        <!--{if auth("wechat/menu/cancel")}-->
-        <button data-load='{:url("wechat/menu/cancel")}' class="layui-btn layui-btn-danger">取消发布</button>
-        <!--{/if}-->
+        {/if}
+        {if auth("cancel")}
+        <button data-load='{:url("cancel")}' class="layui-btn layui-btn-danger">取消发布</button>
+        {/if}
     </div>
+
 </div>
 
 <script>