上新公告fix

controller/pc/pc.go

@@ -63,6 +63,10 @@ func Banner(c *gin.Context) {
 		resp.ActivityOrReport = 0
 		resp.Activity = activityItem
 		resp.ImgUrl = "https://hongze.oss-accelerate.aliyuncs.com/static/images/202101/20210115/3HJfHLehkVwv0Rxl4Wz747i3aqx8.png"
+	} else {
+		resp.ActivityOrReport = 1
+		resp.ReportId = reportItem.Id
+		resp.ImgUrl = "https://hongze.oss-accelerate.aliyuncs.com/static/images/202101/20210115/3HJfHLehkVwv0Rxl4Wz747i3aqx8.png"
 	}
 
 	response.OkData("查询成功", resp, c)

models/response/pc/classify.go

@@ -56,5 +56,6 @@ func (c ClassifyFirstList) Swap(i, j int) {
 type LatestReleaseResp struct {
 	ActivityOrReport int `description:"活动或专栏：0，活动，1，专栏" json:"redirect_type"`
 	Activity         *yb_activity.YbActivity
+	ReportId         int
 	ImgUrl           string
 }

models/tables/yb_activity/yb_activity.go

@@ -6,7 +6,7 @@ import (
 
 // YbActivity 弘则研小程序 活动表
 type YbActivity struct {
-	ActivityID            int       `gorm:"primaryKey;column:activity_id;type:int(11);not null" json:"-"`                                                     // 活动ID
+	ActivityID            int       `gorm:"primaryKey;column:activity_id;type:int(11);not null" json:"activityID"`                                                     // 活动ID
 	FirstActivityTypeID   int       `gorm:"index:activity_type_id;column:first_activity_type_id;type:int(100);not null;default:0" json:"firstActivityTypeId"` // 第一级的活动类型ID
 	FirstActivityTypeName string    `gorm:"column:first_activity_type_name;type:varchar(30);not null;default:''" json:"firstActivityTypeName"`                // 第一级的活动类型名称
 	ActivityTypeID        int       `gorm:"column:activity_type_id;type:int(100);not null;default:0" json:"activityTypeId"`                                   // 活动类型ID