diff --git a/application/admin/view/auth/index.html b/application/admin/view/auth/index.html
index d6891369b..736c40d54 100644
--- a/application/admin/view/auth/index.html
+++ b/application/admin/view/auth/index.html
@@ -2,10 +2,11 @@
 
 {block name="button"}
 <!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("$classuri/add")}' data-title="添加权限" class='layui-btn layui-btn-sm'>添加权限</button>
+<button data-modal='{:url("$classuri/add")}' data-title="添加权限" class='layui-btn layui-btn-sm layui-btn-primary'>添加权限</button>
 <!--{/if}-->
+
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除权限</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除权限</button>
 <!--{/if}-->
 {/block}
 
diff --git a/application/admin/view/log/index.html b/application/admin/view/log/index.html
index 090ce1b34..079d0034c 100644
--- a/application/admin/view/log/index.html
+++ b/application/admin/view/log/index.html
@@ -2,7 +2,7 @@
 
 {block name="button"}
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除日志</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除日志</button>
 <!--{/if}-->
 {/block}
 
diff --git a/application/admin/view/menu/index.html b/application/admin/view/menu/index.html
index f34799631..63b95fa13 100644
--- a/application/admin/view/menu/index.html
+++ b/application/admin/view/menu/index.html
@@ -2,10 +2,10 @@
 
 {block name="button"}
 <!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("$classuri/add")}' data-title="添加菜单" class='layui-btn layui-btn-sm'>添加菜单</button>
+<button data-modal='{:url("$classuri/add")}' data-title="添加菜单" class='layui-btn layui-btn-sm layui-btn-primary'>添加菜单</button>
 <!--{/if}-->
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除菜单</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除菜单</button>
 <!--{/if}-->
 {/block}
 
diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html
index 99e99b451..8bae2bfba 100644
--- a/application/admin/view/node/index.html
+++ b/application/admin/view/node/index.html
@@ -2,7 +2,7 @@
 
 {block name='button'}
 <!--{if auth("$classuri/clear")}-->
-<button data-load='{:url("$classuri/clear")}' class='layui-btn layui-btn-sm layui-btn-danger'>清理无效记录</button>
+<button data-load='{:url("$classuri/clear")}' class='layui-btn layui-btn-sm layui-btn-primary'>清理无效记录</button>
 <!--{/if}-->
 {/block}
 
diff --git a/application/admin/view/user/index.html b/application/admin/view/user/index.html
index c0cb84164..72c79d38b 100644
--- a/application/admin/view/user/index.html
+++ b/application/admin/view/user/index.html
@@ -2,10 +2,11 @@
 
 {block name="button"}
 <!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("$classuri/add")}' data-title="添加用户" class='layui-btn layui-btn-sm'>添加用户</button>
+<button data-modal='{:url("$classuri/add")}' data-title="添加用户" class='layui-btn layui-btn-sm layui-btn-primary'>添加用户</button>
 <!--{/if}-->
+
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除用户</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除用户</button>
 <!--{/if}-->
 {/block}
 
diff --git a/application/goods/view/spec/index.html b/application/goods/view/spec/index.html
index a55ff4855..ebe56255c 100644
--- a/application/goods/view/spec/index.html
+++ b/application/goods/view/spec/index.html
@@ -3,11 +3,11 @@
 {block name="button"}
 
 <!--{if auth("$classuri/add")}-->
-<button data-modal='{:url("$classuri/add")}' data-title="添加规格" class='layui-btn layui-btn-sm'>添加规格</button>
+<button data-modal='{:url("$classuri/add")}' data-title="添加规格" class='layui-btn layui-btn-sm layui-btn-primary'>添加规格</button>
 <!--{/if}-->
 
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除规格</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除规格</button>
 <!--{/if}-->
 
 {/block}
diff --git a/application/wechat/view/block/index.html b/application/wechat/view/block/index.html
index 220b24181..6b7f5648b 100644
--- a/application/wechat/view/block/index.html
+++ b/application/wechat/view/block/index.html
@@ -2,89 +2,16 @@
 
 {block name="button"}
 <!--{if auth('wechat/block/backdel')}-->
-<button data-update="" data-action="{:url('backdel')}" class='layui-btn layui-btn-sm'>移出黑名单</button>
+<button data-update="" data-action="{:url('backdel')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量移出粉丝</button>
 <!--{/if}-->
 <!--{if auth('wechat/fans/sync')}-->
-<button data-load="{:url('wechat/fans/sync')}" class='layui-btn layui-btn-sm'>远程获取粉丝</button>
+<button data-load="{:url('wechat/fans/sync')}" class='layui-btn layui-btn-sm layui-btn-primary'>远程获取粉丝</button>
 <!--{/if}-->
 {/block}
 
 {block name="content"}
 <!-- 表单搜索 开始 -->
