color

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ionic.starter" version="1.2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ionic.starter" version="1.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>智汇19号</name>
     <description>An awesome Ionic/Cordova app.</description>
     <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>

src/pages/activity/activityConfirm/activityConfirm.ts

@@ -6,6 +6,7 @@ import {Http, Response,} from '@angular/http';
 import {AppService, AppGlobal} from '../../../service/appHttpService';
 import {MyActivityListPage} from '../../mine/myActivityList/myActivityList';
 import {JoinPersonsPage} from '../../joinPersons/joinPersons';
+import {MinePage} from "../../tabs/mine/mine";
 
 
 @IonicPage()
@@ -210,9 +211,10 @@ export class ActivityConfirmPage {
             let resultback = res.json();
             if(resultback.status == '200'){
                  //待确认列表移除，全部列表移除该订单
-                //let orderid = this.order["orderid"];
-                //this.allOrder.splice(this.allOrder.indexOf(orderid),1)
-                //this.waitSureOrder.splice(this.waitSureOrder.indexOf(orderid),1)
+                const index = this.navCtrl.getActive().index;
+                this.navCtrl.remove(0, index);
+                this.navCtrl.setRoot(MinePage);
+                this.navCtrl.parent.select(3);
                 this.navCtrl.push("MyActivityListPage");
             }else{
               //失败

src/pages/activity/activityDetail/activityDetail.html

@@ -45,7 +45,9 @@
                         <span>{{batch.batchName}}</span>
                         <!--是否报名 > 是否截止 > 是否满员 -->
                         <ng-container *ngIf="batch.order">
-                            <span class="activity-btn2" *ngIf="batch.order" float-right>已报名</span>
+                            <span class="activity-btn2" *ngIf="batch.order.orderstate == 1 || batch.order.orderstate == 2" float-right>已报名</span>
+                            <span class="activity-btn2" *ngIf="batch.order.orderstate == 3" float-right>已评价</span>
+                            <span class="activity-btn2" *ngIf="batch.order.orderstate == 4" float-right>未出行</span>
                         </ng-container>
                         <ng-container *ngIf="!batch.order">
                             <ng-container *ngIf="batch.signUp">

src/pages/activity/batch-detail/batch-detail.ts

@@ -24,7 +24,9 @@ export class BatchDetailPage {
         batchNotice:null
     };
     activity;
-    order;
+    order = {
+        orderid:''
+    };
     swiper;
     swiperIndex = 0;
   constructor(public navCtrl: NavController, public navParams: NavParams,
@@ -43,7 +45,7 @@ export class BatchDetailPage {
       //判断是否过截止日期
       const nowDate = new Date().getTime();
       const endDate = new Date(this.batch.batchEndDate).getTime();
-      console.log(nowDate,endDate);
+      console.log(this.batch);
       if( nowDate  > endDate ){
           this.isFlag = true;   //已过截止日期
       }
@@ -114,7 +116,14 @@ export class BatchDetailPage {
 
     //订单确认
     reelectBatch(): void {
-        // this.navCtrl.push('OrderDetailPage',{item:this.activity.id});
+        this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId", {"orderid": this.order.orderid})
+            .subscribe((res: Response) => {
+                    let data = res.json();
+                    this.navCtrl.push('ActivityConfirmPage',{activity:data.activity,order:data});
+                }, error => {
+                    this.appService.alert('网络异常！');
+                }
+            );
     }
 
     cancelOrder(): void {

src/pages/mine/myActivityList/myActivityList.ts

@@ -65,35 +65,7 @@ export class MyActivityListPage {
   }
   //当页面加载的时候触发，只触发一次，当有缓存的的时候，打开页面时不在加载  
   ionViewDidLoad() {
-    // this.initSwiper();
-  }
-  //初始化swiper  
-  initSwiper() {
-    this.swiper = new Swiper('.pageMenuSlides .swiper-container', {
-      //设置slider容器能够同时显示的slides数量(  
-      slidesPreView: 3,
-      //slide之间的距离（单位px）  
-      spaceBetween: 0,
-      //断点设定：根据屏幕宽度设置某参数为不同的值  
-      breakpoints: {
-        1024: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        768: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        640: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        320: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        }
-      }
-    });
+
   }
   //选择菜单  
   selectPageMenu(index) {

src/pages/mine/myReport/myReport.ts

@@ -52,34 +52,6 @@ export class MyReportPage {
   ionViewDidLoad() {
 
   }
-  //初始化swiper  
-  initSwiper() {
-    this.swiper = new Swiper('.pageMenuSlides .swiper-container', {
-      //设置slider容器能够同时显示的slides数量(  
-      slidesPreView: 3,
-      //slide之间的距离（单位px）  
-      spaceBetween: 0,
-      //断点设定：根据屏幕宽度设置某参数为不同的值  
-      breakpoints: {
-        1024: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        768: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        640: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        },
-        320: {
-          slidesPerView: 3,
-          spaceBetween: 0
-        }
-      }
-    });
-  }
   //选择菜单  
   selectPageMenu(index) {
       this.swiperIndex = index;
@@ -110,30 +82,6 @@ export class MyReportPage {
 
   }
 
-  //获取所有我已结束的报备
-  // getAllMyEndReport() {
-  //   this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getEndPremanagerByUser", null)
-  //     .subscribe((res: Response) => {
-  //       let data = res.json();
-  //       this.endReport = data;
-  //     }, error => {
-  //       this.appService.alert('网络异常！');
-  //     }
-  //     );
-  // }
-
-  //获取所有我进行中的报备
-  // getAllMyProcessingReport() {
-  //   this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getProcessingPremanagerByUser", null)
-  //     .subscribe((res: Response) => {
-  //       let data = res.json();
-  //       this.processingReport = data;
-  //     }, error => {
-  //       this.appService.alert('网络异常！');
-  //     }
-  //     );
-  // }
-
   //获取所有我的报备
   getAllMyReport() {
     this.appService.ObserverHttpPost("/wisdomgroup/modules/premanager/getPremanagerByUser", null)