Merge branch 'cygx_10.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

services/activity.go

@@ -513,15 +513,13 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
-		//公司调研电话会（3）的展示处理 专家线下沙龙（5）
-		if v.ActivityTypeId == 3 || v.ActivityTypeId == 5 {
-			if v.IsExternalLabel > 0 {
-				item.IsExternalLabel = true
-			}
-			if v.IsResearchPoints > 0 {
-				item.IsResearchPoints = true
-			}
+		if v.IsExternalLabel > 0 {
+			item.IsExternalLabel = true
 		}
+		if v.IsResearchPoints > 0 {
+			item.IsResearchPoints = true
+		}
+
 		item.City = v.City
 		if utf8.RuneCountInString(v.City) != 2 {
 			item.City = ""
@@ -658,7 +656,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 			}
 
 			if articleDetail.ActivityTypeId == 3 {
-				//司调研电话会(3)
+				//司调研电话会(3)、扣点的研选活动只展示我要报名
 				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
 					articleDetail.IsShowSignup = true
 				} else {