-<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">昵 称</label>
-        <div class="layui-input-inline">
-            <input name="nickname" placeholder="请输入昵称" autocomplete="off" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">性 别</label>
-        <div class="layui-input-inline">
-            <select name="sex" class="layui-select">
-                <option value="">- 性别 -</option>
-                <!--{foreach [1=>'男',2=>'女'] as $key=>$sex}-->
-                <!--{if $Think.get.sex eq $key.''}-->
-                <option selected value="{$key}">- {$sex} -</option>
-                <!--{else}-->
-                <option value="{$key}">- {$sex} -</option>
-                <!--{/if}-->
-                <!--{/foreach}-->
-            </select>
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">标 签</label>
-        <div class="layui-input-inline">
-            <select name="tag" class="layui-select" lay-search="true">
-                <option value="">- 粉丝标签 -</option>
-                <!--{foreach $tags as $key=>$tag}-->
-                <!--{if $Think.get.tag eq $key}-->
-                <option selected value="{$key}">{$tag}</option>
-                <!--{else}-->
-                <option value="{$key}">{$tag}</option>
-                <!--{/if}-->
-                <!--{/foreach}-->
-            </select>
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">国 家</label>
-        <div class="layui-input-inline">
-            <input name="country" value="{$Think.get.country|default=''}" placeholder="请输入国家" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">省 份</label>
-        <div class="layui-input-inline">
-            <input name="province" value="{$Think.get.province|default=''}" placeholder="请输入省份" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">城 市</label>
-        <div class="layui-input-inline">
-            <input name="city" value="{$Think.get.city|default=''}" placeholder="请输入城市" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">时 间</label>
-        <div class="layui-input-inline">
-            <input name="create_at" id='create_at' value="{$Think.get.create_at|default=''}" placeholder="关注时间" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-    </div>
-
-</form>
+{include file='wechat@fans/search_inc'}
 <!-- 表单搜索 结束 -->
 
 <form onsubmit="return false;" data-auto="true" method="post">
diff --git a/application/wechat/view/fans/index.html b/application/wechat/view/fans/index.html
index 2a5dad7dd..8e8602697 100644
--- a/application/wechat/view/fans/index.html
+++ b/application/wechat/view/fans/index.html
@@ -2,89 +2,16 @@
 
 {block name="button"}
 <!--{if auth("$classuri/backadd")}-->
-<button data-update data-action="{:url('backadd')}" class='layui-btn layui-btn-sm layui-btn-danger'>批量拉黑</button>
+<button data-update data-action="{:url('backadd')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量拉黑粉丝</button>
 <!--{/if}-->
 <!--{if auth("$classuri/sync")}-->
-<button data-load="{:url('sync')}" class='layui-btn layui-btn-sm'>远程获取粉丝</button>
+<button data-load="{:url('sync')}" class='layui-btn layui-btn-sm layui-btn-primary'>远程获取粉丝</button>
 <!--{/if}-->
 {/block}
 
 {block name="content"}
 <!-- 表单搜索 开始 -->
-<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">昵 称</label>
-        <div class="layui-input-inline">
-            <input name="nickname" placeholder="请输入昵称" autocomplete="off" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">性 别</label>
-        <div class="layui-input-inline">
-            <select name="sex" class="layui-select">
-                <option value="">- 性别 -</option>
-                <!--{foreach [1=>'男',2=>'女'] as $key=>$sex}-->
-                <!--{if $Think.get.sex eq $key.''}-->
-                <option selected value="{$key}">- {$sex} -</option>
-                <!--{else}-->
-                <option value="{$key}">- {$sex} -</option>
-                <!--{/if}-->
-                <!--{/foreach}-->
-            </select>
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">标 签</label>
-        <div class="layui-input-inline">
-            <select name="tag" class="layui-select" lay-search="true">
-                <option value="">- 粉丝标签 -</option>
-                <!--{foreach $tags as $key=>$tag}-->
-                <!--{if $Think.get.tag eq $key}-->
-                <option selected value="{$key}">{$tag}</option>
-                <!--{else}-->
-                <option value="{$key}">{$tag}</option>
-                <!--{/if}-->
-                <!--{/foreach}-->
-            </select>
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">国 家</label>
-        <div class="layui-input-inline">
-            <input name="country" value="{$Think.get.country|default=''}" placeholder="请输入国家" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">省 份</label>
-        <div class="layui-input-inline">
-            <input name="province" value="{$Think.get.province|default=''}" placeholder="请输入省份" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">城 市</label>
-        <div class="layui-input-inline">
-            <input name="city" value="{$Think.get.city|default=''}" placeholder="请输入城市" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">时 间</label>
-        <div class="layui-input-inline">
-            <input name="create_at" id='create_at' value="{$Think.get.create_at|default=''}" placeholder="关注时间" class="layui-input">
-        </div>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-    </div>
-
-</form>
+{include file='wechat@fans/search_inc'}
 <!-- 表单搜索 结束 -->
 
 <form onsubmit="return false;" data-auto="true" method="post">
