From 26332c174e8e62e7e2cd5b17fe8089b9135a8b8a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:04:04 +0800
Subject: [PATCH] 增加 省市区 查询条件

---
 src/app/layout/passport/passport.component.html |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html
index bd672de..4094310 100644
--- a/src/app/layout/passport/passport.component.html
+++ b/src/app/layout/passport/passport.component.html
@@ -2,8 +2,8 @@
     <div class="top">
         <div class="head">
             <a [routerLink]="['/']">
-                <img class="logo" src="./assets/img/logo-color.svg">
-                <span class="title">������������������������������</span>
+                <img class="logo" src="./assets/img/logo_44x44.png">
+                <span class="title">������������������������������������</span>
             </a>
         </div>
         <p class="desc"></p>
@@ -11,11 +11,7 @@
     <router-outlet></router-outlet>
     <global-footer>
         <ng-template #copyright>
-<<<<<<< HEAD
-            Copyright <nz-icon nzType="copyright"></nz-icon> 2018 <a href="http://www.7drlb.com/" target="_blank">������������</a>������
-=======
             Copyright <nz-icon nzType="copyright"></nz-icon> 2018 <a href="http://www.7drlb.com/" target="_blank">������������������������</a>
->>>>>>> 9e00209b2f1147759d4935e99f4c6ce3db0cb9a5
         </ng-template>
     </global-footer>
 </div>

--
Gitblit v1.8.0