PC端活动授业添加图片

controllers/activity.go

@@ -2506,7 +2506,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 // @Param   ActiveState   query   string  false       "活动进行状态 未开始：1、进行中2、已结束3"
 // @Param   WhichDay   query   string  false       "哪一天 今天：1、明天:2，多个用 , 隔开"
 // @Param   IsPower   query   int  false       "是否选择有权限行业 ，1是 0 否 默认0"
-// @Success 200 {object} models.ActivityTypeListHomeResp
+// @Success 200 {object} models.ActivityTypeListHomeRespPc
 // @router /labelTypeListPc [get]
 func (this *ActivityCoAntroller) LabelTypeListPc() {
 	br := new(models.BaseResponse).Init()
@@ -2562,13 +2562,13 @@ func (this *ActivityCoAntroller) LabelTypeListPc() {
 		}
 	}
 	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
-	list, err := models.GetActivityTypeHomeList()
+	list, err := models.GetActivityTypeHomeListPc()
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
 		return
 	}
-	resp := new(models.ActivityTypeListHomeResp)
+	resp := new(models.ActivityTypeListHomeRespPc)
 	for k, v := range list {
 		var sqlExport string
 		var condition string
@@ -2633,7 +2633,7 @@ func (this *ActivityCoAntroller) LabelTypeListPc() {
 		//标签字段关联的产业与标签处理
 		for k2, v2 := range labelList {
 			labelList[k2].KeyWord = services.LabelStr(v2.KeyWord)
-			labelList[k2].ImgUrlBg = v.ImgUrlBgs
+
 		}
 		list[k].List = labelList
 	}

controllers/report.go

@@ -1880,12 +1880,14 @@ func (this *ReportController) IndustryListByDepartmentPc() {
 	}
 	var articleIdGroup string
 	if keyWord != "" {
+		//获取标的关联的文章ID
 		articleIdSub, err := models.GetArticleIdSubjectGroup(keyWord)
 		if err != nil {
 			br.Msg = "获取信息失败"
 			br.ErrMsg = "获取标的信息失败,Err:" + err.Error()
 			return
 		}
+		//获取产业关联的标的
 		articleIdInd, err := models.GetArticleIndustrialIdGroup(keyWord)
 		if err != nil {
 			br.Msg = "获取信息失败"

models/activity_type.go

@@ -36,6 +36,10 @@ type ActivityTypeListHomeResp struct {
 	List []*ActivityTypeHome
 }
 
+type ActivityTypeListHomeRespPc struct {
+	List []*ActivityTypeHomePc
+}
+
 type ActivityTypeHome struct {
 	ActivityTypeId   int    `description:"活动类型id"`
 	ActivityTypeName string `description:"活动名称"`
@@ -45,6 +49,14 @@ type ActivityTypeHome struct {
 	List             []*CygxActivityLabelList
 }
 
+type ActivityTypeHomePc struct {
+	ActivityTypeId   int    `description:"活动类型id"`
+	ActivityTypeName string `description:"活动名称"`
+	OnlineIco        string `description:"线上线下Ico图标"`
+	ImgUrlBgPc       string `description:"Pc端背景图片"`
+	List             []*CygxActivityLabelList
+}
+
 //列表
 func GetActivityTypeHomeList() (items []*ActivityTypeHome, err error) {
 	o := orm.NewOrm()
@@ -52,3 +64,11 @@ func GetActivityTypeHomeList() (items []*ActivityTypeHome, err error) {
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+//列表
+func GetActivityTypeHomeListPc() (items []*ActivityTypeHomePc, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_activity_type ORDER BY sort DESC`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}