no message

controllers/user.go

@@ -864,6 +864,7 @@ func (this *UserController) CollectList() {
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
+
 	resp := new(models.ArticleReportBillboardLIstPageResp)
 	if len(list) == 0 {
 		page := paging.GetPaging(currentIndex, pageSize, total)
@@ -944,9 +945,21 @@ func (this *UserController) CollectList() {
 		}
 	}
 
+	//研选的五张图片
+	detailResearch, err := models.GetConfigByCode("category_research_img_url")
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetConfigByCode Err:" + err.Error()
+		return
+	}
+	researchList := strings.Split(detailResearch.ConfigValue, "{|}")
+
 	lenList := len(list)
 	for i := 0; i < lenList; i++ {
 		item := list[i]
+		knum := item.ArticleId % 5
+		list[i].ImgUrlPc = researchList[knum]
+
 		article := articleMap[item.ArticleId]
 		if list[i].IsSpecialInt != 1 {
 			list[i].Title = article.Title
@@ -1210,10 +1223,20 @@ func (this *UserController) BrowseHistoryList() {
 		}
 	}
 
+	//研选的五张图片
+	detailResearch, err := models.GetConfigByCode("category_research_img_url")
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetConfigByCode Err:" + err.Error()
+		return
+	}
+	researchList := strings.Split(detailResearch.ConfigValue, "{|}")
 	lenList := len(list)
 	for i := 0; i < lenList; i++ {
 		item := list[i]
 		article := articleMap[item.ArticleId]
+		knum := item.ArticleId % 5
+		list[i].ImgUrlPc = researchList[knum]
 		if article != nil {
 			list[i].Title = article.Title
 			list[i].PublishDate = utils.TimeRemoveHms2(article.PublishDate)
@@ -1230,13 +1253,6 @@ func (this *UserController) BrowseHistoryList() {
 				list[i].Pv = mapArticleCollectNum[article.ArticleId].Pv
 				list[i].IsCollect = mapArticleCollectNum[article.ArticleId].IsCollect
 			}
-			//list[i].TitleEn = article.TitleEn
-			//list[i].UpdateFrequency = article.UpdateFrequency
-			//list[i].CreateDate = article.CreateDate
-			//list[i].Body, _ = services.GetReportContentTextSub(article.Body)
-			//list[i].Abstract = article.Abstract
-			//list[i].CategoryName = article.CategoryName
-			//list[i].SubCategoryName = article.SubCategoryName
 		}
 	}
 	page := paging.GetPaging(currentIndex, pageSize, total)

models/activity.go

@@ -569,6 +569,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, startSize, p
 			art.yidong_activity_id,
 			art.is_can_appointment_minutes,
 			art.activity_type_id,
+			art.activity_type_name,
 			art.limit_people_num,
 			art.is_limit_people,
 			1 AS source_type,

models/report.go

@@ -817,6 +817,7 @@ type ArticleReportBillboardResp struct {
 	IndustryTags    []string `description:"研选专栏行业标签"`
 	CompanyTags     []string `description:"研选专栏公司标签"`
 	SpecialColumnId int      `description:"专栏栏目id"`
+	ImgUrlPc        string   `description:"图片链接"`
 	List            []*IndustrialManagementIdInt
 }
 

services/activity.go

@@ -729,6 +729,15 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		}
 	}
 
+	if activityDetail.ActivityTypeName == "买方线下交流" {
+		activityDetail.LabelKeywordImgLink = utils.LABEL_ICO_1
+	}
+	if activityDetail.ActivityTypeName == "专家电话会" || activityDetail.ActivityTypeName == "专家线下沙龙" {
+		activityDetail.LabelKeywordImgLink = utils.LABEL_ICO_2
+	}
+	if activityDetail.ActivityTypeName == "公司调研电话会" {
+		activityDetail.LabelKeywordImgLink = utils.LABEL_ICO_3
+	}
 	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
 	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 	if e != nil {
@@ -811,6 +820,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		IsExternalLabel:         v.IsExternalLabel,
 		SiginupDeadline:         v.SiginupDeadline,
 		CancelDeadline:          v.CancelDeadline,
+		LabelKeywordImgLink:     v.LabelKeywordImgLink,
 	}
 	au := new(models.UserPermissionAuthInfo)
 	au.SellerName = authInfo.SellerName