From bdb8afdecc9605e4f3309463da0768c1c371bdfa Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 07 Apr 2020 18:06:09 +0800
Subject: [PATCH] 优化整合index.html 和 common.js中对layui的初始化
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html | 5 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/index.html | 33 ----------------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js | 26 ++++++++++++-
3 files changed, 26 insertions(+), 38 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
index 26ee5d1..a1536b3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/assets/js/common.js
@@ -2,11 +2,33 @@
layui.config({
base: '/module/'
}).extend({
+ formSelects: 'formSelects/formSelects-v4',
+ treetable: 'treetable-lay/treetable',
step: 'step-lay/step'
-}).use(['layer'], function () {
+}).use(['layer','config', 'index', 'element'], function () {
var $ = layui.jquery;
var layer = layui.layer;
+ let config = layui.config;
+ let index = layui.index;
+ let element = layui.element;
+ // 检查是否登录
+ if (!config.getToken() || config.getToken() == '') {
+ location.replace('login.html');
+ return;
+ }
+
+ // 检查多标签功能是否开启
+ index.checkPageTabs();
+
+ // 获取当前用户信息
+ index.getUser(function (user) {
+ $('.layui-layout-admin .layui-header').vm(user);
+ index.initLeftNav();
+ element.render('nav');
+ index.initRouter();
+ index.bindEvent();
+ });
// 加载设置的主题
var theme = layui.data('easyweb').theme;
if (theme) {
@@ -234,4 +256,4 @@
}
return true;
}
-};
\ No newline at end of file
+};
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/index.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/index.html
index 567d597..28c158c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/index.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/index.html
@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html>
-
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta charset="utf-8"/>
@@ -60,37 +59,5 @@
<script type="text/javascript" src="assets/libs/layui/layui.js"></script>
<script type="text/javascript" src="assets/js/common.js?v=1.0"></script>
<script type="text/javascript" src="assets/libs/zTree/js/jquery.ztree.all-3.5.min.js"></script>
-
-<script>
- layui.config({
- base: 'module/'
- }).extend({
- formSelects: 'formSelects/formSelects-v4',
- treetable: 'treetable-lay/treetable'
- }).use(['config', 'index', 'element'], function () {
- let config = layui.config;
- let index = layui.index;
- let element = layui.element;
-
- // 检查是否登录
- if (!config.getToken() || config.getToken() == '') {
- location.replace('login.html');
- return;
- }
-
- // 检查多标签功能是否开启
- index.checkPageTabs();
-
- // 获取当前用户信息
- index.getUser(function (user) {
- $('.layui-layout-admin .layui-header').vm(user);
- index.initLeftNav();
- element.render('nav');
- index.initRouter();
- index.bindEvent();
- });
- });
-</script>
</body>
-
</html>
\ No newline at end of file
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index e749314..4dfbc82 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -35,14 +35,13 @@
</div>
</script>
<script>
- layui.use(['form', 'table', 'util', 'config', 'admin', 'laydate'],function () {
+ layui.use(['table', 'util','admin', 'laydate','config','form'],function () {
let table = layui.table;
- let config = layui.config;
- let layer = layui.layer;
let util = layui.util;
let admin = layui.admin;
let form = layui.form;
let laydate = layui.laydate;
+ let config=layui.config;
//日期
laydate.render({
--
Gitblit v1.8.0