Merge branch 'cygx/7.4' into debug

controllers/activity.go

@@ -3005,11 +3005,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		resp.List = append(resp.List, services.ActivityButtonShow(v))
 	}
 
-	//添加活动搜索记录
-	if keyWord != "" {
-		go services.AddActivitykeyWordSearch(keyWord, user)
-	}
-
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
 	if label != "" {
 		sourceIndustry, e := models.GetSourceIndustryByName(label)
@@ -3036,6 +3031,11 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 	}
 
+	//添加活动搜索记录
+	if keyWord != "" {
+		go services.AddActivitykeyWordSearch(keyWord, user)
+	}
+
 	resp.Paging = page
 	br.Ret = 200
 	br.Success = true

services/activity.go

@@ -1524,4 +1524,4 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
 	}
 
 	return
-}
+}

utils/constants.go

@@ -111,5 +111,5 @@ const (
 
 	ACTIVITY_ZXDY_ImgUrl1 = "https://hzstatic.hzinsights.com/static/temp/20220830202208/20220830/2c4YHXzwb0uqvIfgPvBV4MZtKNX9.png"
 	ACTIVITY_ZXDY_ImgUrl2 = "https://hzstatic.hzinsights.com/static/temp/20220830202208/20220830/UERktOWyQQEoPeckdy01TEZP09Pu.png"
-	ACTIVITY_ZXDY_ImgUrl3 = "https://hzstatic.hzinsights.com/static/temp/20220830202208/20220830/Db2eF5jffaJlLqq1KtOgrBkddoxZ.png"
+	ACTIVITY_ZXDY_ImgUrl3 = "https://hzstatic.hzinsights.com/cygx/special_list_bg.png"
 )