|
@@ -205,23 +205,25 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
if v.Days == 0 {
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 1
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLink
|
|
|
+ mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
|
|
|
} else {
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripStatus = 2
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].TripImgLink = v.TripImgLinkFix
|
|
|
- }
|
|
|
- resultTimeStart := utils.StrTimeToTime(v.ActivityTime) //时间字符串格式转时间格式
|
|
|
- resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
|
|
|
- if resultTimeStart.After(time.Now()) {
|
|
|
- mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(1)
|
|
|
- } else if time.Now().After(resultTimeEnd) {
|
|
|
- mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(3)
|
|
|
- } else {
|
|
|
- mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(2)
|
|
|
+ mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeTextByDay
|
|
|
+ resultTimeStart := utils.StrTimeToTime(v.ActivityTime) //时间字符串格式转时间格式
|
|
|
+ resultTimeEnd := utils.StrTimeToTime(v.ActivityTimeEnd) //时间字符串格式转时间格式
|
|
|
+ if resultTimeStart.After(time.Now()) {
|
|
|
+ mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(1)
|
|
|
+ } else if time.Now().After(resultTimeEnd) {
|
|
|
+ mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(3)
|
|
|
+ } else {
|
|
|
+ mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActiveState = strconv.Itoa(2)
|
|
|
+ }
|
|
|
}
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].Title = v.ResearchTheme
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityType = v.SpecialType
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].City = v.City
|
|
|
- mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTimeText = v.ActivityTimeText
|
|
|
+
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ActivityTime = v.ActivityTime
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].IsSignup = v.IsSignup
|
|
|
mapItems[fmt.Sprint("activityspecial", v.ActivityId)].ImgUrl = imgUrlResp
|