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

services/activity.go

@@ -2077,6 +2077,9 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
 	articleDetail.ActivityTimeText = activityTimeText
+	if articleDetail.SourceType != 2 {
+		articleDetail.SourceType = 1
+	}
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
@@ -2159,9 +2162,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 			articleDetail.ActivityTypeName = "分析师电话会"
 		}
 	}
-	if articleDetail.SourceType != 2 {
-		articleDetail.SourceType = 1
-	}
+
 	//如果是易董创建的活动，展示我要报名，不展示预约外呼
 	if articleDetail.IsYidongConduct {
 		articleDetail.IsShowSignup = true