From 6d8a43de07062234a05716fcbb94273709cab21e Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期二, 16 七月 2019 17:04:36 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/menu/menu.js | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/WebService/src/main/resources/components/menu/menu.js b/WebService/src/main/resources/components/menu/menu.js
index f657ab3..8814c25 100644
--- a/WebService/src/main/resources/components/menu/menu.js
+++ b/WebService/src/main/resources/components/menu/menu.js
@@ -16,6 +16,7 @@
var _tmpMenus = vc.getMenus();
//娴忚鍣ㄧ紦瀛樹腑鑳借幏鍙栧埌
if(_tmpMenus != null && _tmpMenus != undefined){
+ this.miniMenu();
this.menus = _tmpMenus;
return ;
}
@@ -32,9 +33,16 @@
param,
function(json,res){
var _menus = JSON.parse(json);
+ if(_menus == null || _menus.length == 0){
+ return ;
+ }
+ _menus.sort(function(a,b){
+ return a.seq - b.seq
+ });
var _currentMenusId = vc.getCurrentMenu() == null?_menus[0].id:vc.getCurrentMenu();
vm.menus = vm.refreshMenuActive(_menus,_currentMenusId);
vc.setMenus(vm.menus);
+ vm.miniMenu();
},function(errInfo,error){
console.log('璇锋眰澶辫触澶勭悊');
}
@@ -42,6 +50,15 @@
},
refreshMenuActive:function(jsonArray,_id){
for(var menuIndex =0 ; menuIndex < jsonArray.length;menuIndex ++){
+
+ if(jsonArray[menuIndex].hasOwnProperty('childs')){
+ var _childs = jsonArray[menuIndex].childs;
+ _childs.sort(function(_child,_newChild){
+ return _child.seq - _newChild.seq
+ });
+ jsonArray[menuIndex].childs = _childs;
+ }
+
if(_id === jsonArray[menuIndex].id){
if(jsonArray[menuIndex].active === true){
//濡傛灉褰撳墠鏈韩鏄墦寮�鐘舵�侊紝璇存槑 闇�瑕佸叧闂�
@@ -54,6 +71,8 @@
jsonArray[menuIndex].active=false;
}
+
+
return jsonArray;
},
switchMenu:function(_id){
@@ -61,7 +80,12 @@
vc.setCurrentMenu(_id);
vm.menus = vm.refreshMenuActive(vm.menus,_id);
vc.setMenus(vm.menus);
+ },
+ miniMenu:function(){
+ $("body").toggleClass("mini-navbar");
+ //SmoothlyMenu();
}
+
},
});
--
Gitblit v1.8.0