diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts
index 4a06bc5d2..767be4ad7 100644
--- a/game-server/app/servers/activity/handler/activityHandler.ts
+++ b/game-server/app/servers/activity/handler/activityHandler.ts
@@ -80,45 +80,45 @@ export class ActivityHandler {
             }
         }
         //14天乐活动-成长任务 1 2 3
-        {
-            let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
-            let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
-            let curDate = new Date()
-            if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束
-                let sevenData = [];
-                let growthData = await growthActivity(serverId, roleId);
-                if (growthData) {
-                    sevenData.push({
-                        type: ACTIVITY_TYPE.TASK_GROWTH,
-                        activityId: growthData.activityId,
-                        data: growthData,
-                    });
-                }
-                let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
-                if (dailyChallengesData) {
-                    sevenData.push({
-                        type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
-                        activityId: dailyChallengesData.activityId,
-                        data: dailyChallengesData,
-                    });
-                }
-                let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
-                if (dailyGiftsData) {
-                    sevenData.push({
-                        type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
-                        activityId: dailyGiftsData.activityId,
-                        data: dailyGiftsData,
-                    });
-                }
-                if (sevenData.length > 0) {
-                    playerActivityArray.push({
-                        type: ACTIVITY_TYPE.FOURTEEN_DAY,
-                        activityId: 0,
-                        data: sevenData,
-                    });
-                }
-            }
-        }
+        // {
+        //     let beginTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
+        //     let endTime = moment(SERVER_OPEN_TIME).startOf('d').add(7, 'd').toDate();
+        //     let curDate = new Date()
+        //     if (curDate > beginTime && curDate < endTime) {//开启中，开服7天后开启，开服第21天结束
+        //         let sevenData = [];
+        //         let growthData = await growthActivity(serverId, roleId);
+        //         if (growthData) {
+        //             sevenData.push({
+        //                 type: ACTIVITY_TYPE.TASK_GROWTH,
+        //                 activityId: growthData.activityId,
+        //                 data: growthData,
+        //             });
+        //         }
+        //         let dailyChallengesData = await dailyChallengesActivity(serverId, roleId);
+        //         if (dailyChallengesData) {
+        //             sevenData.push({
+        //                 type: ACTIVITY_TYPE.TASK_DAILY_CHALLENGES,
+        //                 activityId: dailyChallengesData.activityId,
+        //                 data: dailyChallengesData,
+        //             });
+        //         }
+        //         let dailyGiftsData = await dailyGiftsActivity(serverId, roleId);
+        //         if (dailyGiftsData) {
+        //             sevenData.push({
+        //                 type: ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT,
+        //                 activityId: dailyGiftsData.activityId,
+        //                 data: dailyGiftsData,
+        //             });
+        //         }
+        //         if (sevenData.length > 0) {
+        //             playerActivityArray.push({
+        //                 type: ACTIVITY_TYPE.FOURTEEN_DAY,
+        //                 activityId: 0,
+        //                 data: sevenData,
+        //             });
+        //         }
+        //     }
+        // }
         //签到 4
         {
             let data = await signInActivity(serverId, roleId);
@@ -336,12 +336,14 @@ export class ActivityHandler {
         //弹出商店 24
         {
             let data = await popUpShopActivity(serverId, roleId);
-            if (data) {
-                playerActivityArray.push({
-                    type: ACTIVITY_TYPE.POP_UP_SHOP,
-                    activityId: 0,
-                    data,
-                });
+            if (data && data.length > 0) {
+                for (let obj of data) {
+                    playerActivityArray.push({
+                        type: ACTIVITY_TYPE.POP_UP_SHOP,
+                        activityId: obj.activityId,
+                        data: obj,
+                    });
+                }
             }
         }
 
diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts
index b4d06a893..6f663b106 100644
--- a/shared/consts/constModules/activityConst.ts
+++ b/shared/consts/constModules/activityConst.ts
@@ -30,10 +30,10 @@ export enum ACTIVITY_TYPE {
     DAILY_RMB_GIFTS = 22, // 每日特惠RMB购买，一次性购买7天礼包
     TREASURE_HUNT = 23, // 寻宝骑兵活动
     POP_UP_SHOP = 24, // 弹出商店
-    FOURTEEN_DAY = 25, // 14天乐活动(虚)
-    FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包
-    FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动
-    FOURTEEN_TASK_DAILY_CHALLENGES = 28, // 14天乐今日挑战活动
+    // FOURTEEN_DAY = 25, // 14天乐活动(虚)
+    // FOURTEEN_DAILY_DISCOUNT_GIFT = 26, // 14天乐活动,每日特惠礼包
+    // FOURTEEN_TASK_GROWTH = 27, // 14天乐成长任务活动
+    // FOURTEEN_TASK_DAILY_CHALLENGES = 28, // 14天乐今日挑战活动
 }
 
 /**
diff --git a/shared/domain/activityField/popUpShopField.ts b/shared/domain/activityField/popUpShopField.ts
index c40bcaeca..513585929 100644
--- a/shared/domain/activityField/popUpShopField.ts
+++ b/shared/domain/activityField/popUpShopField.ts
@@ -22,7 +22,7 @@ export class PopUpShopData {
     beginTime: Date = null;//开始时间
     endTime: Date = null;//结束时间
 
-    //解析玩家购买记录
+    //解析玩家开启的商店记录
     public setPlayerRecords(data: ActivityPopUpShopModelType) {
         if (!data) {
             return;
diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts
index f69a18a3d..a432ff44f 100644
--- a/shared/pubUtils/taskUtil.ts
+++ b/shared/pubUtils/taskUtil.ts
@@ -583,9 +583,19 @@ export async function accomplishTask(serverId: number, roleId: string, taskType:
                         let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData);
                         if (addCount) {
                             if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE) {
-                                await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
+                                let playerRecord = await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
+                                //推送
+                                if (task.condition < playerRecord.totalCount) {
+                                    popShopData.setPlayerRecords(playerRecord)
+                                    pushMessage = pushMessage.concat(popShopData);
+                                }
                             } else {
-                                await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
+                                let playerRecord = await ActivityPopUpShopModel.addTaskCount(serverId, activity.activityId, roleId, task.id, task.taskType, addCount);
+                                //推送
+                                if (task.condition < playerRecord.totalCount) {
+                                    popShopData.setPlayerRecords(playerRecord)
+                                    pushMessage = pushMessage.concat(popShopData);
+                                }
                             }
                         }
                         if (record) {