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

controllers/activity.go

@@ -573,6 +573,10 @@ func (this *ActivityCoAntroller) Detail() {
 	if mapUrl[activityId] != nil {
 		activityInfo.ImgUrl = mapUrl[activityId].ImgUrl
 	}
+
+	activityInfo.HighlightsText, _ = services.GetReportContentTextSub(activityInfo.HighlightsText)
+	activityInfo.ExpertText, _ = services.GetReportContentTextSub(activityInfo.Expert)
+	activityInfo.ThemeText, _ = services.GetReportContentTextSub(activityInfo.Theme)
 	//处理按钮是否展示问题
 	resp.Detail = services.ActivityButtonShow(activityInfo)
 	collectCount1, err := models.GetActivityVoiceCollectCount(uid, activityId)

models/activity.go

@@ -167,13 +167,16 @@ type ActivityDetail struct {
 	AmericaTell               string                     `description:"美国拨入号"`
 	ParticipationCode         string                     `description:"参会密码"`
 	Theme                     string                     `description:"主题"`
+	ThemeText                 string                     `description:"主题纯文本"`
 	Expert                    string                     `description:"专家"`
+	ExpertText                string                     `description:"专家纯文本"`
 	ActivityName              string                     `description:"活动名称"`
 	OnlineParticipation       string                     `description:"网络参会"`
 	ReportLink                string                     `description:"报告链接"`
 	City                      string                     `description:"城市"`
 	Address                   string                     `description:"活动地址"`
 	Highlights                string                     `description:"活动亮点"`
+	HighlightsText            string                     `description:"活动亮点纯文本"`
 	Remarks                   string                     `description:"备注"`
 	ShowType                  string                     `description:"人数限制类型，1不展示限制，2可选限制，3强制限制"`
 	IsSignup                  int                        `description:"是否已报名 1是 ，0 否"`