From 8d51f38a50e526cc48cdbd7a43962cf10a964cc9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 8 Mar 2020 01:55:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vcFramework=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E7=8E=B0=E5=9C=A8=E5=BA=94=E8=AF=A5=E5=B0=B1?=
 =?UTF-8?q?=E6=98=AF=E5=85=A8=E6=B5=81=E7=A8=8B=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/admin.html                          | 19 ++++++++++++++---
 public/components/commonTop/commonTop.html | 24 +---------------------
 public/css/common.css                      |  1 +
 public/index.html                          | 21 ++++++++++++++++---
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/public/admin.html b/public/admin.html
index 9a372bdbc..4e6aa44e0 100644
--- a/public/admin.html
+++ b/public/admin.html
@@ -7,13 +7,26 @@
     <meta charset="UTF-8"/>
     <title>HC小区管理系统|java110</title>
     <vc:create name="commonTop" location= "head"></vc:create>
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap.min.css"/>
+    <link href="/font-awesome/css/font-awesome.css" rel="stylesheet"/>
+    <!-- Toastr style -->
+    <link href="/css/plugins/toastr/toastr.min.css" rel="stylesheet"/>
+    <!-- Gritter -->
+    <link href="/js/plugins/gritter/jquery.gritter.css" rel="stylesheet"/>
+    <link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet"/>
+    <link href="/css/style.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="/css/common.css"/>
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
+
+    <script  src="/js/bootstrap/jquery-3.3.1.min.js"></script>
+    <script  src="/js/vue/vue.min.js"></script>
+    <script  src="/js/vue/vue-resource.min.js"></script>
     <script  src="/js/bootstrap/jquery-3.3.1.min.js"></script>
     <script  src="/js/vue/vue.min.js"></script>
     <script  src="/js/vue/vue-resource.min.js"></script>
-    <!-- <script src="/vcCore/core.js"></script> -->
     <script src="/js/popper.min.js"></script>
     <script src="/js/bootstrap/bootstrap.min.js"></script>
-    <!--<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>-->
     <script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
     <script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
     <script src="/js/plugins/select2/select2.full.min.js"></script>
@@ -27,7 +40,7 @@
 
 
     <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
+        <div class="border-bottom">
             <vc:create name="nav"></vc:create>
         </div>
         <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
diff --git a/public/components/commonTop/commonTop.html b/public/components/commonTop/commonTop.html
index 38d0a93dd..3a9d8a482 100644
--- a/public/components/commonTop/commonTop.html
+++ b/public/components/commonTop/commonTop.html
@@ -1,27 +1,5 @@
-<link rel="stylesheet" href="/css/bootstrap/bootstrap.min.css"/>
-<link href="/font-awesome/css/font-awesome.css" rel="stylesheet"/>
-<!-- Toastr style -->
-<link href="/css/plugins/toastr/toastr.min.css" rel="stylesheet"/>
-<!-- Gritter -->
-<link href="/js/plugins/gritter/jquery.gritter.css" rel="stylesheet"/>
-<link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
-<link href="/css/animate.css" rel="stylesheet"/>
-<link href="/css/style.css" rel="stylesheet"/>
-<link rel="stylesheet" href="/css/common.css"/>
-<link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
-
-<script  src="/js/bootstrap/jquery-3.3.1.min.js"></script>
-<!-- <script  src="/js/vue/vue.min.js"></script>
-<script  src="/js/vue/vue-resource.min.js"></script>
-<script src="/vcCore/core.js"></script> -->
-<!-- <script src="/vcCore/vc-constant.js"></script> -->
 <script src="/vcCore/vc-validate.js"></script>
-<script src="/js/popper.min.js"></script>
-<script src="/js/bootstrap/bootstrap.min.js"></script>
-<!--<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>-->
-<!-- <script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
-<script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
-<script src="/js/plugins/select2/select2.full.min.js"></script> -->
+
 
 
 <script type="text/javascript">
diff --git a/public/css/common.css b/public/css/common.css
index fa792f899..b83b640fb 100644
--- a/public/css/common.css
+++ b/public/css/common.css
@@ -120,3 +120,4 @@
     font-size: 24px;
     color: #888;
 }
+
diff --git a/public/index.html b/public/index.html
index 67b69363b..8f6349b3c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,18 +7,32 @@
     <meta charset="UTF-8"/>
     <title>HC小区管理系统|java110</title>
     <vc:create name="commonTop" location= "head"></vc:create>
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap.min.css"/>
+    <link href="/font-awesome/css/font-awesome.css" rel="stylesheet"/>
+    <!-- Toastr style -->
+    <link href="/css/plugins/toastr/toastr.min.css" rel="stylesheet"/>
+    <!-- Gritter -->
+    <link href="/js/plugins/gritter/jquery.gritter.css" rel="stylesheet"/>
+    <link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet"/>
+    <link href="/css/style.css" rel="stylesheet"/>
+    <link rel="stylesheet" href="/css/common.css"/>
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
+
+    <script  src="/js/bootstrap/jquery-3.3.1.min.js"></script>
+    <script  src="/js/vue/vue.min.js"></script>
+    <script  src="/js/vue/vue-resource.min.js"></script>
     <script  src="/js/bootstrap/jquery-3.3.1.min.js"></script>
     <script  src="/js/vue/vue.min.js"></script>
     <script  src="/js/vue/vue-resource.min.js"></script>
-    <!-- <script src="/vcCore/core.js"></script> -->
     <script src="/js/popper.min.js"></script>
     <script src="/js/bootstrap/bootstrap.min.js"></script>
-    <!--<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>-->
     <script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
     <script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
     <script src="/js/plugins/select2/select2.full.min.js"></script>
     <script src="/js/plugins/echart/echarts.min.js"></script>
     <script src="/js/plugins/echart/china.js"></script>
+
 </head>
 <body>
 <vc:create name="loading"></vc:create>
@@ -27,7 +41,7 @@
 
 
     <div id="page-wrapper" class="gray-bg dashbard-1">
-        <div class="row border-bottom">
+        <div class="border-bottom">
             <vc:create name="nav"></vc:create>
         </div>
 
@@ -38,6 +52,7 @@
 
     </div>
 </div>
+<script src="/js/inspinia.js"></script>
 <script src="/vcCore/vcFramework.js"></script>
 <vc:create name="commonBottom" location="body"></vc:create>
 </body>