From 659da36d6d2fa187ded5ef1f094d5a2c766aab04 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 26 Feb 2022 17:48:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=9D=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frame/breadcrumb/breadcrumb.html          |  2 +-
 .../components/frame/breadcrumb/breadcrumb.js | 21 +++++-
 public/components/frame/menu/menu.html        |  2 +-
 public/components/frame/menu/menu.js          |  3 +-
 public/index.html                             | 69 +++++++++++--------
 5 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/public/components/frame/breadcrumb/breadcrumb.html b/public/components/frame/breadcrumb/breadcrumb.html
index 9a4e1783e..57bbf0413 100755
--- a/public/components/frame/breadcrumb/breadcrumb.html
+++ b/public/components/frame/breadcrumb/breadcrumb.html
@@ -1,4 +1,4 @@
-<div id="breadcrumb" class="border-bottom white-bg" v-if="breadCrumbs.length > 0">
+<div id="breadcrumb" class="border-bottom white-bg" v-if="breadCrumbs.length > 0 && indexPage == '1'">
     <ul class="nav nav-tabs">
         <li class="nav-item" v-for="(item,index) in breadCrumbs">
             <span class="nav-link nav-link-breadcrumb" v-bind:class="{'active':item.active=='1'}" aria-current="page" @click="_changeSmallTab(item)">{{item.pageName}}
