fix

controller/public.go

@@ -491,11 +491,18 @@ func BannerHistoryList(c *gin.Context) {
 	cond := ""
 	cond += " enable = 0 "
 
+	total, err := banner.GetBannerListCount(cond)
+	if err != nil {
+		response.FailMsg("获取失败", "获取banner总数失败, Err: "+err.Error(), c)
+		return
+	}
 	list, err := banner.GetBannerList(cond, page, limit)
 	if err != nil {
 		response.FailMsg("获取失败", "获取banner失败, Err: "+err.Error(), c)
 		return
 	}
-
-	response.OkData("获取成功", list, c)
+	var resp respond.BannerRespItem
+	resp.Paging = respond.GetPaging(page, limit, int(total))
+	resp.List = list
+	response.OkData("获取成功", resp, c)
 }

models/response/banner.go

@@ -3,6 +3,6 @@ package response
 import "hongze/hongze_yb/models/tables/banner"
 
 type BannerRespItem struct {
-	List  []*banner.Banner
-	Enable int
+	List   []*banner.Banner `json:"list"`
+	Paging *PagingItem      `json:"paging"`
 }

models/tables/banner/query.go

@@ -12,4 +12,12 @@ func GetBannerList(cond string, page, limit int) (list []*Banner, err error) {
 func GetBannerById(id int) (item *Banner, err error) {
 	err = global.DEFAULT_MYSQL.Where(" id=? ",id).First(&item).Error
 	return
+}
+
+// GetBannerListCount
+func GetBannerListCount(cond string) (total int64, err error) {
+	err = global.DEFAULT_MYSQL.Model(Banner{}).
+		Where(cond).
+		Count(&total).Error
+	return
 }

routers/public.go

@@ -30,7 +30,7 @@ func initPublic(r *gin.Engine) {
 		rGroup.POST("/view_log/update", controller.UpdateViewLog)
 		rGroup.POST("/banner/mark", controller.BannerMark)
 		rGroup.GET("/banner/list", controller.BannerList)
-		rGroup.GET("/banner_history/list", controller.BannerList)
+		rGroup.GET("/banner_history/list", controller.BannerHistoryList)
 	}
 
 	rGroup2 := r.Group("api/public")