color

src/app/app.scss

@@ -33,6 +33,9 @@ p{
 .bgc-fff{
   background-color: #fff;
 }
+.bgc-19b5ff{
+  background-color: #19b5ff;
+}
 .submit-btn{
   height: 40px;
   margin-bottom: 15px;
@@ -150,6 +153,9 @@ ion-icon {
 .header-ios .toolbar-ios:last-child .toolbar-background-ios{
   border-bottom: 1px solid #e5e5e5;
 }
+.toolbar-ios ion-title{
+  padding: 0;
+}
 .space{
   background-color: #ebedf2;
   height: 10px;

src/pages/activity-track/joinDetail/joinDetail.html

 <ion-header>
     <ion-navbar>
-        <ion-title text-center>处室可报名人员参与情况</ion-title>
+        <ion-title class="padding-0" text-center>处室可报名人员参与情况</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content class="content">

src/pages/chooseAddress/chooseAddress.html

 <ion-header>
-  <ion-toolbar>
-    <div class="searchToolBar">
-        <button ion-button clear small navPop style="padding: 0;">
-            <img class="back-btn" src="./assets/imgs/back.png" />
-          </button>
-          <div class="search-header">
-            <ion-input type="text" placeholder="按地点搜索" [(ngModel)]="searchValue" (ionChange)="searchAddress()"></ion-input>
-            <ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon>
-          </div>
-    </div>
-  </ion-toolbar>
+  <ion-navbar>
+    <ion-navbar>
+      <div class="search-header">
+        <ion-input type="text" placeholder="按地点搜索" [(ngModel)]="searchValue" (ionChange)="searchAddress()"></ion-input>
+        <ion-icon name="close" class="clear" (click)="clearValue()"></ion-icon>
+      </div>
+    </ion-navbar>
+  </ion-navbar>
+
   <div class="pageMenuSlides">
     <div class="swiper-container">
       <div class="swiper-wrapper">
@@ -21,9 +19,8 @@
   </div>
 </ion-header>
 <ion-content>
-  <div class="box">
 
-  </div>
+
 
   <ion-content *ngIf="isSearch">
     <div class="city-item"  *ngFor="let area of searchAreaAll" id="{{area.inorout}}">
@@ -69,15 +66,6 @@
             </ng-container>
           </ng-container>
         </ion-item>
-
-        <!--<div class="city-item"  *ngFor="let area of outerAreaAll" id="{{area.code}}1">-->
-          <!--&lt;!&ndash;<div class="city-title">{{area.code}}</div>&ndash;&gt;-->
-          <!--<div class="city-box">-->
-            <!--&lt;!&ndash;<div class="city" *ngFor="let item of area.list">&ndash;&gt;-->
-              <!--<span (click)="selectedCity(area)">{{area.areaName}}</span>-->
-            <!--&lt;!&ndash;</div>&ndash;&gt;-->
-          <!--</div>-->
-        <!--</div>-->
       </ion-content>
     </ion-slide>
   </ion-slides>

src/pages/chooseAddress/chooseAddress.scss

@@ -25,6 +25,7 @@ page-chooseAddress {
         height: 15px;
         border-radius: 15px;
         text-align: center;
+      margin-right: 10px;
     }
 
     .pageMenuSlides{  
@@ -107,5 +108,13 @@ page-chooseAddress {
         width: 30px;
         height: 30px;
     }
+
+  .text-input::-webkit-input-placeholder{
+    color:#fff;
+  }
+
+  .header-ios .toolbar-ios:last-child .toolbar-background-ios{
+    border: none;
+  }
    
 }

src/pages/chooseAddress/chooseAddress.ts

@@ -16,6 +16,8 @@ declare var Swiper;
 export class ChooseAddressPage {
   swiper: any;
 
+    changeType = 1;
+
   //ViewChild传入一个字符串contentSlides，变量contentSlides接收。其它不变  
   @ViewChild('contentSlides') contentSlides: Slides;
   @ViewChild('content1') content1: Content;

src/pages/contact/block-list/block-list.html

@@ -22,8 +22,6 @@
             <div class="contact-box-right">
               <div>
                 <span class="contact-name">{{contactPerson.name}}</span>
-                <ion-icon name="male" class="contact-sex male" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null"></ion-icon>
-                <ion-icon name="female" class="contact-sex female" *ngIf="contactPerson.gender =='0'"></ion-icon>
               </div>
               <div class="contact-organization">{{contactPerson.orgName}}</div>
               <div>

src/pages/report/outGoingReportDetail/outGoingReportDetail.ts

@@ -119,11 +119,12 @@ export class OutGoingReportDetailPage {
 
   }
 
-  ngOnInit():void{
-
-
-
-  }
+    ionViewDidEnter() {
+        const length = this.navCtrl.length();
+        if(length > 5){
+            this.navCtrl.remove(3, length-4);
+        }
+    }
 
   //添加地点
   addAddress(){

src/pages/report/outGoingReportEdit/outGoingReportEdit.html

@@ -28,22 +28,18 @@
       </div>
     </ion-item>
     <ion-item>
-      <!-- <div class="report-item">
-        <div class="report-item-title">离沪</div>
-        <img class="right-icon" src="./assets/imgs/right.png" *ngIf="isLeave" (click)="chooseLeave(1)">
-        <img class="right-icon" src="./assets/imgs/right-grey.png" *ngIf="!isLeave" (click)="chooseLeave(0)">
-      </div> -->
 
-      <div class="report-item">
-        <div class="report-item-title">不离沪</div>
-        <img class="right-icon" src="./assets/imgs/right.png" *ngIf="!isLeave" (click)="chooseLeave(0)">
-        <img class="right-icon" src="./assets/imgs/right-grey.png" *ngIf="isLeave" (click)="chooseLeave(1)">
-       
-        <div class="report-item-title">离沪</div>
-        
-        <img class="right-icon" src="./assets/imgs/right.png" *ngIf="isLeave" (click)="chooseLeave(1)">
-        <img class="right-icon" src="./assets/imgs/right-grey.png" *ngIf="!isLeave" (click)="chooseLeave(0)">
-        
+      <div class="choose-item">
+        <div (click)="chooseLeave(1)" class="report-item-title {{ !isLeave?'isLeave':'notLeave' }}">
+          不离沪
+          <img *ngIf="!isLeave" class="right-icon" src="./assets/imgs/right-white.png"  >
+        </div>
+
+
+        <div (click)="chooseLeave(0)" class="report-item-title {{ isLeave?'isLeave':'notLeave' }}">
+          离沪
+          <img *ngIf="isLeave" class="right-icon" src="./assets/imgs/right-white.png"  >
+        </div>
       </div>
 
     </ion-item>
@@ -81,7 +77,7 @@
           {{premanager.managerDesc}}
 				</p>
 			</div>
-			<button ion-button block (click)="hidden()">
+			<button style="width: 100%;" class="submit-btn submit" (click)="hidden()">
 				关闭
 			</button>
 		</div>

src/pages/report/outGoingReportEdit/outGoingReportEdit.scss

 page-outGoingReportEdit {
-    .submit{
-        margin-top: 20px;
-        border: 1px solid #34b4fc;
-        background-color: #34b4fc;
-    }
-    .searchToolBar{
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: left;
-        box-sizing: border-box;
-    }
-    
-.item1-image{
+  .submit {
+    margin-top: 20px;
+    border: 1px solid #34b4fc;
+    background-color: #34b4fc;
+  }
+  .searchToolBar {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: left;
+    box-sizing: border-box;
+  }
+
+  .item1-image {
     width: 100%;
     height: 135px;
-}
+  }
 
-.item1-content{
+  .item1-content {
     margin-top: 12px;
-}
+  }
 
-.item1-content-header{
+  .item1-content-header {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
     justify-content: space-between;
     box-sizing: border-box;
-}
+  }
 
-.item1-title{
+  .item1-title {
     margin-left: 15px;
     font-size: 18px;
     font-weight: bold;
     width: 12em;
-    line-height:18px;
-}
+    line-height: 18px;
+  }
 
-.item1-content-box{
+  .item1-content-box {
     display: flex;
     flex-direction: row;
     align-items: flex-end;
@@ -46,80 +46,101 @@ page-outGoingReportEdit {
     margin-right: 15px;
     color: #80a7ee;
     font-size: 16px;
-    line-height:18px;
-}
+    line-height: 18px;
+  }
 
-.item1-introduction{
+  .item1-introduction {
     margin: 0 15px;
     color: #9d9d9d;
     padding-bottom: 10px;
     line-height: 25px;
-}
+  }
 
-.btn-introduce{
+  .btn-introduce {
     background-color: white;
     padding: 3px 7px;
     border: 1px solid #cccccc;
     border-radius: 10px;
     float: right;
     color: #666666;
-}
+  }
 
-.report-info{
+  .report-info {
     font-size: 18px;
-}
+  }
 
-.report-item{
+  .report-item {
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
     box-sizing: border-box;
     color: #666666;
-}
+  }
 
-.report-item-title{
-    margin-right: 20px;
-}
-.report-btn{
+  .choose-item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    .report-item-title{
+      height: 40px;
+      width: 50%;
+      text-align: center;
+      padding: 5px 0;
+    }
+    img{
+      vertical-align: middle;
+    }
+    .isLeave{
+      background-color: #19b5ff;
+      color: #ffffff;
+    }
+    .notLeave{
+      background-color: #eaebec;
+      color:#474747;;
+    }
+  }
+
+
+  .report-btn {
     position: absolute;
     bottom: 0;
-}
-.right-icon{
+  }
+  .right-icon {
     width: 30px;
     height: 30px;
-}
+  }
 
-.report-item-content{
+  .report-item-content {
     display: flex;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
     box-sizing: border-box;
-}
+  }
 
-.cover{
+  .cover {
     position: relative;
     width: 100%;
     height: 100%;
     background: rgba(0, 0, 0, 0.4);
     // opacity: 0.4;
     z-index: 100;
-}
+  }
 
-.cover-content{
+  .cover-content {
     position: fixed;
     // height: 400px;
     width: 300px;
-    margin:auto; 
-    left:0; 
-    right:0; 
+    margin: auto;
+    left: 0;
+    right: 0;
     top: 110px;
     z-index: 1000;
     background-color: white;
-}
+  }
 
-.cover-content-box{
+  .cover-content-box {
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -127,9 +148,9 @@ page-outGoingReportEdit {
     box-sizing: border-box;
     margin: 15px 15px;
     // width: 280px;
-}
+  }
 
-.cover-content-info{
+  .cover-content-info {
     height: 280px;
     border: 1px solid #cccccc;
     padding: 0 10px;
@@ -137,16 +158,16 @@ page-outGoingReportEdit {
     color: #272727;
     overflow: scroll;
     width: 270px;
-    
-}
 
-.cover-content-title{
+  }
+
+  .cover-content-title {
     margin-top: 0;
-}
+  }
 
-.back-btn{
+  .back-btn {
     width: 30px;
     height: 30px;
-}
+  }
 
 }