diff --git a/public/components/frame/breadcrumb/breadcrumb.js b/public/components/frame/breadcrumb/breadcrumb.js
index f141a3994..86e20f79d 100755
--- a/public/components/frame/breadcrumb/breadcrumb.js
+++ b/public/components/frame/breadcrumb/breadcrumb.js
@@ -5,7 +5,8 @@
     var vm = new Vue({
         el: '#breadcrumb',
         data: {
-            breadCrumbs: []
+            breadCrumbs: [],
+            indexPage: 1,
         },
         mounted: function() {
             //this._freshBreadCrumbByUrl();
@@ -14,7 +15,25 @@
                 // e.target matches elem
                 vm.breadCrumbs = [];
                 vm._freshBreadCrumbByUrl();
+
+                let _hash = location.hash
+
+                if (!_hash) {
+                    vm.indexPage = '0';
+                    return;
+                }
+                if (_hash.indexOf('?') != -1) {
+                    _hash = _hash.substring(0, _hash.indexOf('?'));
+                }
+
+                if (!_hash) {
+                    vm.indexPage = '0';
+                    return;
+                }
+                vm.indexPage = '1';
+
             }, false);
+
         },
         methods: {
             _freshBreadCrumbByUrl: function() {
diff --git a/public/components/frame/menu/menu.html b/public/components/frame/menu/menu.html
index 5f1d2e8c2..aa5c225cf 100755
--- a/public/components/frame/menu/menu.html
+++ b/public/components/frame/menu/menu.html
@@ -13,7 +13,7 @@
             </li>
 
             <li v-for="menu in menus" v-bind:class="{ active: menu.active }" :key="menu.id">
-                <a v-if="menu.childs != undefined && menu.childs.length >0" href="#" v-on:click="switchMenu(menu.id)">
+                <a v-if="menu.childs != undefined && menu.childs.length >0" href="javascript:void(0)" v-on:click="switchMenu(menu.id)">
                     <i class="fa " v-bind:class="menu.icon"></i>
                     <span class="nav-label">{{vc.i18n(menu.name)}}</span>
                     <span v-if="menu.label != undefined && menu.label != ''" class="float-right label label-primary">{{menu.label}}</span>
diff --git a/public/components/frame/menu/menu.js b/public/components/frame/menu/menu.js
index 83bbfac53..468c13f2e 100755
--- a/public/components/frame/menu/menu.js
+++ b/public/components/frame/menu/menu.js
@@ -60,7 +60,8 @@
                         _menus.sort(function(a, b) {
                             return a.seq - b.seq
                         });
-                        var _currentMenusId = vc.getCurrentMenu() == null ? _menus[0].id : vc.getCurrentMenu();
+                        //var _currentMenusId = vc.getCurrentMenu() == null ? _menus[0].id : vc.getCurrentMenu();
+                        let _currentMenusId = _menus[0].id;
                         vm.menus = vm.refreshMenuActive(_menus, _currentMenusId);
                         vc.setMenus(vm.menus);
                         vm.miniMenu();
diff --git a/public/index.html b/public/index.html
index c0f18d9ba..d885ce545 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,20 +1,52 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:vc="http://www.thymeleaf.org">
+<html>
 
 <head>
+    <meta charset="UTF-8">
     <meta charset="UTF-8" />
     <title>HC智慧物业管理系统</title>
     <vc:create path="frame/commonTop" location="head"></vc:create>
+    <!-- import CSS -->
+
     <link rel="stylesheet" href="/css/bootstrap/bootstrap.min.css" />
+    <link href="/font-awesome/css/font-awesome.css" rel="stylesheet" />
+    <link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
+    <link href="/css/animate.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css" />
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-select.min.css" />
     <link rel="stylesheet" href="/css/toastr.css" />
+    <!-- SUMMERNOTE 富文本组件-->
+    <link href="/css/plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
+    <link href="/css/plugins/jsTree/style.min.css" rel="stylesheet">
     <link rel="stylesheet" href="/css/vc-ui.css" />
+    <link rel="stylesheet" href="/css/plugins/bootstrap-submenu/bootstrap-submenu.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/popper.min.js"></script>
     <script src="/js/bootstrap/bootstrap.min.js"></script>
     <script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
+    <script src="/js/bootstrap/bootstrap-select.min.js"></script>
+    <script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
+    <script src="/js/bootstrap/bootstrap-submenu.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>
+
+    <script src="/js/plugins/summernote/summernote-bs4.min.js"></script>
+    <script src="/js/plugins/summernote/summernote-zh-CN.min.js"></script>
+    <script src="/js/plugins/xss/xss.min.js"></script>
+    <link href="/css/jquery.step.css" rel="stylesheet" />
+    <script src="/js/jquery.step.min.js"></script>
+    <link rel="stylesheet" href="/css/bootstrap/bootstrap-treeview.min.css" />
+    <script src="/js/bootstrap/bootstrap-treeview.min.js"></script>
+    <script src="/js/plugins/qrcode/qrcode.min.js"></script>
     <script src="/js/toastr.min.js"></script>
+    <script src="/js/plugins/jsTree/jstree.min.js"></script>
+    <!-- QQMap 腾讯地图KEY-->
+    <script src="https://map.qq.com/api/gljs?v=1.exp&key="></script>
 </head>
 
 <body class="vc-body">
@@ -25,39 +57,22 @@
             <div class="border-bottom">
                 <vc:create path="frame/nav"></vc:create>
             </div>
-            <div id="component" class="vc-wrapper vc-content" vc-path="/common/chooseEnterCommunity">
+            <div class="vc-wrapper vc-content padding-top-xs" style="padding-bottom: 0px;">
+                <vc:create path="frame/breadcrumb"></vc:create>
+            </div>
+            <!--  -->
+            <div id="component" class="vc-wrapper vc-content padding-top-xs animated fadeInRight" vc-path="/common/chooseEnterCommunity">
                 <vc:create path="/pages/property/indexContext"></vc:create>
             </div>
 
-
             <vc:create path="frame/copyright"></vc:create>
 
         </div>
     </div>
-    <link href="/font-awesome/css/font-awesome.css" rel="stylesheet" />
-    <link href="/css/plugins/select2/select2.min.css" rel="stylesheet">
-    <link href="/css/animate.css" rel="stylesheet" />
-    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css" />
-    <!-- SUMMERNOTE 富文本组件-->
-    <link href="/css/plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
-
-    <vc:create path="frame/commonBottom" location="body"></vc:create>
-
-    <script src="/js/plugins/summernote/summernote-bs4.min.js"></script>
-    <script src="/js/plugins/summernote/summernote-zh-CN.min.js"></script>
-    <script src="/js/plugins/xss/xss.min.js"></script>
-    <link href="/css/jquery.step.css" rel="stylesheet" />
-    <script src="/js/jquery.step.min.js"></script>
-    <link rel="stylesheet" href="/css/bootstrap/bootstrap-treeview.min.css" />
-    <script src="/js/bootstrap/bootstrap-treeview.min.js"></script>
-    <script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script src="/js/bootstrap/bootstrap-submenu.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>
-    <script src="/vcCore/vc-zh.js"></script>
-    <script src="/vcCore/vcFramework.js"></script>
-
 </body>
+<script src="/vcCore/vc-zh.js"></script>
+<script src="/js/jessibuca/renderer.js"></script>
+<script src="/vcCore/vcFramework.js"></script>
+<vc:create path="frame/commonBottom" location="body"></vc:create>
 
 </html>
\ No newline at end of file