Merge branch 'cygx_10.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity.go

@@ -2073,11 +2073,10 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	//IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	//IsShowSignup            bool                       `description:"是否展示我要报名"`
-
-	//如果后台在添加活的时候，关联的报告类型不隐藏预约纪要按钮，而且满足以下展示预约纪要按钮类型就展示
-	//if articleDetail.IsHideAppointment == 0 {
-	//	articleDetail.IsShowAppointment = IsShowAppointmentByactivityInfo(articleDetail, articleDetail.ChartPermissionName)
-	//}
+	activityTimeText := articleDetail.ActivityTimeText
+	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
+	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
+	articleDetail.ActivityTimeText = activityTimeText
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
@@ -2086,8 +2085,11 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		articleDetail.IsShowDetails = true
 		return
 	}
-
-	//articleDetail.Expert, _ = GetReportContentTextSub(item.Expert)
+	//扣点的研选活动只展示我要报名
+	if articleDetail.IsResearchPoints {
+		articleDetail.IsShowSignup = true
+		return
+	}
 
 	//专家电话会 1
 	if articleDetail.ActivityTypeId == 1 && articleDetail.IsLimitPeople == 0 && (articleDetail.ActiveState == "1" || articleDetail.ActiveState == "2") {
@@ -2110,41 +2112,12 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 			} else {
 				articleDetail.IsShowSignup = true
 			}
-
-			//if articleDetail.SignupType == 0 {
-			//	if articleDetail.LimitPeopleNum == 0 {
-			//		articleDetail.IsShowOutboundCall = true
-			//		//articleDetail.IsShowHelpSsk = true
-			//	} else {
-			//		articleDetail.IsShowSignup = true
-			//	}
-			//} else {
-			//	if articleDetail.SignupType == 2 {
-			//		articleDetail.IsShowSignup = true
-			//	} else {
-			//		articleDetail.IsShowOutboundCall = true
-			//	}
-			//}
 			articleDetail.IsShowMeetingReminder = true
 			articleDetail.IsShowHelpSsk = true
 		}
 
 		//分析师电话会 2
 		if articleDetail.ActivityTypeId == 2 {
-			//if articleDetail.SignupType == 0 {
-			//	if articleDetail.LimitPeopleNum == 0 {
-			//		articleDetail.IsShowOutboundCall = true
-			//		//articleDetail.IsShowHelpSsk = true
-			//	} else {
-			//		articleDetail.IsShowSignup = true
-			//	}
-			//} else {
-			//	if articleDetail.SignupType == 2 {
-			//		articleDetail.IsShowSignup = true
-			//	} else {
-			//		articleDetail.IsShowOutboundCall = true
-			//	}
-			//}
 			if articleDetail.LimitPeopleNum == 0 {
 				articleDetail.IsShowOutboundCall = true
 				//articleDetail.IsShowHelpSsk = true
@@ -2194,10 +2167,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		articleDetail.IsShowSignup = true
 		articleDetail.IsShowOutboundCall = false
 	}
-	activityTimeText := articleDetail.ActivityTimeText
-	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
-	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
-	articleDetail.ActivityTimeText = activityTimeText
+
 	return
 }