From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/header.html | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/header.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/header.html
index a7dd0cd..ff1c06e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/header.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/header.html
@@ -15,19 +15,20 @@
<!-- <li class="layui-nav-item" lay-unselect>
<a id="btnMessage" title="消息"><i class="layui-icon layui-icon-notice"></i></a>
</li> -->
- <li class="layui-nav-item" lay-unselect>
- <a title="消息"><i class="layui-icon layui-icon-notice" id="organization">1231</i></a>
- </li>
<li class="layui-nav-item layui-hide-xs" lay-unselect>
<a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>
</li>
<li class="layui-nav-item" lay-unselect>
<a>
- <!--<img src="assets/images/head.png" class="layui-nav-img">-->
<img p-bind="src:{{headImgUrl}}" class="layui-nav-img">
<!--add by owen 修复页面显示问题 -->
<!--<cite>{{username}}</cite>-->
- <cite>{{nickname}}</cite>
+ <cite>
+ {{organizations[1].orgName}}
+ </cite>
+ <cite>
+ {{username}}
+ </cite>
</a>
<dl class="layui-nav-child">
<dd lay-unselect>
@@ -42,17 +43,4 @@
</dd>
</dl>
</li>
-<!-- <li class="layui-nav-item" lay-unselect>-->
-<!-- <a ew-event="theme" title="主题"><i class="layui-icon layui-icon-more-vertical"></i></a>-->
-<!-- </li>-->
-</ul>
-<script>
- layui.use([ 'admin'], function () {
- var admin = layui.admin
- , $ = layui.jquery;
- var organization=admin.getTempData("organization");
- $("#organization").html("wer");
- console.log($("#organization").html())
- })
-
-</script>
\ No newline at end of file
+</ul>
\ No newline at end of file
--
Gitblit v1.8.0