color

src/pages/activity/order-detail/order-detail.html

@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="content-button">
-            <div class="button-left">报名人数<span class="color-24bafc margin-left-15">4/20</span></div>
+            <div class="button-left">报名人数<span class="color-24bafc margin-left-15">{{batch?.hasSignUpCount}}/{{batch?.batchLimitNumber}}</span></div>
             <div class="button-right" >
                 <!--时间是否截止->人数是否满了->是否报名了-->
             </div>

src/pages/contact/contract-personinfo/contract-personinfo.html

@@ -25,7 +25,12 @@
       <div class="info-item">
         <span class="info-span">头像</span>
         <div class="info-item-content">
-          <img src="./assets/imgs/head.png" class="contact-img" >
+          <ng-container *ngIf="contactPersonInfo?.picUrl != ''">
+            <img src="{{picture+contactPersonInfo.picUrl}}" class="slide-image" (click)="go(item)">
+          </ng-container>
+          <ng-container *ngIf="contactPersonInfo?.picUrl == ''">
+            <img src="./assets/imgs/head.png" class="contact-img" >
+          </ng-container>
         </div>
       </div>
     </ion-item>

src/pages/contact/contract-personinfo/contract-personinfo.ts

 import {Component} from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 import {Response} from '@angular/http';
-import {AppService} from '../../../service/appHttpService';
+import {AppGlobal, AppService} from '../../../service/appHttpService';
 
 import {ContactListPage} from '../contactList/contactList';
 import {MyBlockPage} from "../my-block/my-block";
@@ -20,7 +20,7 @@ export class ContractPersoninfoPage {
         abbreviation: ''
     };
     id;
-
+    picture: string = AppGlobal.picture;
 
     edit = false;
     email;

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

@@ -23,7 +23,8 @@
     <ion-item-sliding>
       <ion-item *ngFor="let item of perList">
         <div class="contact-box" (click)="sure(item)">
-          <img src="./assets/imgs/head.png" class="contact-img" >
+          <img src="./assets/imgs/man.png" class="contact-img" *ngIf="item.gender =='1'||item.gender==null">
+          <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="item.gender =='0'">
 
           <div class="contact-box-right">
             <div>

src/pages/contact/person-list/person-list.scss

@@ -36,7 +36,6 @@ page-person-list {
 
   .contact-name{
     font-size: 16px;
-    font-weight: bold;
   }
 
   .contact-sex{
@@ -53,19 +52,18 @@ page-person-list {
   }
 
   .contact-organization{
-    color: #d0d0d0;
+    color: #808080;
     font-size: 12px;
   }
 
   .contact-telphone{
-    color: #999;
-    font-size: 1.4rem;
+    color: #808080;
+    font-size: 12px;
   }
 
   .contact-handphone{
-    color: #666666;
-    font-size: 1.5rem;
-    margin-left: 7px;
+    color: #808080;
+    font-size: 12px;
   }
 
   .back-btn{

src/pages/contact/search/search.html

@@ -15,13 +15,12 @@
   <ion-list>
     <ion-item *ngFor="let contactPerson of contactPersons" (click)="contactPersonInfo(contactPerson)">
       <div class="contact-box">
-        <img src="./assets/imgs/head.png" class="contact-img">
+        <img src="./assets/imgs/man.png" class="contact-img" *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
+        <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
 
         <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/contact/search/search.scss

@@ -78,13 +78,12 @@ page-search {
     }
 
     .contact-img{
-        width: 60px;
-        height: 60px;
+        width: 3rem;
+        height: 3rem;
     }
 
     .contact-name{
         font-size: 16px;
-        font-weight: bold;
     }
 
     .contact-sex{
@@ -101,19 +100,18 @@ page-search {
     }
 
     .contact-organization{
-        color: #d0d0d0;
+        color: #808080;
         font-size: 12px;
     }
 
     .contact-telphone{
-        color: #d0d0d0;
+        color: #808080;
         font-size: 12px;
     }
 
     .contact-handphone{
-        color: #d0d0d0;
+        color: #808080;
         font-size: 12px;
-        margin-left: 7px;
     }
 
     .back-btn{

src/pages/mine/myActivityList/myActivityList.scss

 page-myActivityList {
-    button[disabled]{
+    a[disabled], button[disabled], [ion-button][disabled]{
         opacity: 1;
     }