Merge branch 'clpt_v3.0' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/article.go

@@ -243,7 +243,9 @@ Loop:
 	//var haveResearch bool
 	fmt.Println(hasFree)
 	fmt.Println(haveResearch)
-
+	if detail.SubCategoryName == "专项调研" {
+		detail.IsSpecialArticle = true
+	}
 	resp.HasPermission = hasPermission
 	resp.Detail = detail
 	br.Ret = 200

models/article.go

@@ -30,6 +30,8 @@ type ArticleDetail struct {
 	Seller               SellerResp      `description:"作者昵称"`
 	DepartmentDetail     *DepartmentResp `description:"作者昵称"`
 	Disclaimers          string          `description:"免责声明"`
+	IsSpecialArticle     bool            `description:"是否属于专项调研报告"`
+	SubCategoryName      string          `description:"二级分类"`
 }
 
 type SellerResp struct {

services/activity.go

@@ -396,6 +396,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)
 	articleDetail.ActivityTimeText = activityTimeText
+
 	return
 }