公告

src/pages/activity/activityApply/activityApply.scss

@@ -343,6 +343,7 @@ page-activityApply {
 
     .item-ios.item-block .item-inner{
         margin-right: 16px;
+        border: none;
     }
     .content .item-ios.item-block:nth-child(5) .item-inner{
         border: none;

src/pages/activity/activityDetail/activityDetail.html

@@ -46,11 +46,17 @@
 					<p>
 						<span class="color-666">批次名称:</span>
 						<span>{{batch.batchName}}</span>
+						<ng-container *ngIf="batch.signUp">
 							<span *ngIf=" batch.hasSignUpCount < batch.batchLimitNumber">
 								<span class="activity-btn2" *ngIf="batch.order" float-right>已报名</span>
 								<span class="activity-btn2" *ngIf="!batch.order" float-right>未报名</span>
 							</span>
 							<span *ngIf="batch.hasSignUpCount == batch.batchLimitNumber" class="activity-btn2" float-right>已满员</span>
+						</ng-container>
+						<ng-container *ngIf="!batch.signUp">
+							<span class="activity-btn2" float-right>已截止</span>
+						</ng-container>
+
 					</p>
 					<p>
 						<span class="color-666">截止时间:</span>

src/pages/activity/activityDetail/activityDetail.ts

@@ -31,7 +31,6 @@ export class ActivityDetailPage {
     public alertCtrl: AlertController,
     public http: Http,
     public appService: AppService, public toast: ToastController) {
-    // console.log(this.navParams.get("activityId"));
     this.subIntroduce("2018年市委组织部体检活动将在3月5号在上海市人民医院进行，共分八批，欢迎大家根据个人安排进行报名工作。2018年市委组织部体检活动将在3月5号在上海市人民医院进行，共分八批，欢迎大家根据个人安排进行报名工作。");
 
     let id = this.navParams.get('id');
@@ -39,22 +38,26 @@ export class ActivityDetailPage {
   }
 
     findMyOrderByOrderId(id){
+
+        let now = new Date().getTime();
         this.appService.ObserverHttpGet("/wisdomgroup/modules/activity/findAllActivityForAppWithXQ", {"id":id})
             .subscribe((res :Response) => {
                     this.activity = res.json();
                     this.batchList = this.activity.batchList;
+                    for( let i = 0;i<this.batchList.length;i++ ){
+                        let endDate = this.batchList[i].batchEndDate + " 24:00:00";
+                        endDate = new Date(endDate) +"";     //判断是否过截止日期
+                        console.log(now,Number(endDate));
+                        if( now > Number(endDate) ){      //已截止
+                            this.batchList[i].signUp = false;
+                        }else{    //
+                            this.batchList[i].signUp = true;
+                        }
+                    }
                 }, error => {
                     this.appService.alert('网络异常！');
                 }
             );
-        // let order = this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId",{"orderid":orderid})
-        //     .subscribe((res: Response) => {
-        //             let data = res.json();
-        //             console.log(data);
-        //         }, error => {
-        //             this.appService.alert('网络异常！');
-        //         }
-        //     );
     }
 
 

src/pages/dutyALl/duty/duty.html

@@ -45,15 +45,16 @@
        <ng-container *ngIf="changeType == 2">
             <div class="duty-content">
                 <ion-list *ngIf="nowDuty.length > 0">
-                    <ion-item *ngFor="let item of nowDuty">
+                    <ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">
                         <div >
                             <span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>
                             <span *ngIf="item.type == 0">白班</span>
                             <span *ngIf="item.type == 1">夜班</span>
+                            <span float-right>待值班</span>
                         </div>
                         <div>
-                            <span  (click)="dutyDetail(item)" *ngIf="item.applyId">申请详情</span>
-                            <span (click)="dutyApply(item)" *ngIf="!item.applyId">换班申请</span>
+                            <span class="span-btn" float-right (click)="dutyDetail(item)" *ngIf="item.applyId">查看详情</span>
+                            <span class="span-btn" float-right (click)="dutyApply(item)" *ngIf="!item.applyId">申请换班</span>
                         </div>
                     </ion-item>
                 </ion-list>

src/pages/dutyALl/duty/duty.scss

 page-duty {
+  .list-ios .item-block .item-inner{
+    border: none;
+  }
   .duty{
     display: flex;
     flex-direction: row;
@@ -25,4 +28,14 @@ page-duty {
     bottom: -10px;
     left: 0px;
   }
+  .span-btn{
+    background-color: #34b4fc;
+    font-size: 1.4rem;
+    padding: 4px 6px;
+    color: #fff;
+    border-radius: 3px;
+  }
+  .dutyItem > div{
+    margin-bottom: 10px;
+  }
 }

src/pages/tabs/home/home.html

@@ -68,47 +68,6 @@
       </div>
     </div>
   </div>
-  <!--<div class="item4">-->
-    <!--<div class="item4-1">-->
-      <!--<ion-icon name="md-people" class="icon4"></ion-icon>-->
-      <!--<label class="duty_arrangements">日历</label>-->
-      <!--&lt;!&ndash; <label class="more"  (click)="wait()">-->
-        <!--更多-->
-        <!--<ion-icon name="arrow-dropright"></ion-icon>-->
-      <!--</label> &ndash;&gt;-->
-    <!--</div>-->
-    <!--<div class="item4-2">-->
-      <!--<div class="item4-title">{{year}}年{{month}}月，第{{weekNo}}周</div>-->
-      <!--<div class="group" (click)="myCalendar()">-->
-        <!--<div *ngFor="let item of week" class="card4">-->
-          <!--<div class="card4-1">{{item.title}}</div>-->
-          <!--<div class="{{item.isToday?'selected':''}} card4-2">{{item.date}}</div>-->
-        <!--</div>-->
-      <!--</div>-->
-    <!--</div>-->
-  <!--</div>-->
-  <!--<div class="item5">-->
-    <!--<div class="item5-1">-->
-      <!--<ion-icon name="list" class="icon5"></ion-icon>-->
-      <!--<label class="operation_record">操作记录</label>-->
-      <!--<label class="more" (click)="goOperationListPage()">-->
-        <!--更多-->
-        <!--<ion-icon name="arrow-dropright"></ion-icon>-->
-      <!--</label>-->
-    <!--</div>-->
-    <!--<div class="item5-2">-->
-      <!--<div class="card5" *ngFor="let operation of operations;let idx = index">-->
-        <!--<label class="card5-1">-->
-          <!--<span class="card5-1-1">{{idx+1}}、</span>{{operation.opertionContent|slice:0:20}}...</label>-->
-        <!--<label class="time_home">{{operation.timegapvalue}}</label>-->
-      <!--</div>-->
-      <!--&lt;!&ndash; <div class="card5">-->
-          <!--<label class="card5-1">-->
-            <!--<span class="card5-1-1">2、</span>你已取消报名2018年疗养活动，详情见“我的活动”</label>-->
-            <!--<label class="time">1天前</label>-->
-      <!--</div> &ndash;&gt;-->
-    <!--</div>-->
-  <!--</div>-->
     <ion-calendar [(ngModel)]="date"
                   (onChange)="onChange($event)"
                   [options]="optionsMulti"

src/pages/tabs/home/home.scss

@@ -109,12 +109,12 @@ page-home {
      .card3{
         display: inline-flex;
         flex-direction: column;
-        // flex-direction: center;
         align-items: flex-start;
         justify-content: center;
         box-sizing: border-box;
         padding:3px;
         position: relative;
+       font-size: 1.3rem;
      }
     .img-tips{
       position: absolute;

src/pages/tabs/home/home.ts

@@ -125,13 +125,14 @@ export class HomePage {
   }
 
   ngOnInit(): void {
-  //   this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
-      //     this.slidersItems = res.json();
-      //     console.log(res.json());
-      //   }, error => {
-      //     this.appService.alert('系统错误！');
-      //   })
-        this.appService.ObserverHttpGet("/wisdomgroup/modules/notice/getAllNotice", {}).subscribe((res: Response) => {
+    this.appService.ObserverHttpGet("/wisdomgroup/modules/common/file/getBanner", {}).subscribe((res: Response) => {
+          this.slidersItems = res.json();
+          console.log(res.json());
+        }, error => {
+          this.appService.alert('系统错误！');
+        });
+
+        this.appService.ObserverHttpGet("/wisdomgroup/modules/message/findAllActivityForAppWithXQ", null).subscribe((res: Response) => {
           this.noticeList = res.json().slice(0,2);
           console.log(this.noticeList);
         }, error => {
@@ -139,16 +140,6 @@ export class HomePage {
         })
 
   }
-  //页面进入时启动自动播放
-  // ionViewDidEnter() {
-  //   this.slides.startAutoplay();
-  // }
-
-
-  //页面离开时停止自动播放
-  // ionViewDidLeave() {
-  //   this.slides.stopAutoplay();
-  // }
 
   ionViewDidEnter() {
     setTimeout(() => {