From b663a8ea7f5208781bdd0922776f4ff9ea698a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 14 Apr 2021 10:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=B8=A6=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/api/icon.html                 | 18 ++++++++-------
 app/admin/view/config/index.html             | 12 +++++-----
 app/wechat/view/auto/index.html              | 20 ++++++++--------
 app/wechat/view/auto/index_search.html       |  4 ++--
 app/wechat/view/config/options_form_api.html |  4 ++--
 app/wechat/view/config/options_form_thr.html |  2 +-
 app/wechat/view/keys/index.html              | 24 +++++++++++---------
 app/wechat/view/news/form.html               |  2 +-
 vendor/services.php                          |  2 +-
 9 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/app/admin/view/api/icon.html b/app/admin/view/api/icon.html
index 7272db0f2..66fc703cc 100644
--- a/app/admin/view/api/icon.html
+++ b/app/admin/view/api/icon.html
@@ -2478,14 +2478,16 @@
     </li>
 </ul>
 <script src="__ROOT__/static/plugs/jquery/jquery.min.js" type="text/javascript"></script>
-<script> $(function () {
-    $('li').on('click', function (className) {
-        className = $(this).find('i').get(0).className;
-        if (className) {
-            top.$('[name="{$field}"]').val(className).trigger('change');
-            top.layer.close(top.layer.getFrameIndex(window.name));
-        }
+<script>
+    $(function () {
+        $('li').on('click', function (className) {
+            className = $(this).find('i').get(0).className;
+            if (className) {
+                top.$('[name="{$field}"]').val(className).trigger('change');
+                top.layer.close(top.layer.getFrameIndex(window.name));
+            }
+        });
     });
-});</script>
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html
index 297b67093..831ad4675 100644
--- a/app/admin/view/config/index.html
+++ b/app/admin/view/config/index.html
@@ -63,7 +63,7 @@
             <span class="color-green font-w7">网站名称</span><span class="margin-left-5 color-desc">Website</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('site_name')}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('site_name')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('site_name')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <div class="help-block">网站名称及网站图标，将显示在浏览器的标签上。</div>
         </div>
@@ -71,7 +71,7 @@
             <span class="color-green font-w7">管理程序名称</span><span class="margin-left-5 color-desc">Name</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('app_name')}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('app_name')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('app_name')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <div class="help-block">管理程序名称，将显示在后台左上角标题。</div>
         </div>
@@ -79,7 +79,7 @@
             <span class="color-green font-w7">管理程序版本</span><span class="margin-left-5 color-desc">Version</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('app_version')}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('app_version')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('app_version')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <div class="help-block">管理程序版本，将显示在后台左上角标题。</div>
         </div>
@@ -87,7 +87,7 @@
             <span class="color-green font-w7">公网备案号</span><span class="margin-left-5 color-desc">Baian</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('beian')?:'-'}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('beian')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('beian')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <p class="help-block">公网备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将在登录页面下面显示。</p>
         </div>
@@ -95,7 +95,7 @@
             <span class="color-green font-w7">网站备案号</span><span class="margin-left-5 color-desc">Miitbeian</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('miitbeian')?:'-'}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('miitbeian')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('miitbeian')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <div class="help-block">网站备案号，可以在<a target="_blank" href="http://beian.miit.gov.cn">备案管理中心</a>查询获取，将显示在登录页面下面。</div>
         </div>
@@ -103,7 +103,7 @@
             <span class="color-green font-w7">网站版权信息</span><span class="margin-left-5 color-desc">Copyright</span>
             <label class="relative block">
                 <input readonly value="{:sysconf('site_copy')}" class="layui-input layui-bg-gray">
-                <a data-copy="{:sysconf('site_copy')}" class="fa fa-copy input-right-icon"></a>
+                <a data-copy="{:sysconf('site_copy')}" class="iconfont icon-copy input-right-icon"></a>
             </label>
             <div class="help-block">网站版权信息，在后台登录页面显示版本信息并链接到备案到信息备案管理系统。</div>
         </div>
diff --git a/app/wechat/view/auto/index.html b/app/wechat/view/auto/index.html
index 8fa5c2426..adb3563b8 100644
--- a/app/wechat/view/auto/index.html
+++ b/app/wechat/view/auto/index.html
@@ -26,8 +26,8 @@
             </th>
             <th class="text-left nowrap">消息编号</th>
             <th class="text-left nowrap">延迟时间</th>
