Merge branch 'dev/v4.8.51_rjj' of qmx/jy into feature/v4.8.51

src/jfw/modules/app/src/app/front/tags.go

@@ -384,7 +384,7 @@ func (tg *Tags) StrategyIndex() {
 	tg.T["hotArea"] = jyutil.HotAreas
 	tg.T["infoTypeList"] = infoTypeList
 	tg.T["areaList"] = jyutil.AreaInfo
-	tg.T["tdk"] = jyutil.GetTdk("strategy", "ztbgl")
+	tg.T["tdk"] = jyutil.GetTdk("strategy", qu.ObjToString(config.Seoconfig["strategyCode"]))
 	tg.T["Home"] = qu.If(platform == "PC", "/", "/jyapp/jylab/mainSearch").(string)
 	tg.T["currentLocation"] = jyutil.NavigationBar(qu.ObjToString(config.Seoconfig["strategyCode"]), false)
 	tg.Render("/tags/strategy.html", &tg.T)

src/jfw/modules/app/src/app/jyutil/tags.go

@@ -861,9 +861,11 @@ func GetTdk(types, name string) (tdk TdkStruct) {
 	case Label["strategy"]:
 		strategyTdk := (config.Seoconfig["strategyTdk"]).(map[string]interface{})
 		newTdk := (strategyTdk[name]).(map[string]interface{})
-		title = qu.ObjToString(newTdk["title"])
-		keywords = qu.ObjToString(newTdk["key"])
-		description = qu.ObjToString(newTdk["description"])
+		if newTdk != nil {
+			title = qu.ObjToString(newTdk["title"])
+			keywords = qu.ObjToString(newTdk["key"])
+			description = qu.ObjToString(newTdk["description"])
+		}
 	}
 	tdk = TdkStruct{
 		Title:       title,