ziwen 2 anni fa
parent
commit
f0af1d7665
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. 1 1
      controllers/activity.go
  2. 4 2
      models/activity.go

+ 1 - 1
controllers/activity.go

@@ -1890,7 +1890,7 @@ func (this *ActivityController) ScheduleList() {
 			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
-		if v.ActivityType == 0 {
+		if v.ActivityType == 0 && v.SourceType == 1{
 			if mapAddress[v.City] != "" {
 				list[k].ImgUrl = mapAddress[v.City]
 			} else {

+ 4 - 2
models/activity.go

@@ -485,7 +485,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			1 AS source_type,
 			art.activity_time,
 			0 AS days,
-			"" AS city 
+			art.city AS city,
+			art.host 
 		FROM
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
@@ -517,7 +518,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			2 AS source_type,
 			art.activity_time,
 			art.days,
-			art.city 
+			art.city,
+			art.host 
 		FROM
 			cygx_activity_special AS art
 			INNER JOIN cygx_activity_special_trip AS my ON my.activity_id = art.activity_id