xingzai 2 anni fa
parent
commit
2c1da357ff
3 ha cambiato i file con 11 aggiunte e 1 eliminazioni
  1. 1 1
      controllers/home.go
  2. 4 0
      models/resource_data.go
  3. 6 0
      services/resource_data.go

+ 1 - 1
controllers/home.go

@@ -278,7 +278,7 @@ func (this *MobileHomeController) NewList() {
 	var total int
 	resp := new(models.HomeResourceDataListResp)
 
-	//condition += " AND source = 'activityvoice' "
+	//condition += " AND source = 'activityvideo' "
 
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {

+ 4 - 0
models/resource_data.go

@@ -46,6 +46,10 @@ type CygxResourceDataResp struct {
 	IsTrip                  int    `description:"确定行程是否报名 1是 ,0 否"`
 	ActivityTimeText        string `description:"活动预期时间带文字"`
 	TripImgLink             string `description:"行程图片链接"`
+	ChartPermissionId       int    `description:"权限id"`
+	Expert                  string `description:"专家"`
+	Speaker                 string `description:"主讲人"`
+	AuthInfo                *UserPermissionAuthInfo
 }
 
 type HomeResourceDataListResp struct {

+ 6 - 0
services/resource_data.go

@@ -139,6 +139,8 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowAppointment = v.IsShowAppointment
 			mapItems[fmt.Sprint("activity", v.ActivityId)].IsShowDetails = v.IsShowDetails
 			mapItems[fmt.Sprint("activity", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
+			mapItems[fmt.Sprint("activity", v.ActivityId)].Expert = v.Expert
+			mapItems[fmt.Sprint("activity", v.ActivityId)].Speaker = v.Speaker
 			//mapItems[fmt.Sprint("activity", v.ActivityId)].PublishDate = v.ActivityTime
 			mapItems[fmt.Sprint("activity", v.ActivityId)].ImgUrl = imgUrlResp
 			//fmt.Println(v)
@@ -244,9 +246,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			err = errors.New("GetMicroRoadShowDefaultImgConfig, Err: " + e.Error())
 			return
 		}
+		fmt.Println(videoMap)
 		for _, v := range activityVideoList {
+			fmt.Println(v)
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].Title = v.VideoName
 			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ImgUrl = videoMap[v.ChartPermissionId]
+			mapItems[fmt.Sprint("activityvideo", v.VideoId)].ChartPermissionId = v.ChartPermissionId
+			mapItems[fmt.Sprint("activityvideo", v.VideoId)].SourceId = v.ActivityId
 			//mapItems[fmt.Sprint("activityvideo", v.VideoId)].PublishDate = utils.TimeRemoveHms(v.CreateTime)
 		}
 	}