From bdba9b8584dd9e96671a69c07872c10b17b5c05d Mon Sep 17 00:00:00 2001
From: "759675757@qq.com" <vwIItm887QeIbFRg>
Date: Thu, 26 Dec 2019 16:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/layuimodule/iconPicker/iconPickerFa.js        | 3 ---
 .../resources/static/js/layuimodule/layuimini/layuimini.js  | 4 +---
 .../main/resources/static/js/layuimodule/splayer/splayer.js | 4 ++--
 .../main/resources/static/js/layuimodule/sptable/sptable.js | 4 ++--
 .../static/js/layuimodule/treetable-lay/treetable.js        | 6 +++---
 sparchetype/src/main/resources/templates/common/common.ftl  | 2 +-
 sparchetype/src/main/resources/templates/index.ftl          | 3 ++-
 sparchetype/src/main/resources/templates/login.ftl          | 3 ++-
 .../src/main/resources/templates/system/tool/iconPicker.ftl | 1 -
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js b/sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js
index 8aea4a8..6a1eb92 100644
--- a/sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js
+++ b/sparchetype/src/main/resources/static/js/layuimodule/iconPicker/iconPickerFa.js
@@ -3,7 +3,6 @@
  * @author wujiawei0926@yeah.net chung@99php.cn
  * @version 1.1
  */
