已结束的状态按钮展示

controllers/activity.go

@@ -381,15 +381,12 @@ func (this *ActivityCoAntroller) ActivityList() {
 		}
 	}
 	resp := new(models.GetCygxActivityListRep)
-
 	//处理音频回放
 	mapActivityVoice, err := services.GetActivityVoiceResp(mapActivityId)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "GetActivityVoiceResp，Err:" + err.Error()
 	}
-	fmt.Println(mapActivityId)
-	fmt.Println(mapActivityVoice)
 	//处理列表的标签是否展示逻辑
 	for k, v := range list {
 		if mapActivityVoice[v.ActivityId] != nil {

services/activity.go

@@ -1490,60 +1490,66 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		articleDetail.IsShowDetails = true
 		return
 	}
+
+	//专家电话会 1
+	if articleDetail.ActivityTypeId == 1 && articleDetail.IsLimitPeople == 0 && (articleDetail.ActiveState == "1" || articleDetail.ActiveState == "2") {
+		articleDetail.IsShowHelpSsk = true
+	}
 	//新的是否展示规则
 	if articleDetail.IsCanAppointmentMinutes == 1 {
 		articleDetail.IsShowAppointment = true
 	} else {
 		articleDetail.IsShowAppointment = false
 	}
-
-	//专家电话会 1
-	if articleDetail.ActivityTypeId == 1 {
-		articleDetail.IsShowOutboundCall = true
-		//if articleDetail.LimitPeopleNum == 0 {
-		//	articleDetail.IsShowMeetingReminder = true
-		//	articleDetail.IsShowHelpSsk = true
-		//}
-		articleDetail.IsShowMeetingReminder = true
-		articleDetail.IsShowHelpSsk = true
-	}
-
-	//分析师电话会 2
-	if articleDetail.ActivityTypeId == 2 {
-		articleDetail.IsShowOutboundCall = true
-		if articleDetail.LimitPeopleNum == 0 {
+	if articleDetail.ActiveState == "1" {
+		//专家电话会 1
+		if articleDetail.ActivityTypeId == 1 {
+			articleDetail.IsShowOutboundCall = true
+			//if articleDetail.LimitPeopleNum == 0 {
+			//	articleDetail.IsShowMeetingReminder = true
+			//	articleDetail.IsShowHelpSsk = 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
+		}
 	}
 	articleDetail.SourceType = 1
 	activityTimeText := articleDetail.ActivityTimeText

services/article.go

@@ -1806,6 +1806,11 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 	} else {
 		annotation = item.Abstract
 	}
+
+	bodyText, _ := GetReportContentTextSubNew(annotation)
+	if bodyText == "" {
+		return
+	}
 	if annotation != "" {
 		annotation = html.UnescapeString(annotation)
 		doc, _ := goquery.NewDocumentFromReader(strings.NewReader(annotation))