color

src/pages/activity/activityApply/activityApply.ts

@@ -140,9 +140,13 @@ export class ActivityApplyPage {
   let applyNum = 0;
   this.activity.batchList.forEach((res)=>{
         if(res.order){
+            console.log(res.order);
             applyNum ++;
         }
   });
+  console.log(applyNum);
+  //报名次数 applyCount 1,2,3,4,5,0-> 不限
+  if(this.activity.applyCount > 0){
       if(applyNum >= this.activity.applyCount){
           this.appService.popToastView("提交失败，报名批次达到上限",'middle',1000);
           return;
@@ -150,6 +154,7 @@ export class ActivityApplyPage {
       if (Number(this.order.Personnumber +1) > Number(this.item.batchLimitNumber)) {
           this.appService.popToastView("报名人数超过了该批次的剩余人数",'middle',1000);
           return;
+      }
   } else {             //报名（新增）
     this.submitOrder();
   }

src/pages/activity/activityConfirm/activityConfirm.ts

@@ -24,7 +24,9 @@ export class ActivityConfirmPage {
         orderfgconent: '',
         orderstate: 4,
         activityid: '',
-        orderid: ''
+        orderid: '',
+        personnumber:'',
+        orderbz:''
     };
     batch;
     //页面按钮为默认取消报名和重选批次
@@ -187,12 +189,15 @@ export class ActivityConfirmPage {
 
 
         const data = {
+            orderfgconent:'',
             orderid: this.order.orderid,
             batchid: this.batch.id,
             activityid: this.order.activityid,
             orderpjlevel: this.orderStatisfyLevel,
-            orderstate: '4',
-            orderconfirm: '1'
+            orderstate: '',
+            orderconfirm: '1',
+            personnumber:this.order.personnumber,
+            orderbz:this.order.orderbz
         };
         if (this.order.orderstate == 3) {
             data.orderstate = '3';

src/pages/mine/myActivityList/myActivityList.html

@@ -126,3 +126,5 @@
 		</div>
 	</div>
 </div>
+
+