From 9a030ef450517f525ca3d99daad80341ef2da69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com>
Date: Mon, 31 Aug 2020 03:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20currentUser=20=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 component/pear/module/admin.js | 8 ++++----
 component/pear/module/menu.js  | 2 +-
 index.html                     | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js
index a046db0..af05ca5 100644
--- a/component/pear/module/admin.js
+++ b/component/pear/module/admin.js
@@ -14,10 +14,10 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
 		var bodyTab;
 
 		var pearAdmin = new function() {
-			this.render = function() {
+			this.render = function(option) {
 				readConfig().then(function(param){
 					pearAdmin.logoRender(param);
-					pearAdmin.menuRender(param);
+					pearAdmin.menuRender(param,option);
 					pearAdmin.bodyRender(param);
 					pearAdmin.themeRender(param);
 					pearAdmin.keepLoad(param);
@@ -29,7 +29,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
 				$(".layui-logo .title").html(param.logo.title);
 			}
 			
-			this.menuRender = function(param) {
+			this.menuRender = function(param,option) {
 				sideMenu = pearMenu.render({
 					elem: 'sideMenu',
 					async: true,
@@ -38,7 +38,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
 					control: param.menu.control ? 'control' : false, // control 
 					defaultMenu: 0,
 					accordion: param.menu.accordion,
-					url: param.menu.data,
+					url: param.menu.data+"?currentUser="+option.currentUser,
 					parseData: false,
 					change:function(){
 						compatible();
diff --git a/component/pear/module/menu.js b/component/pear/module/menu.js
index 76aefd1..8d513bd 100644
--- a/component/pear/module/menu.js
+++ b/component/pear/module/menu.js
@@ -149,7 +149,7 @@ layui.define(['table', 'jquery', 'element'], function(exports) {
 	function getData(url) {
 		$.ajaxSettings.async = false;
 		var data = null;
-		$.get(url+"?fresh=" + Math.random(), function(result) {
+		$.get(url+"&fresh=" + Math.random(), function(result) {
 			data = result;
 		});
 		$.ajaxSettings.async = true;
diff --git a/index.html b/index.html
index eaa46c2..f979c58 100644
--- a/index.html
+++ b/index.html
@@ -71,7 +71,9 @@
 				var admin = layui.admin;
 
                 // 框 架 初 始 化
-				admin.render();
+				admin.render({currentUser:"admin"});
+				
+				// currentUser 用户标识，携带在 menu 的请求参数中，便于不同用户的菜单数据获取
 			})
 		</script>
 	</body>