color

src/pages/activity/activityConfirm/activityConfirm.scss

@@ -503,23 +503,27 @@ page-activityConfirm {
     }
 
     .submit1{
-        border: 1px solid #40cf4f;
-        background-color: #40cf4f;
+        border: 1px solid #5eb15e;
+        background-color: #d6f7d9;
+        color: #1a9610;
     }
 
     .submit2{
-        border: 1px solid #23c9b2;
-        background-color: #23c9b2;
+        border: 1px solid #299082;
+        background-color: #b2f0e8;
+        color: #299082;
     }
 
     .submit3{
-        border: 1px solid #f19f42;
-        background-color: #f19f42;
+        border: 1px solid #a77536;
+        background-color: #f7e1c4;
+        color: #a77536;
     }
 
     .submit4{
-        border: 1px solid #e14447;
-        background-color: #e14447;
+        border: 1px solid #cd3838;
+        background-color: #f4c4c4;
+        color: #cd3838;
     }
     .confirm-type span{
         width: 50%;

src/pages/activity/activityConfirm/activityConfirm.ts

@@ -46,7 +46,7 @@ export class ActivityConfirmPage {
     isError: boolean = false; //是否提交失败
 
     activityTypeFlag: Array<String> = ['未知', '体检', '疗休养', '培训', '工会活动'];
-    orderStatisfyLevel;
+    orderStatisfyLevel = 4;
 
     noticeArry: object[];
 

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

@@ -13,7 +13,7 @@ export class OrderDetailPage {
     order = {
         orderstate: '',
         orderpjlevel: '',
-
+        orderid:''
     };  //订单信息
     activity = {
         activityName: '',
@@ -43,7 +43,7 @@ export class OrderDetailPage {
     }
 
     cancelOrder(): void {
-        this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": this.batch.order.orderid })
+        this.appService.ObserverHttpGet("/wisdomgroup/modules/order/deleteOrder", { "id": this.order.orderid })
             .subscribe((res: Response) => {
                     this.appService.alert('报名已取消！');
                     this.navCtrl.pop();

src/pages/mine/myActivityList/myActivityList.html

@@ -55,76 +55,4 @@
 	</ion-list>
 </ion-content>
 
-<div class="cover" *ngIf="isCover">
-	<div class="cover-content c1" *ngIf="first">
-		<div class="cover-content-box">
-			<h5 class="cover-content-title">您是否确认已参加本次活动？</h5>
-			<button class="cover-btn btn-yes" (click)="yes()">
-				是，我已参加
-			</button>
-			<button class="cover-btn btn-no" (click)="no()">
-				否，我未参加
-			</button>
-		</div>
-	</div>
-
-	<div class="cover-content c2" *ngIf="second">
-		<div class="cover-content-box">
-			<h5 class="cover-content-title">您对本次活动是否满意？</h5>
-			<button class="cover-btn btn1" (click)="next(1)">
-				非常满意
-			</button>
-			<button class="cover-btn btn2" (click)="next(2)">
-				满意
-			</button>
-			<button class="cover-btn btn3" (click)="next(3)">
-				一般
-			</button>
-			<button class="cover-btn btn4" (click)="next(4)">
-				不满意
-			</button>
-		</div>
-	</div>
-
-	<div class="cover-content c3" *ngIf="third">
-		<div class="cover-content-box">
-			<h5 class="cover-content-title">是否确认未出行</h5>
-			<div class="third-btn-box">
-				<button class="third-btn third-btn-left" (click)="sure()">
-					是
-				</button>
-				<button class="third-btn third-btn-right" (click)="not()">
-					否
-				</button>
-			</div>
-		</div>
-	</div>
-
-	<div class="cover-content c4" *ngIf="fourth">
-		<div class="cover-content-box">
-			<h4 class="cover-content-title">您对本次活动的意见和建议</h4>
-			<textarea class="suggest" rows="12" [(ngModel)]="order.orderfgconent">
-
-			</textarea>
-			<button class="commit" ion-button block (click)="commit()">
-				提交
-			</button>
-		</div>
-	</div>
-
-	<div class="cover-content cover-content-result c5" *ngIf="isSuccess">
-		<div class="cover-content-box">
-			<img class="result-img" src="./assets/imgs/success.png">
-			<h4 class="result-msg">提交成功</h4>
-		</div>
-	</div>
-
-	<div class="cover-content cover-content-result c5" *ngIf="isError">
-		<div class="cover-content-box">
-			<img class="result-img" src="./assets/imgs/error.png">
-			<h4 class="result-msg">提交失败</h4>
-		</div>
-	</div>
-</div>
-
 

src/pages/mine/myActivityList/myActivityList.ts

@@ -104,7 +104,7 @@ export class MyActivityListPage {
 
 
   //初始化加载我的全部活动
-  ngOnInit(): void {
+  ionViewDidEnter(): void {
     this.initAllMyActivityOrder();
   }