Browse Source

no message

xingzai 2 years ago
parent
commit
097092f32f
3 changed files with 4 additions and 2 deletions
  1. 1 1
      controllers/activity.go
  2. 2 0
      models/activity.go
  3. 1 1
      models/resource_data.go

+ 1 - 1
controllers/activity.go

@@ -1638,7 +1638,7 @@ func (this *ActivityController) ActivityListSearch() {
 			item.AudioLink = true
 			if v.FileType == 1 {
 				if v.VoiceList != nil {
-					item.VoiceList = v.VoiceList
+					item.VoiceDetail = v.VoiceList
 				}
 			} else {
 				if v.VideoDetail != nil {

+ 2 - 0
models/activity.go

@@ -340,6 +340,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.activity_type_id,
 			art.limit_people_num,
 			1 AS source_type,
+            t.img_url_text,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -368,6 +369,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			"",
 			2 AS source_type,
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art

+ 1 - 1
models/resource_data.go

@@ -53,7 +53,7 @@ type CygxResourceDataResp struct {
 	ActivityTime            string `description:"活动预期时间"`
 	ResourceUrl             string `description:"链接"`
 	AuthInfo                *UserPermissionAuthInfo
-	VoiceList               *CygxActivityVoiceReq      `description:"音频数据"`
+	VoiceDetail             *CygxActivityVoiceReq      `description:"音频数据"`
 	VideoDetail             *CygxActivityVideoListResp `description:"视频数据"`
 	AudioLink               bool                       `description:"是否展示回放按钮"`
 	FileType                int                        `description:"类型: 1-音频; 2-视频"`