-
 layui.define(['laypage', 'form'], function (exports) {
     "use strict";
 
@@ -92,10 +91,8 @@ layui.define(['laypage', 'form'], function (exports) {
                 // 默认图标
                 if (ORIGINAL_ELEM_VALUE === '') {
                     ORIGINAL_ELEM_VALUE = 'fa-adjust';
-
                 }
 
-
                 oriIcon = '<i class="fa ' + ORIGINAL_ELEM_VALUE + '">';
 
                 oriIcon += '</i>';
diff --git a/sparchetype/src/main/resources/static/js/layuimodule/layuimini/layuimini.js b/sparchetype/src/main/resources/static/js/layuimodule/layuimini/layuimini.js
index f49103a..39afbfa 100644
--- a/sparchetype/src/main/resources/static/js/layuimodule/layuimini/layuimini.js
+++ b/sparchetype/src/main/resources/static/js/layuimodule/layuimini/layuimini.js
@@ -652,8 +652,6 @@ layui.define(["element", "jquery"], function (exports) {
                 }
             }).resize();
         };
-
-
     };
 
     /**
@@ -902,7 +900,7 @@ layui.define(["element", "jquery"], function (exports) {
             area: ['340px', clientHeight + 'px'],
             offset: 'rb',
             content: html,
-            end:function () {
+            end: function () {
                 $('.layuimini-select-bgcolor').removeClass('layui-this');
             }
         });
diff --git a/sparchetype/src/main/resources/static/js/layuimodule/splayer/splayer.js b/sparchetype/src/main/resources/static/js/layuimodule/splayer/splayer.js
index 6da0da8..2dbcebb 100644
--- a/sparchetype/src/main/resources/static/js/layuimodule/splayer/splayer.js
+++ b/sparchetype/src/main/resources/static/js/layuimodule/splayer/splayer.js
@@ -4,8 +4,8 @@
  * description: 扩展layui弹出框 框架扩展
  */
 layui.define(['layer'], function (exports) {
-    var $ = layui.jquery;
-    var layer = layui.layer;
+    var $ = layui.jquery,
+        layer = layui.layer;
 
     var splayer = {
         // 渲染弹出框
diff --git a/sparchetype/src/main/resources/static/js/layuimodule/sptable/sptable.js b/sparchetype/src/main/resources/static/js/layuimodule/sptable/sptable.js
index f2d0a45..7a70044 100644
--- a/sparchetype/src/main/resources/static/js/layuimodule/sptable/sptable.js
+++ b/sparchetype/src/main/resources/static/js/layuimodule/sptable/sptable.js
@@ -4,8 +4,8 @@
  * description: 扩展layui数据表格 框架扩展
  */
 layui.define(['table'], function (exports) {
-    var $ = layui.jquery;
-    var table = layui.table;
+    var $ = layui.jquery,
+        table = layui.table;
 
     var sptable = {
         // 渲染表格
diff --git a/sparchetype/src/main/resources/static/js/layuimodule/treetable-lay/treetable.js b/sparchetype/src/main/resources/static/js/layuimodule/treetable-lay/treetable.js
index e38a5e1..8af342d 100644
--- a/sparchetype/src/main/resources/static/js/layuimodule/treetable-lay/treetable.js
+++ b/sparchetype/src/main/resources/static/js/layuimodule/treetable-lay/treetable.js
@@ -1,7 +1,7 @@
 layui.define(['layer', 'table'], function (exports) {
-    var $ = layui.jquery;
-    var layer = layui.layer;
-    var table = layui.table;
+    var $ = layui.jquery,
+        layer = layui.layer,
+        table = layui.table;
 
     var treetable = {
         // 渲染树形表格
diff --git a/sparchetype/src/main/resources/templates/common/common.ftl b/sparchetype/src/main/resources/templates/common/common.ftl
index 6bdf13b..195eb03 100644
--- a/sparchetype/src/main/resources/templates/common/common.ftl
+++ b/sparchetype/src/main/resources/templates/common/common.ftl
@@ -7,7 +7,7 @@
 <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
 <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
 <![endif]-->
-<script src="${request.contextPath}/lib/jquery/jquery-3.4.1.min.js" charset="utf-8"></script>
+<#--<script src="${request.contextPath}/lib/jquery/jquery-3.4.1.min.js" charset="utf-8"></script>-->
 <script src="${request.contextPath}/lib/layui/layui.js?v=v2.5.5" charset="utf-8"></script>
 <script src="${request.contextPath}/js/spUtil.js?v=1.0.0" charset="utf-8"></script>
 <script src="${request.contextPath}/js/layuimodule/config.js?v=1.0.0" charset="utf-8"></script>
\ No newline at end of file
diff --git a/sparchetype/src/main/resources/templates/index.ftl b/sparchetype/src/main/resources/templates/index.ftl
index e2bdddc..c9d8a70 100644
--- a/sparchetype/src/main/resources/templates/index.ftl
+++ b/sparchetype/src/main/resources/templates/index.ftl
@@ -90,7 +90,8 @@
 </div>
 <script>
     layui.use(['element', 'layer', 'layuimini'], function () {
-        var element = layui.element,
+        var $ = layui.$,
+            element = layui.element,
             layer = layui.layer;
 
         layuimini.init('${request.contextPath}/json/init.json');
diff --git a/sparchetype/src/main/resources/templates/login.ftl b/sparchetype/src/main/resources/templates/login.ftl
index 6ecac69..c6c53af 100644
--- a/sparchetype/src/main/resources/templates/login.ftl
+++ b/sparchetype/src/main/resources/templates/login.ftl
@@ -62,7 +62,8 @@
 <script src="${request.contextPath}/lib/jq-module/jquery.particleground.min.js" charset="utf-8"></script>
 <script>
     layui.use(['form'], function () {
-        var form = layui.form,
+        var $ = layui.$,
+            form = layui.form,
             layer = layui.layer;
 
         // 登录过期的时候，跳出ifram框架
diff --git a/sparchetype/src/main/resources/templates/system/tool/iconPicker.ftl b/sparchetype/src/main/resources/templates/system/tool/iconPicker.ftl
index 7ea58b4..0c14252 100644
--- a/sparchetype/src/main/resources/templates/system/tool/iconPicker.ftl
+++ b/sparchetype/src/main/resources/templates/system/tool/iconPicker.ftl
@@ -59,7 +59,6 @@
 
     </div>
 </div>
-<script src="${request.contextPath}/static/js/layui-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
     layui.use(['iconPickerFa', 'form', 'layer'], function () {
         var iconPickerFa = layui.iconPickerFa,