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

src/jfw/front/pcIndex.go

@@ -587,7 +587,7 @@ func getstypeMap() []map[string][]map[string]interface{} {
 		}
 	}
 	m2 := []map[string][]map[string]interface{}{} //结构整理 返给前端
-	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告", "拟建项目"}
+	stype_1reg := []string{"招标公告", "招标结果", "招标信用信息", "招标预告"}
 	hotlabstypSort := config.Seoconfig["hotlabstypSort"].([]interface{})
 	notice := util.ObjArrToStringArr(hotlabstypSort[0].([]interface{}))
 	result := util.ObjArrToStringArr(hotlabstypSort[1].([]interface{}))

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

@@ -386,7 +386,7 @@ func (tg *Tags) StrategyIndex() {
 	tg.T["areaList"] = jyutil.AreaInfo
 	tg.T["tdk"] = jyutil.GetTdk("strategy", "")
 	tg.T["Home"] = qu.If(platform == "PC", "/", "/jyapp/jylab/mainSearch").(string)
-	tg.T["currentLocation"] = jyutil.NavigationBar(qu.ObjToString(config.Seoconfig["strategyCode"]))
+	tg.T["currentLocation"] = jyutil.NavigationBar(qu.ObjToString(config.Seoconfig["strategyCode"]), false)
 	tg.Render("/tags/strategy.html", &tg.T)
 }
 
@@ -434,7 +434,7 @@ func (tg *Tags) Class(thisCode string, pageNumStr string) {
 	tg.T["classNav"] = jyutil.ClassNavBar()
 	tg.T["hotArea"] = jyutil.HotAreas
 	tg.T["infoTypeList"] = infoTypeList
-	tg.T["currentLocation"] = jyutil.NavigationBar(thisCode)
+	tg.T["currentLocation"] = jyutil.NavigationBar(thisCode, false)
 	tg.T["areaList"] = jyutil.AreaInfo
 	tg.T["Home"] = qu.If(platform == "PC", "/", "/jyapp/jylab/mainSearch").(string)
 	tg.T["prevPage"] = qu.If(prevPage != "", fmt.Sprintf("/jySchool/%s/index_%s.html", thisCode, prevPage), "").(string)
@@ -470,7 +470,7 @@ func (tg *Tags) Details(id string) {
 	tg.T["infoTypeList"] = infoTypeList
 	tg.T["areaList"] = jyutil.AreaInfo
 	tg.T["Home"] = qu.If(platform == "PC", "/", "/jyapp/jylab/mainSearch").(string)
-	currentLocation := jyutil.NavigationBar(tCode)
+	currentLocation := jyutil.NavigationBar(tCode, true)
 	tg.T["currentLocation"] = append(currentLocation, jyutil.Navigation{Name: qu.ObjToString((*data)["s_title"])})
 	tg.T["tdk"] = jyutil.GetTdk("strategy", "")
 	tg.Render("/tags/details.html", &tg.T)

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

@@ -270,7 +270,9 @@ func GetBlogDetail(_id string) (data *map[string]interface{}) {
 		(*r)["l_createdate"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate1), 0))
 		tmpdate2, _ := (*r)["releasetime"]
 		(*r)["releasetime"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate2), 0))
-		(*r)["s_content"] = template.HTML(util.ObjToString((*r)["s_content"]))
+		newImg := fmt.Sprintf(`<img src="%simgFile`, util.InterfaceToStr(config.Seoconfig["jyadd"]))
+		s_content := strings.Replace(util.InterfaceToStr((*r)["s_content"]), `<img src="/imgFile`, newImg, -1)
+		(*r)["s_content"] = template.HTML(s_content)
 		(*r)["_id"] = se.EncodeString(mgo.BsonIdToSId((*r)["_id"]))
 		s_pic, _ := (*r)["s_pic"].(string)
 		if s_pic != "" {
@@ -409,8 +411,8 @@ func GetSiteInfo(id string) (sType, tType string) {
 	return
 }
 
-// 导航栏
-func NavigationBar(code string) []Navigation {
+// 导航栏 isdetail是否是详情页面
+func NavigationBar(code string, isdetail bool) []Navigation {
 	var (
 		contentNavigat Navigation
 		navigation     []Navigation
@@ -432,14 +434,16 @@ func NavigationBar(code string) []Navigation {
 	if contentNavigat.Name != "" {
 		navigation = append(navigation, contentNavigat)
 	}
-	//移动端招投标攻略面包屑最后一个不加url
-	last := navigation[len(navigation)-1]
-	navigation[len(navigation)-1] = Navigation{
-		Name: last.Name,
-		Code: last.Code,
-		Url:  "",
-		Href: "",
-		Pid:  last.Pid,
+	//除去详情页面 移动端招投标攻略面包屑最后一个不加url
+	if !isdetail {
+		last := navigation[len(navigation)-1]
+		navigation[len(navigation)-1] = Navigation{
+			Name: last.Name,
+			Code: last.Code,
+			Url:  "",
+			Href: "",
+			Pid:  last.Pid,
+		}
 	}
 	return navigation
 }