未开始的活动倒叙排序

controllers/activity.go

@@ -2831,13 +2831,25 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
+	var conditionOrder string
 	if activeState == "2" || activeState == "3" {
-		condition += ` ORDER BY art.activity_time DESC  `
+		conditionOrder = ` ORDER BY art.activity_time DESC  `
 	} else if activeState == "2,3" {
-		condition += ` ORDER BY art.active_state ASC, art.activity_time DESC  `
+		conditionOrder = ` ORDER BY art.active_state ASC, art.activity_time DESC  `
 	} else {
-		condition += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
+	}
+
+	if label != "" && activeState == "1" {
+		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
+
+	if activeState == "1" {
+		conditionOrder = ` ORDER BY art.activity_time ASC  `
+	}
+
+	condition += conditionOrder
 	list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize, playBack)
 	if errList != nil {
 		br.Msg = "获取失败"