Merge branch 'feature/v4.8.40_wky' of qmx/jy into feature/v4.8.40

src/jfw/front/tags.go

@@ -188,6 +188,7 @@ func (this *Tags) Index(types, name string) {
 		}
 	//行业_地区_信息类型
 	case "industry":
+		areaHref = fmt.Sprintf("/tags/industry/all_%s_all.html", "%v")
 		if len(info) > 3 {
 			checkedKeywords, checkedIndustry, checkedIndustry_2 = this.GetInsturyKeywords(info[3])
 			crumbsNav2 = map[string]interface{}{
@@ -196,12 +197,12 @@ func (this *Tags) Index(types, name string) {
 			}
 			filters["industry"] = checkedIndustry
 			filters["keywords"] = checkedKeywords
-			areaHref = fmt.Sprintf("/tags/industry/%s_%s_%s_%s.html", info[0], "%v", info[2], info[3])
+			//areaHref = fmt.Sprintf("/tags/industry/%s_%s_%s_%s.html", info[0], "%v", info[2], info[3])
 			industryHref = fmt.Sprintf("/tags/industry/%s_%s_%s_%s.html", "%v", info[1], info[3], "%v")
 			checkedIndustry += "_" + checkedIndustry_2
 		} else {
 			haveList = false
-			areaHref = fmt.Sprintf("/tags/industry/%s_%s_all.html", info[0], "%v")
+			//areaHref = fmt.Sprintf("/tags/industry/%s_%s_all.html", info[0], "%v")
 			industryHref = fmt.Sprintf("/tags/industry/%s_%s_all_%s.html", "%v", checkedArea, "%v")
 		}
 		crumbsNav1 = map[string]interface{}{
@@ -492,7 +493,7 @@ func (this *Tags) GetStype(href string) (list []map[string]interface{}) {
 		list = qu.ObjArrToMapArr(l)
 	} else {
 		m := []map[string]interface{}{}
-		data := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name !="拟建项目" order by id`)
+		data := public.BaseMysql.SelectBySql(`select id,name,pid from seo_words.seo_stype where name !="拟建项目" and name != "采购意向" and pid=0 order by id`)
 		codeMap := map[int64][]int64{}
 		level1 := []int64{}
 		nameToCode := map[string]int64{}