diff --git a/application/wechat/view/fans/search_inc.html b/application/wechat/view/fans/search_inc.html
new file mode 100644
index 000000000..87d279afd
--- /dev/null
+++ b/application/wechat/view/fans/search_inc.html
@@ -0,0 +1,74 @@
+<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">昵 称</label>
+        <div class="layui-input-inline">
+            <input name="nickname" placeholder="请输入昵称" autocomplete="off" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">性 别</label>
+        <div class="layui-input-inline">
+            <select name="sex" class="layui-select">
+                <option value="">- 性别 -</option>
+                <!--{foreach [1=>'男',2=>'女'] as $key=>$sex}-->
+                <!--{if $Think.get.sex eq $key.''}-->
+                <option selected value="{$key}">- {$sex} -</option>
+                <!--{else}-->
+                <option value="{$key}">- {$sex} -</option>
+                <!--{/if}-->
+                <!--{/foreach}-->
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">标 签</label>
+        <div class="layui-input-inline">
+            <select name="tag" class="layui-select" lay-search="true">
+                <option value="">- 粉丝标签 -</option>
+                <!--{foreach $tags as $key=>$tag}-->
+                <!--{if $Think.get.tag eq $key}-->
+                <option selected value="{$key}">{$tag}</option>
+                <!--{else}-->
+                <option value="{$key}">{$tag}</option>
+                <!--{/if}-->
+                <!--{/foreach}-->
+            </select>
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">国 家</label>
+        <div class="layui-input-inline">
+            <input name="country" value="{$Think.get.country|default=''}" placeholder="请输入国家" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">省 份</label>
+        <div class="layui-input-inline">
+            <input name="province" value="{$Think.get.province|default=''}" placeholder="请输入省份" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">城 市</label>
+        <div class="layui-input-inline">
+            <input name="city" value="{$Think.get.city|default=''}" placeholder="请输入城市" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <label class="layui-form-label">时 间</label>
+        <div class="layui-input-inline">
+            <input name="create_at" id='create_at' value="{$Think.get.create_at|default=''}" placeholder="关注时间" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item layui-inline">
+        <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+    </div>
+
+</form>
\ No newline at end of file
diff --git a/application/wechat/view/keys/index.html b/application/wechat/view/keys/index.html
index aa719723d..7aada3020 100644
--- a/application/wechat/view/keys/index.html
+++ b/application/wechat/view/keys/index.html
@@ -3,11 +3,11 @@
 {block name="button"}
 
 <!--{if auth("$classuri/add")}-->
-<button data-open="{:url('add')}" class='layui-btn layui-btn-sm'>添加规则</button>
+<button data-open="{:url('add')}" class='layui-btn layui-btn-sm layui-btn-primary'>添加规则</button>
 <!--{/if}-->
 
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'>删除规则</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'>删除规则</button>
 <!--{/if}-->
 
 {/block}
diff --git a/application/wechat/view/news/index.html b/application/wechat/view/news/index.html
index 8930a12cf..869fe7208 100644
--- a/application/wechat/view/news/index.html
+++ b/application/wechat/view/news/index.html
@@ -1,7 +1,7 @@
 {extend name='admin@public/content'}
 
 {block name="button"}
-<button data-open="{:url('add')}" class='layui-btn layui-btn-sm'>添加图文</button>
+<button data-open="{:url('add')}" class='layui-btn layui-btn-sm layui-btn-primary'>添加图文</button>
 {/block}
 
 {block name='content'}
diff --git a/application/wechat/view/tags/index.html b/application/wechat/view/tags/index.html
index 909bb16e8..ae81ac7e9 100644
--- a/application/wechat/view/tags/index.html
+++ b/application/wechat/view/tags/index.html
@@ -3,15 +3,15 @@
 {block name="button"}
 
 <!--{if auth("$classuri/add")}-->
-<button data-modal="{:url('add')}" data-title="添加标签" class='layui-btn layui-btn-sm'> 添加标签</button>
+<button data-modal="{:url('add')}" data-title="添加标签" class='layui-btn layui-btn-sm layui-btn-primary'> 添加标签</button>
 <!--{/if}-->
 
 <!--{if auth("$classuri/del")}-->
-<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-danger'> 删除标签</button>
+<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-sm layui-btn-primary'> 删除标签</button>
 <!--{/if}-->
 
 <!--{if auth("$classuri/sync")}-->
-<button data-load="{:url('sync')}" class='layui-btn layui-btn-sm'> 远程获取标签</button>
+<button data-load="{:url('sync')}" class='layui-btn layui-btn-sm layui-btn-primary'> 远程获取标签</button>
 <!--{/if}-->
 
 {/block}
diff --git a/extend/service/WechatService.php b/extend/service/WechatService.php
index cd8f28c38..a30f30031 100644
--- a/extend/service/WechatService.php
+++ b/extend/service/WechatService.php
@@ -135,12 +135,12 @@ class WechatService
                 if (isset($token['openid'])) {
                     session("{$appid}_openid", $openid = $token['openid']);
                     if (empty($fullMode) && request()->get('rcode')) {
-                        redirect(decode(request()->get('rcode')))->send();
+                        redirect(decode(request()->get('rcode')), [], 301)->send();
                     }
                     session("{$appid}_fansinfo", $fansinfo = $wechat->getUserInfo($token['access_token'], $openid));
                     empty($fansinfo) || FansService::set($fansinfo);
                 }
-                redirect(decode(request()->get('rcode')))->send();
+                redirect(decode(request()->get('rcode')), [], 301)->send();
                 break;
             case 'thr':
             default: