no message

services/activity.go

@@ -603,12 +603,6 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		articleDetail.IsResearchSpecial = true
 	}
 
-	//司调研电话会(3)、扣点的研选活动只展示我要报名
-	if articleDetail.IsResearchPoints && articleDetail.ActivityTypeId == 3 {
-		articleDetail.IsShowSignup = true
-		return
-	}
-
 	activityTimeText := articleDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
@@ -659,13 +653,14 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 				}
 				articleDetail.IsShowMeetingReminder = true
 			}
-			//公司调研电话会 3
+
 			if articleDetail.ActivityTypeId == 3 {
-				if articleDetail.LimitPeopleNum == 0 {
+				//司调研电话会(3)、扣点的研选活动只展示我要报名
+				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
+					articleDetail.IsShowSignup = true
+				} else {
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowOutboundCall = true
-				} else {
-					articleDetail.IsShowSignup = true
 				}
 			}
 

services/activity_button.go

@@ -309,11 +309,7 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
 	articleDetail.ActivityTimeText = activityTimeText
-	//司调研电话会(3)、扣点的研选活动只展示我要报名
-	if articleDetail.IsResearchPoints && articleDetail.ActivityTypeId == 3 {
-		articleDetail.IsShowSignup = true
-		return
-	}
+
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
@@ -361,11 +357,12 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 
 			//公司调研电话会 3
 			if articleDetail.ActivityTypeId == 3 {
-				if articleDetail.LimitPeopleNum == 0 {
+				//司调研电话会(3)、扣点的研选活动只展示我要报名
+				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
+					articleDetail.IsShowSignup = true
+				} else {
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowOutboundCall = true
-				} else {
-					articleDetail.IsShowSignup = true
 				}
 			}