Merge branch 'cygx_7.2_yidongapi' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity.go

@@ -1331,7 +1331,11 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	//	articleDetail.IsShowAppointment = IsShowAppointmentByactivityInfo(articleDetail, articleDetail.ChartPermissionName)
 	//}
 	articleDetail.IsShowAppointment = false
-
+	//易董的操作按钮都隐藏
+	if articleDetail.YidongActivityId != "" {
+		articleDetail.IsShowSignup = false
+		return
+	}
 	//新的是否展示规则
 	if articleDetail.IsCanAppointmentMinutes == 1 {
 		articleDetail.IsShowAppointment = true
@@ -1386,12 +1390,6 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 		articleDetail.IsShowSignup = true
 	}
 
-	//易董的操作按钮都隐藏
-	if articleDetail.YidongActivityId != "" {
-		articleDetail.IsShowSignup = false
-		return
-	}
-
 	return
 }