-            <th class="text-left nowrap">消息类型</th>
-            <th class="text-left nowrap">预览</th>
+            <th class="text-center nowrap">消息类型</th>
+            <th class="text-center nowrap">预览</th>
             <th class="text-left nowrap">添加时间</th>
             <th class="text-left nowrap">状态</th>
             <th></th>
@@ -42,20 +42,20 @@
             </td>
             <td class="text-left nowrap">{$vo.code}</td>
             <td class="text-left nowrap">{$vo.time}</td>
-            <td class="text-left nowrap">{$vo.type}</td>
-            <td class="text-left nowrap notselect">
+            <td class="text-center nowrap">{$vo.type}</td>
+            <td class="text-center nowrap notselect">
                 {if $vo.type eq '音乐'}
-                <a data-phone-view='{:url("@wechat/api.view/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览</a>
                 {elseif in_array($vo.type,['文字','转客服'])}
-                <a data-phone-view='{:url("@wechat/api.view/text")}?content={$vo.content|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/text")}?content={$vo.content|urlencode}'>预览</a>
                 {elseif $vo.type eq '图片'}
-                <a data-phone-view='{:url("@wechat/api.view/image")}?content={$vo.image_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/image")}?content={$vo.image_url|urlencode}'>预览</a>
                 {elseif $vo.type eq '图文'}
-                <a data-phone-view='{:url("@wechat/api.view/news")}?id={$vo.news_id}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/news")}?id={$vo.news_id}'>预览</a>
                 {elseif $vo.type eq '视频'}
-                <a data-phone-view='{:url("@wechat/api.view/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览</a>
                 {elseif $vo.type eq '语音'}
-                <a data-phone-view='{:url("@wechat/api.view/voice")}?content={$vo.voice_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/voice")}?content={$vo.voice_url|urlencode}'>预览</a>
                 {else} {$vo.content} {/if}
             </td>
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
diff --git a/app/wechat/view/auto/index_search.html b/app/wechat/view/auto/index_search.html
index 980605d00..2dbbbdcb3 100644
--- a/app/wechat/view/auto/index_search.html
+++ b/app/wechat/view/auto/index_search.html
@@ -10,7 +10,7 @@
         </div>
 
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">规则类型</label>
+            <label class="layui-form-label">消息类型</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="type">
                     <option value="">-- 全部 --</option>
@@ -28,7 +28,7 @@
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
                     <option value="">-- 全部 --</option>
