no message

services/activity.go

@@ -269,6 +269,9 @@ func LabelStr(label string, isShowSubjectName int, temporaryLabel string) (label
 func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivity []*models.CygxActivity, user *models.WxUserItem) (items []*models.ActivityTypeHome, err error) {
 	mapActivity := make(map[int][]*models.CygxActivityLabelList)
 	for _, v := range listActivity {
+		if v.Label == "" {
+			continue
+		}
 		// 如果是C类电话会就不展示内容，且合并到分析师电话会
 		if v.ActivityTypeId == 7 {
 			v.ActivityTypeId = 1
@@ -282,6 +285,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		if len(mapActivity[v.ActivityTypeId]) > 10 {
 			continue
 		}
+
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
 	}
 	for _, v := range listType {
@@ -365,56 +369,61 @@ func ActivityButtonShow(item *models.ActivityDetail) (itemActivity *models.Activ
 		articleDetail.IsShowSignup = false
 		articleDetail.IsShowDetails = true
 	} else {
-		//新的是否展示规则
-		if articleDetail.IsCanAppointmentMinutes == 1 {
-			articleDetail.IsShowAppointment = true
-		} else {
-			articleDetail.IsShowAppointment = false
-		}
 
 		//专家电话会 1
 		if articleDetail.ActivityTypeId == 1 {
-			articleDetail.IsShowOutboundCall = true
-			articleDetail.IsShowMeetingReminder = true
 			articleDetail.IsShowHelpSsk = true
 		}
+		if articleDetail.ActiveState == "1" {
+			//新的是否展示规则
+			if articleDetail.IsCanAppointmentMinutes == 1 {
+				articleDetail.IsShowAppointment = true
+			}
 
-		//分析师电话会 2
-		if articleDetail.ActivityTypeId == 2 {
-			articleDetail.IsShowOutboundCall = true
-			if articleDetail.LimitPeopleNum == 0 {
+			//专家电话会 1
+			if articleDetail.ActivityTypeId == 1 {
+				articleDetail.IsShowOutboundCall = true
 				articleDetail.IsShowMeetingReminder = true
+				articleDetail.IsShowHelpSsk = true
 			}
-		}
 
-		//公司调研电话会 3
-		if articleDetail.ActivityTypeId == 3 {
-			if articleDetail.LimitPeopleNum == 0 {
-				articleDetail.IsShowMeetingReminder = true
+			//分析师电话会 2
+			if articleDetail.ActivityTypeId == 2 {
 				articleDetail.IsShowOutboundCall = true
-			} else {
-				articleDetail.IsShowSignup = true
+				if articleDetail.LimitPeopleNum == 0 {
+					articleDetail.IsShowMeetingReminder = true
+				}
 			}
-		}
 
-		//公司线下调研 4
-		if articleDetail.ActivityTypeId == 4 {
-			articleDetail.IsShowSignup = true
-		}
+			//公司调研电话会 3
+			if articleDetail.ActivityTypeId == 3 {
+				if articleDetail.LimitPeopleNum == 0 {
+					articleDetail.IsShowMeetingReminder = true
+					articleDetail.IsShowOutboundCall = true
+				} else {
+					articleDetail.IsShowSignup = true
+				}
+			}
 
-		//专家线下沙龙 5
-		if articleDetail.ActivityTypeId == 5 {
-			articleDetail.IsShowSignup = true
-		}
+			//公司线下调研 4
+			if articleDetail.ActivityTypeId == 4 {
+				articleDetail.IsShowSignup = true
+			}
 
-		//分析师线下沙龙 6
-		if articleDetail.ActivityTypeId == 6 {
-			articleDetail.IsShowSignup = true
-		}
+			//专家线下沙龙 5
+			if articleDetail.ActivityTypeId == 5 {
+				articleDetail.IsShowSignup = true
+			}
+
+			//分析师线下沙龙 6
+			if articleDetail.ActivityTypeId == 6 {
+				articleDetail.IsShowSignup = true
+			}
 
-		//分析师电话会（C类） 7
-		if articleDetail.ActivityTypeId == 7 {
-			articleDetail.IsShowSignup = true
+			//分析师电话会（C类） 7
+			if articleDetail.ActivityTypeId == 7 {
+				articleDetail.IsShowSignup = true
+			}
 		}
 	}