|
@@ -341,16 +341,14 @@ func (this *ActivityController) ActivityListNew() {
|
|
|
au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
|
|
|
}
|
|
|
}
|
|
|
- list[k].AuthInfo = au
|
|
|
}
|
|
|
-
|
|
|
+ list[k].AuthInfo = au
|
|
|
if mapActivityVoice[v.ActivityId] != nil {
|
|
|
list[k].FileType = 1
|
|
|
list[k].AudioLink = true
|
|
|
if au.HasPermission == 1 {
|
|
|
list[k].VoiceList = mapActivityVoice[v.ActivityId]
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
if mapActivityVideo[v.ActivityId] != nil {
|
|
|
list[k].FileType = 2
|
|
@@ -360,10 +358,7 @@ func (this *ActivityController) ActivityListNew() {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- //fmt.Println(v)
|
|
|
- activityList = append(activityList, services.ActivityButtonShow(v, user))
|
|
|
-
|
|
|
+ activityList = append(activityList, services.ActivityButtonShow(list[k], user))
|
|
|
}
|
|
|
|
|
|
// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
|