签到

src/pages/report/reportDetail/reportDetail.html

@@ -9,16 +9,16 @@
 	</div>
 
 	<div class="content-box">
-		<div class="content-box-item i3" (click)="change(1)">
+		<div class="content-box-item {{type == 1?'bgc-34b4fc':''}}" (click)="change(1)">
 			<span class="item-title">未报备</span>
 			<span class="item-count">{{itemsOfNotReport.length}}人</span>
 		</div>
 
-		<div class="content-box-item i2" (click)="change(2)">
+		<div class="content-box-item {{type == 2?'bgc-34b4fc':''}}" (click)="change(2)">
 			<span class="item-title">离沪</span>
 			<span class="item-count">{{itemsOfLeave.length}}人</span>
 		</div>
-		<div class="content-box-item i1" (click)="change(3)">
+		<div class="content-box-item {{type == 3?'bgc-34b4fc':''}}" (click)="change(3)">
 			<span class="item-title">不离沪</span>
 			<span class="item-count">{{itemsOfNotLeave.length}}人</span>
 		</div>
@@ -39,9 +39,15 @@
 						<p *ngIf="type == 2" class="person-batch">离沪地点：{{item.address}}</p>
 					</div>
 				</div>
+				<div>
+					<p>
 						<button ion-button round class="btn color1" *ngIf="type == 1">未报备</button>
 						<button ion-button round class="btn color2" *ngIf="type == 2">离沪</button>
 						<button ion-button round class="btn color3" *ngIf="type == 3">不离沪</button>
+					</p>
+					<p style="color:#24bafc;margin-top: 6px">协助报备</p>
+				</div>
+
 			</div>
 		</ion-item>
 	</ion-list>

src/pages/report/reportDetail/reportDetail.scss

 page-reportDetail {
-    .searchToolBar{
+  .searchToolBar {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -7,7 +7,7 @@ page-reportDetail {
     box-sizing: border-box;
   }
 
-    .activity-title{
+  .activity-title {
     background-color: #f5f5f5;
     font-size: 12px;
     color: #b2b2b2;
@@ -16,7 +16,7 @@ page-reportDetail {
     padding-bottom: 5px;
   }
 
-    .content-box{
+  .content-box {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -25,9 +25,9 @@ page-reportDetail {
     border-bottom: 1px solid #cccccc;
   }
 
-.content-box-item{
+  .content-box-item {
     width: 105px;
-    height: 45px;
+    padding: 12px;
     margin: 8px 7px;
     display: flex;
     flex-direction: column;
@@ -37,27 +37,32 @@ page-reportDetail {
     font-size: 14px;
     border-radius: 2px;
     color: white;
+    border: 1px solid #34b4fc;
+  }
+  .content-box-item.bgc-34b4fc .item-title,
+  .content-box-item.bgc-34b4fc .item-count{
+    color: white;
+  }
 
-}
-
-.item-count{
-    font-weight: bold;
-}
-
-    .i1{
+  .item-title{
+    color: #34b4fc;
+  }
+  .item-count{
+    color: #999999;
+  }
+  .i1 {
     background-color: #70c1df;
   }
 
-    .i2{
+  .i2 {
     background-color: #64d262;
   }
 
-    .i3{
+  .i3 {
     background-color: #ef8355;
   }
 
-    .btn{
-        float: right;
+  .btn {
     background-color: white;
     border: 1px solid #90da91;
     color: #90da91;
@@ -65,22 +70,25 @@ page-reportDetail {
     font-size: 6px;
   }
 
-    .color1{
+  .color1 {
     border-color: #93cfe5;
     color: #93cfe5;
+    border-radius: 3px;
   }
 
-            .color2{
+  .color2 {
     border-color: #90db90;
     color: #90db90;
+    border-radius: 3px;
   }
 
-            .color3{
+  .color3 {
     border-color: #f3a778;
     color: #f3a778;
+    border-radius: 3px;
   }
 
-    .group{
+  .group {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -88,7 +96,7 @@ page-reportDetail {
     box-sizing: border-box;
   }
 
-    .inner-group{
+  .inner-group {
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -96,44 +104,47 @@ page-reportDetail {
     box-sizing: border-box;
   }
 
-    .person-photo{
+  .person-photo {
     width: 48px;
     height: 48px;
     margin-right: 10px;
   }
 
-    .item-box{
+  .item-box {
     display: inline-block;
   }
 
-    .person-name{
+  .person-name {
     font-size: 18px;
     color: black;
 
   }
 
-    .person-sex-male{
+  .person-sex-male {
     font-size: 14px;
     color: #6bc7fd;
     font-weight: bolder;
     margin-left: 5px;
   }
 
-    .person-sex-female{
+  .person-sex-female {
     font-size: 14px;
     color: #f0a7ea;
     font-weight: bolder;
     margin-left: 5px;
   }
 
-    .person-batch{
+  .person-batch {
     font-size: 14px;
     color: #666666;
   }
 
-    .back-btn{
+  .back-btn {
     width: 30px;
     height: 30px;
   }
+  .bgc-34b4fc{
+    background-color: #34b4fc;
+  }
 
 }

src/pages/report/reportTrack/reportTrack.html

@@ -29,7 +29,7 @@
 						</div>
 					</div>
 					<div class="right">
-						<button class="participation">人员参与情况</button>
+						<span class="color-24bafc">人员参与情况 ></span>
 					</div>
 				</div>
 			</div>

src/pages/report/reportTrack/reportTrack.scss

@@ -14,19 +14,27 @@ page-ReportTrack {
         justify-content: left;
         box-sizing: border-box;
     }
-    
+    .list-ios .item-block .item-inner{
+        border-bottom: none;
+    }
+    .item-ios{
+        margin-bottom:10px;
+    }
     .item-header{
         display: flex;
         flex-direction: row;
         align-items: center;
         justify-content: space-between;
         box-sizing: border-box;
+        font-size: 2rem;
+        padding: 10px 0;
+        border-bottom: 1px solid #ddd;
     }
 
     .item-content{
         display: flex;
         flex-direction: row;
-        align-items: flex-end;
+        align-items: flex-start;
         justify-content: space-between;
         box-sizing: border-box;
     }
@@ -42,11 +50,16 @@ page-ReportTrack {
     }
 
     .left{
-        color: #cccccc;
-        font-size: 8px;
-        // height: 70px;
-        // display: inline-block;
+        color: #333333;
         margin-left: 25px;
+        font-size: 1.5rem;
+        div{
+            margin: 5px 0;
+        }
+    }
+    .right{
+        margin: 5px 0;
+        font-size: 1.4rem;
     }
 
     .data{
@@ -91,6 +104,7 @@ page-ReportTrack {
         box-sizing: border-box;
     }
 
+
     .back-btn{
         width: 30px;
         height: 30px;