color

src/pages/report/outGoingReportEdit/outGoingReportEdit.ts

@@ -67,7 +67,7 @@ export class OutGoingReportEditPage {
 
         //报备列表页面  到  个人报备1页面
         this.storage.get("premanager").then((value) => {
-
+    console.log(value);
             if (value != null && value != '') {
                 this.premanager = value;
                 //加载报备的图片

src/pages/tabs/home/home.ts

@@ -20,6 +20,7 @@ import {CalendarComponentOptions, DayConfig} from "ion2-calendar";
 import {NoticePage} from "../notice/notice";
 import {monthCh, weekDay} from "../../../app/main";
 import {Badge} from '@ionic-native/badge';
+import {ActivityDetailPage} from "../../activity/activityDetail/activityDetail";
 
 declare var Swiper;
 
@@ -204,11 +205,7 @@ export class HomePage {
             .toPromise()
             .then(res => {
                 let activity = res.json();
-                if (activity.orderList.length == 0) {
-                    this.goApply(activity);
-                } else {
-                    this.goDetail(activity);
-                }
+                this.navCtrl.push('ActivityDetailPage',{id:activity.id});
             })
             .catch(error => {
             });
@@ -228,36 +225,6 @@ export class HomePage {
             });
     }
 
-    //查看详情
-    goDetail(item) {
-        let orderid = item.orderList[0]["orderid"];
-        this.findMyOrderByOrderId(orderid, result => {
-            let order = result;
-            this.navCtrl.push("ActivityConfirmPage", {lookOrderDetails: order});
-        });
-    }
-
-    //报名按钮
-    goApply(item) {   //活动状态：1：待发布（不可报名），2：发布中（可报名）3:已完成（报名截止）
-        if (item.activityState == 2) {
-            let flag = false;
-            this.isExitOrderWithActivity(item, result => {
-                flag = result;
-                if (flag) {
-                    this.appService.toast("您已经报名该活动，请在我的活动中查看！");
-                } else {
-                    this.navCtrl.push("ActivityApplyPage", {item: item});
-                }
-            });
-
-        } else {
-            if (item.activityState == 1) {
-                this.appService.toast("报名暂未开通！");
-            } else {
-                this.appService.toast("活动已完成！");
-            }
-        }
-    }
 
     findMyOrderByOrderId(orderid, callback?) {
         let order = this.appService.ObserverHttpPost("/wisdomgroup/modules/order/findMyOrderByOrderId", {"orderid": orderid})