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

controllers/activity.go

@@ -2079,10 +2079,13 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	}
 
 	//添加活动搜索记录
-	if keyWord != "" {
-		go services.AddActivitykeyWordSearch(keyWord, user)
-	}
+	//if keyWord != "" {
+	//	go services.AddActivitykeyWordSearch(keyWord, user)
+	//}
 
+	if activityTypeId == "3" || activityTypeId == "5" {
+		resp.IsShowResearchPoints = true
+	}
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

models/activity.go

@@ -330,6 +330,7 @@ type GetCygxActivityListRep struct {
 	IsJump                 bool   `description:"是否跳转"`
 	IndustrialManagementId int    `description:"产业ID"`
 	IndustryNewLabel       bool   `description:"产业是否新标签"`
+	IsShowResearchPoints   bool   `description:"是否展示研选扣点搜索"`
 }
 
 // 列表

services/activity.go

@@ -2277,9 +2277,6 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 				articleDetail.IsShowMeetingReminder = true
 				articleDetail.IsShowOutboundCall = true
 			}
-		} else {
-			articleDetail.IsExternalLabel = false
-			articleDetail.IsResearchPoints = false
 		}
 
 		//公司线下调研 4