xingzai vor 2 Jahren
Ursprung
Commit
2d998d7177
2 geänderte Dateien mit 13 neuen und 10 gelöschten Zeilen
  1. 12 10
      services/resource_data.go
  2. 1 0
      services/user_permission.go

+ 12 - 10
services/resource_data.go

@@ -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

+ 1 - 0
services/user_permission.go

@@ -13,6 +13,7 @@ var (
 	UserPermissionPopupMsgApplyActivity   = "您暂无权限参加此活动,若想参加可以申请开通对应的试用权限"
 	UserPermissionPopupMsgCallActivity    = "您暂无权限参加此活动,若想参加可以联系对口销售"
 	UserPermissionPopupMsgApplyMicroVideo = "您暂无权限查看此视频,若想查看可以申请开通对应的试用权限"
+	UserPermissionPopupMsgApplyMicroVoice = "您暂无权限查看此音频,若想查看可以申请开通对应的试用权限"
 	UserPermissionPopupMsgCallMicroVideo  = "您暂无权限查看此视频若想查看可以联系对口销售"
 )