color

src/pages/activity/activityApply/activityApply.ts

 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, AlertController, ToastController, Events } from 'ionic-angular';
 
-import { MyActivityListPage } from '../../myActivityList/myActivityList';
+import { MyActivityListPage } from '../../mine/myActivityList/myActivityList';
 import { Http, Response } from '@angular/http';
 import { Storage } from '@ionic/storage';
 import { AppService, AppGlobal } from '../../../service/appHttpService';

src/pages/activity/activityConfirm/activityConfirm.ts

@@ -4,7 +4,7 @@ import { IonicPage, NavController, NavParams, AlertController, ToastController }
 import { Http, Response, } from '@angular/http';
 
 import { AppService, AppGlobal } from '../../../service/appHttpService';
-import { MyActivityListPage } from '../../myActivityList/myActivityList';
+import { MyActivityListPage } from '../../mine/myActivityList/myActivityList';
 import { JoinPersonsPage } from '../../joinPersons/joinPersons';
 
 

src/pages/myActivityList/myActivityList.ts → src/pages/mine/myActivityList/myActivityList.ts

@@ -3,14 +3,14 @@ import { IonicPage, NavController, Slides } from 'ionic-angular';
 
 import {  Response } from '@angular/http';
 
-import { AppService } from '../../service/appHttpService';
-import { ActivityConfirmPage } from '../activity/activityConfirm/activityConfirm';
-import { JoinPersonsPage } from '../joinPersons/joinPersons';
+import { AppService } from '../../../service/appHttpService';
+import { ActivityConfirmPage } from '../../activity/activityConfirm/activityConfirm';
+import { JoinPersonsPage } from '../../joinPersons/joinPersons';
 
-import { ActivityStatisticService } from '../../service/activityStatisticService';
-import {OrderDetailPage} from "../activity/order-detail/order-detail";
-import {OrderEditPage} from "../activity/order-edit/order-edit";
-import {ActivityDetailPage} from "../activity/activityDetail/activityDetail";
+import { ActivityStatisticService } from '../../../service/activityStatisticService';
+import {OrderDetailPage} from "../../activity/order-detail/order-detail";
+import {OrderEditPage} from "../../activity/order-edit/order-edit";
+import {ActivityDetailPage} from "../../activity/activityDetail/activityDetail";
 
 
 
@@ -145,7 +145,7 @@ export class MyActivityListPage {
 
   //取消报名（订单）
   sureCancelOrder(orderid): void {
-    this.appService.alert('确定取消报名么？', res => {
+    this.appService.alert('确定取消报名吗？', res => {
       this.cancelOrder(orderid);
     });
   }

src/pages/tabs/home/home.html

@@ -57,12 +57,12 @@
   <div class="item3" style="padding-top: 0px;">
     <div class="item3-2" style="background-color:#f8f8f8;" (click)="gotoNotice()">
       <div class="card3" style="width: 15%;">
-        <span class="img-tips"></span>
+        <span *ngIf="" class="img-tips"></span>
         <img src="./assets/imgs/home/icon-mail.png" alt="">
       </div>
       <div class="card3" style="width: 75%;">
         <div class="card3-item" *ngFor="let item of noticeList;">
-          <span class="tips"></span>
+          <span *ngIf="noticeTips > 0" class="tips"></span>
           <span class="color-996">{{item.title}}</span>
          {{item.content}}
         </div>

src/pages/tabs/home/home.ts

@@ -3,7 +3,7 @@ import {NavController, IonicPage, Slides} from 'ionic-angular';
 import {ActivityListPage} from '../../activity/activityList/activityList';
 import {Http, Response} from '@angular/http';
 import {ActivityStatisticService} from '../../../service/activityStatisticService';
-import {MyActivityListPage} from '../../myActivityList/myActivityList';
+import {MyActivityListPage} from '../../mine/myActivityList/myActivityList';
 import {AppService, AppGlobal} from '../../../service/appHttpService';
 import {Calendar} from '@ionic-native/calendar';
 import {ActivityApplyPage} from '../../activity/activityApply/activityApply'
@@ -68,6 +68,7 @@ export class HomePage {
     //当前第几周
     weekNo;
 
+    noticeTips;
      role;
 
     constructor(public navCtrl: NavController, public activityStatisticService: ActivityStatisticService,
@@ -351,6 +352,8 @@ export class HomePage {
         this.appService.ObserverHttpGetData('/wisdomgroup/modules/activity/hasNewCount', null)
             .subscribe((res) => {
                 let data = Number(res.json());
+                this.noticeTips = data;
+                console.log('notice'+data);
                 if (data > 0) {
                     this.badge.set(data);
                 } else {

src/pages/tabs/mine/mine.ts

@@ -3,7 +3,7 @@ import {  App, NavController, AlertController, NavParams } from 'ionic-angular';
 import { LoginPage } from '../../login/login';
 import { AppService } from '../../../service/appHttpService';
 import { PersonInfoPage } from '../../person/personInfo/personInfo';
-import { MyActivityListPage } from '../../myActivityList/myActivityList';
+import { MyActivityListPage } from '../../mine/myActivityList/myActivityList';
 import { MyReportPage } from '../../mine/myReport/myReport';
 import { OperationListPage } from '../../operation-list/operation-list';
 import { VersionPage } from '../../version/version';