From 756c17f16619e26d8e77f4746f85751ac2d26183 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, 21 Jul 2021 10:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/oplog/index.html        | 2 +-
 app/admin/view/oplog/index_search.html | 4 ++--
 public/static/admin.js                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html
index bc4a3d956..19d5725b7 100644
--- a/app/admin/view/oplog/index.html
+++ b/app/admin/view/oplog/index.html
@@ -27,7 +27,7 @@
                 {field: 'node', title: '操作节点', sort: true},
                 {field: 'action', title: '操作行为', sort: true},
                 {field: 'content', title: '操作描述', sort: false},
-                {field: 'geoip', title: '访问IP地址', sort: true},
+                {field: 'geoip', title: '访问地址', sort: true},
                 {field: 'geoisp', title: '网络服务商', sort: false},
                 {field: 'create_at', title: '操作时间', sort: true},
             ]]
diff --git a/app/admin/view/oplog/index_search.html b/app/admin/view/oplog/index_search.html
index 9f3f93389..14d2960e6 100644
--- a/app/admin/view/oplog/index_search.html
+++ b/app/admin/view/oplog/index_search.html
@@ -33,9 +33,9 @@
             </label>
         </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">位置地址</label>
+            <label class="layui-form-label">访问地址</label>
             <label class="layui-input-inline">
-                <input name="geoip" value="{:input('get.geoip')}" placeholder="请输入位置地址" class="layui-input">
+                <input name="geoip" value="{:input('get.geoip')}" placeholder="请输入访问地址" class="layui-input">
             </label>
         </div>
         <div class="layui-form-item layui-inline">
diff --git a/public/static/admin.js b/public/static/admin.js
index 08479d024..d4f07b5eb 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -684,7 +684,7 @@ $(function () {
             // 搜索表单处理
             var search = options.search || this.dataset.targetSearch;
             if (search) $body.off('submit', 'form.form-search').on('submit', search, function () {
-                (data.page = 1), (data = $.extend(data, $(this).formToJson())), $(elem).trigger('reload');
+                (data = $.extend(data, $(this).formToJson())), $(elem).trigger('reload');
             });
             // 绑定重载事件
             $(this).bind('reload', function () {