|
@@ -12,7 +12,6 @@ import (
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
- "unicode/utf8"
|
|
|
)
|
|
|
|
|
|
// 活动
|
|
@@ -3142,6 +3141,12 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
|
|
|
//}
|
|
|
//isMaker := user.IsMaker
|
|
|
|
|
|
+ mapCity, err := services.GetActivityCityResp()
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
//var sqlExport string
|
|
|
resp := new(models.ActivityTypeListHomeResp)
|
|
|
for k, v := range list {
|
|
@@ -3172,9 +3177,10 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
|
|
|
if v2.YidongActivityId != 0 {
|
|
|
v2.IsExternalLabel = true
|
|
|
}
|
|
|
- if utf8.RuneCountInString(v2.City) != 2 {
|
|
|
- labelList[k2].City = ""
|
|
|
- }
|
|
|
+ labelList[k2].City = mapCity[fmt.Sprint(v2.KeyWord, "{|}", v.ActivityTypeId)]
|
|
|
+ //if utf8.RuneCountInString(v2.City) != 2 {
|
|
|
+ // labelList[k2].City = ""
|
|
|
+ //}
|
|
|
labelList[k2].KeyWord = services.LabelStrV5(v2.KeyWord, v2.IsShowSubjectName, v2.TemporaryLabel)
|
|
|
labelList[k2].ImgUrlBg = v.ImgUrlBgs
|
|
|
if _, ok := mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", labelList[k2].KeyWord)]; ok {
|