Merge branch 'cygx_10.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

controllers/activity.go

@@ -552,6 +552,10 @@ func (this *ActivityController) ActivityListNew() {
 	}
 	for _, v := range activityList {
 		v.SignupType = mapActivitySignup[v.ActivityId]
+		if v.ActivityTypeId != 3 && v.ActivityTypeId != 5 {
+			v.IsExternalLabel = false
+			v.IsResearchPoints = false
+		}
 	}
 
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包

services/activity.go

@@ -513,8 +513,8 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
-		//公司调研电话会的展示处理
-		if v.ActivityTypeId == 3 {
+		//公司调研电话会（3）的展示处理 专家线下沙龙（5）
+		if v.ActivityTypeId == 3 || v.ActivityTypeId == 5 {
 			if v.IsExternalLabel > 0 {
 				item.IsExternalLabel = true
 			}
@@ -658,16 +658,13 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 			}
 
 			if articleDetail.ActivityTypeId == 3 {
-				//司调研电话会(3)、扣点的研选活动只展示我要报名
+				//司调研电话会(3)
 				if articleDetail.IsResearchPoints || articleDetail.LimitPeopleNum > 0 {
 					articleDetail.IsShowSignup = true
 				} else {
 					articleDetail.IsShowMeetingReminder = true
 					articleDetail.IsShowOutboundCall = true
 				}
-			} else {
-				articleDetail.IsExternalLabel = false
-				articleDetail.IsResearchPoints = false
 			}
 
 			//公司线下调研 4
@@ -828,24 +825,6 @@ func ActivityDetaailShow(activityInfo *models.ActivityListResp) (itemActivity *m
 	if activityInfo.SignupNum > activityInfo.LimitPeopleNum {
 		activityInfo.SignupNum = activityInfo.LimitPeopleNum
 	}
-	//if activityInfo.ReportLink != "" {
-	//	artList := strings.Split(activityInfo.ReportLink, "{|}")
-	//	if len(artList) > 0 {
-	//		for _, v := range artList {
-	//			artitem := new(models.ActivityArticleResp)
-	//			artitem.ReportLink = v
-	//			artIdSlice := strings.Split(v, "/")
-	//			if len(artIdSlice) > 0 {
-	//				articleId, _ := strconv.Atoi(artIdSlice[len(artIdSlice)-1])
-	//				artitem.ArticleId = articleId
-	//			}
-	//			activityInfo.ArticleList = append(activityInfo.ArticleList, artitem)
-	//		}
-	//	}
-	//} else {
-	//	activityInfo.ArticleList = make([]*models.ActivityArticleResp, 0)
-	//}
-
 	if activityInfo.ReportLink != "" {
 		artList, e := GetActivityReportLinkToArticleList(activityInfo)
 		if e != nil && e.Error() != utils.ErrNoRow() {

services/activity_button.go

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