no message

controllers/activity.go

@@ -60,6 +60,10 @@ func (this *ActivityController) LabelTypeList() {
 	}
 	condition += `AND art.is_limit_people = 1 ` + conditionActivity
 	sortTime := ` mintimesort ASC `
+	if activeState == "3" {
+		sortTime = ` timesort DESC  `
+	}
+
 	activityList, err := models.GetCygxActivityList(condition, pars, sortTime, 0, 1000)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -339,7 +343,7 @@ func (this *ActivityController) ActivityListNew() {
 			}
 		}
 		// 新标签
-		if activityId > 0 {
+		if activityId > 0 && activeState != "3" {
 			activityIds := []int{activityId}
 
 			activityNewMap, _, e := services.GetActivityNewLabelMap(activityIds)

controllers/report.go

@@ -98,11 +98,13 @@ func (this *MobileReportController) TradeList() {
 		condition = " AND  a.category_id_two =  " + strconv.Itoa(v.CategoryId)
 		if ChartPermissionId != utils.CE_LUE_ID {
 			var pageSize int
-			if ChartPermissionId == utils.KE_JI_ID {
-				pageSize = 12
-			} else {
-				pageSize = 3
-			}
+			//if ChartPermissionId == utils.KE_JI_ID {
+			//	pageSize = 12
+			//} else {
+			//	pageSize = 3
+			//}
+
+			pageSize = 3
 			listArticle, err := models.GetHomeList(condition, pars, 0, pageSize)
 			if err != nil {
 				br.Msg = "获取信息失败"

services/activity.go

@@ -283,6 +283,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		return
 	}
 
+	mapkeyWord := make(map[string]string)
 	for _, v := range listActivity {
 		if v.Label == "" {
 			continue
@@ -293,6 +294,9 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item := new(models.CygxActivityLabelList)
 		item.KeyWord = LabelStr(v.Label, v.IsShowSubjectName, v.TemporaryLabel)
+		if _, ok := mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)]; ok {
+			continue
+		}
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
 		if v.YidongActivityId != "" {
@@ -300,6 +304,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		}
 		item.IsNew = newLabelMap[v.ActivityId]
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
+		mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord
 	}
 
 	for _, v := range listType {