将两种任务初步合起来

shared/domain/activityField/thirtyDaysField.ts

@@ -118,20 +118,6 @@ export class ThirtyDaysData extends ActivityBase {
     pointRewardList: Array<ThirtyDaysPointItem> = [];//点数兑换奖励
     totalPoint: number = 0;//总共点数
 
-    //未完成的任务
-    public findUncompleteTaskByType(type: number): ThirtyDaysItem[] {
-        let task = [];
-        for (let i = 0; i < this.list.length; i++) {
-            let items = this.list[i].item;
-            for (let itemData of items) {
-                if (itemData.taskType == type && !itemData.isComplete) {
-                    task.push(itemData);
-                }
-            }
-        }
-        return task;
-    }
-
     public findTaskByType(type: number) {
         let task = [];
         for (let i = 0; i < this.list.length; i++) {
@@ -256,8 +242,8 @@ export class ThirtyDaysData extends ActivityBase {
         }
     }
 
-    constructor(activityData: ActivityModelType, createTime: number) {
-        super(activityData, createTime)
+    constructor(activityData: ActivityModelType, createTime: number, serverTime?: number) {
+        super(activityData, createTime, serverTime)
         this.initData(activityData.data)
     }
 }