From a2bd66a59a51c84100474d1ce3eb79d7ed3b754e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 15:57:06 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/layout/default/header/header.component.html | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/app/layout/default/header/header.component.html b/src/app/layout/default/header/header.component.html
index 1c81766..e802cb1 100644
--- a/src/app/layout/default/header/header.component.html
+++ b/src/app/layout/default/header/header.component.html
@@ -21,19 +21,19 @@
</li>
-->
<!-- Lock Page -->
- <li class="hidden-xs">
+ <!-- <li class="hidden-xs">
<div class="item" [routerLink]="['/pages/lock']">
<i class="anticon anticon-lock"></i>
</div>
- </li>
+ </li> -->
<!-- Search Button -->
- <li class="header-search__btn" (click)="searchToggleChange()">
+ <!-- <li class="header-search__btn" (click)="searchToggleChange()">
<div class="item">
<i class="anticon anticon-search"></i>
</div>
- </li>
+ </li> -->
</ul>
- <header-search class="header-search" [toggleChange]="searchToggleStatus"></header-search>
+ <!-- <header-search class="header-search" [toggleChange]="searchToggleStatus"></header-search> -->
<ul class="top-nav">
<!-- Notify -->
<!--
@@ -80,5 +80,10 @@
<li class="hidden-xs">
<header-user></header-user>
</li>
+ <li class="hidden-xs">
+ <button nz-button [nzType]="'primary'" (click)="backToWin()">
+ <span>������</span>
+ </button>
+ </li>
</ul>
</div>
--
Gitblit v1.8.0