-                    {foreach ['显示已禁止的规则','显示已激活的规则'] as $k=>$v}
+                    {foreach ['显示已禁止的消息','显示已激活的消息'] as $k=>$v}
                     {if $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
diff --git a/app/wechat/view/config/options_form_api.html b/app/wechat/view/config/options_form_api.html
index 04734a3b7..7859acc2e 100644
--- a/app/wechat/view/config/options_form_api.html
+++ b/app/wechat/view/config/options_form_api.html
@@ -45,11 +45,11 @@
             <div class="layui-input-block">
                 <div class="relative">
                     <input value="服务器授权IP：{$geoip}" disabled class="layui-input layui-bg-gray border-0">
-                    <a data-copy="{$geoip}" class="input-right-icon"><i class="fa fa-copy"></i></a>
+                    <a data-copy="{$geoip}" class="input-right-icon"><i class="iconfont icon-copy"></i></a>
                 </div>
                 <div class="relative margin-top-5">
                     <input value="消息推送地址：{$thrNotify}" disabled class="layui-input layui-bg-gray border-0">
-                    <a data-copy="{$thrNotify}" class="input-right-icon"><i class="fa fa-copy"></i></a>
+                    <a data-copy="{$thrNotify}" class="input-right-icon"><i class="iconfont icon-copy"></i></a>
                 </div>
                 <p class="help-block">公众号服务平台消息推送接口及服务器授权IP地址，需在公众号接口开发处配置。</p>
             </div>
diff --git a/app/wechat/view/config/options_form_thr.html b/app/wechat/view/config/options_form_thr.html
index 42d88a743..28a442ee9 100644
--- a/app/wechat/view/config/options_form_thr.html
+++ b/app/wechat/view/config/options_form_thr.html
@@ -56,7 +56,7 @@
             <div class="layui-input-block">
                 <div class="relative margin-top-5">
                     <input value="{$thrNotify}" disabled class="layui-input layui-bg-gray">
-                    <a data-copy="{$thrNotify}" class="input-right-icon"><i class="fa fa-copy"></i></a>
+                    <a data-copy="{$thrNotify}" class="input-right-icon"><i class="iconfont icon-copy"></i></a>
                 </div>
                 <p class="help-block">公众号绑定服务平台接口通知 URL, 公众号消息接收与回复等。</p>
             </div>
diff --git a/app/wechat/view/keys/index.html b/app/wechat/view/keys/index.html
index 273ec44bc..79abc86a5 100644
--- a/app/wechat/view/keys/index.html
+++ b/app/wechat/view/keys/index.html
@@ -24,8 +24,8 @@
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
             </th>
             <th class="text-left nowrap">关键字</th>
-            <th class="text-left nowrap">类型</th>
-            <th class="text-left nowrap">预览</th>
+            <th class="text-center nowrap">类型</th>
+            <th class="text-center nowrap">预览</th>
             <th class="text-left nowrap">添加时间</th>
             <th class="text-left nowrap">状态</th>
             <th></th>
@@ -42,23 +42,25 @@
                 <label><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></label>
             </td>
             <td class="text-left nowrap">
-                {notempty name='vo.qrc'}<i class="fa fa-qrcode fa-lg pointer margin-right-5" data-load="{$vo.qrc}" data-time="false" data-tips-text="生成关键字二维码"></i>{/notempty}
+                {notempty name='vo.qrc'}
+                <i class="iconfont icon-qrcode font-s12 pointer margin-right-5" data-load="{$vo.qrc}" data-time="false" data-tips-text="生成关键字二维码"></i>
+                {/notempty}
                 {$vo.keys}
             </td>
-            <td class="text-left nowrap">{$vo.type}</td>
-            <td class="text-left nowrap notselect">
+            <td class="text-center nowrap">{$vo.type}</td>
+            <td class="text-center nowrap notselect">
                 {if $vo.type eq '音乐'}
-                <a data-phone-view='{:url("@wechat/api.view/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览</i></a>
                 {elseif in_array($vo.type,['文字','转客服'])}
-                <a data-phone-view='{:url("@wechat/api.view/text")}?content={$vo.content|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/text")}?content={$vo.content|urlencode}'>预览</i></a>
                 {elseif $vo.type eq '图片'}
-                <a data-phone-view='{:url("@wechat/api.view/image")}?content={$vo.image_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/image")}?content={$vo.image_url|urlencode}'>预览</i></a>
                 {elseif $vo.type eq '图文'}
-                <a data-phone-view='{:url("@wechat/api.view/news")}?id={$vo.news_id}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/news")}?id={$vo.news_id}'>预览</i></a>
                 {elseif $vo.type eq '视频'}
-                <a data-phone-view='{:url("@wechat/api.view/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览</i></a>
                 {elseif $vo.type eq '语音'}
-                <a data-phone-view='{:url("@wechat/api.view/voice")}?content={$vo.voice_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
+                <a data-phone-view='{:url("@wechat/api.view/voice")}?content={$vo.voice_url|urlencode}'>预览</i></a>
                 {else} {$vo.content} {/if}
             </td>
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
diff --git a/app/wechat/view/news/form.html b/app/wechat/view/news/form.html
index 7f4629042..2d7c2fc32 100644
--- a/app/wechat/view/news/form.html
+++ b/app/wechat/view/news/form.html
@@ -22,7 +22,7 @@
                 <span class="news-title"></span>
                 <hr>
             </div>
-            <a class='article-add transition' ng-click="addItem()" data-text-tip="添加图文"><i class="fa fa-plus"></i></a>
+            <a class='article-add transition' ng-click="addItem()" data-text-tip="添加图文"><i class="layui-icon layui-icon-add-1"></i></a>
         </div>
     </div>
     <div class="layui-card news-right">
diff --git a/vendor/services.php b/vendor/services.php
index dca927d83..2c4c16f74 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2021-04-13 10:23:59
+// This file is automatically generated at:2021-04-14 10:13:59
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',