Merge branch 'dev/v4.8.47_ws' of qmx/jy into feature/v4.8.47

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

@@ -131,6 +131,9 @@ onceAgain:
 		switch types {
 		case jyutil.Label["area"], jyutil.Label["city"]: //地区
 			if len(codes) == 2 || len(codes) == 1 {
+				if jyutil.SXSMap[codes[0]] != "" { //陕西省为了和pc端地址保持一致
+					codes[0] = jyutil.SXSMap[codes[0]]
+				}
 				if jyutil.AreaCityToCode[codes[0]] != nil {
 					biddingInfo.IsEffective = true
 					currentLocation = append(currentLocation, *jyutil.AreaCityToCode[codes[0]])

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

@@ -54,6 +54,7 @@ var (
 		5: "ZBXYXX",
 		1: "NJXM",
 	}
+	SXSMap             = map[string]string{}
 	defaultTitle       = "剑鱼标讯官网-招标信息查询_全国招标采购信息订阅推送_专业招标大数据服务平台"
 	defaultKeywords    = "招标网站,招标信息查询,剑鱼标讯,招标采购信息,招标大数据平台"
 	defaultDescription = "剑鱼标讯是国内专业的招标大数据服务平台，专注于全国招标采购信息的搜索查询、订阅推送和数据定制化服务。提供涵盖拟在建项目、招标预告、招标公告、中标公告、政府采购、企业工商信息等多种信息类型，帮助企业全方位掌握市场动态变化。招投标大数据平台就用剑鱼标讯。"
@@ -64,6 +65,7 @@ type tkd struct {
 	TITLE       string
 	KEYWORDS    string
 	DESCRIPTION string
+	PARENT      string
 }
 type ReqLimit struct {
 	DoPool   chan struct{}
@@ -172,7 +174,12 @@ func GetAllArea() {
 				Url:  fmt.Sprintf(mobileHref, Label["area"], ck),
 			}
 			if strings.Contains(ck, "_") {
-				AreaToCity[strings.Split(ck, "_")[0]] = append(AreaToCity[strings.Split(ck, "_")[0]], &SeoInfo{
+				cityCode := strings.Split(ck, "_")[0]
+				if cm.PARENT != "" {
+					cityCode = cm.PARENT
+					SXSMap[ck] = cm.PARENT
+				}
+				AreaToCity[cityCode] = append(AreaToCity[cityCode], &SeoInfo{
 					Name: cm.NAME,
 					Url:  fmt.Sprintf(mobileHref, Label["area"], ck),
 				})

src/jfw/modules/app/src/seo.json

@@ -2207,61 +2207,71 @@
       "NAME": "西安市",
       "TITLE": "西安市",
       "KEYWORDS": "西安市",
-      "DESCRIPTION": "西安市"
+      "DESCRIPTION": "西安市",
+      "PARENT": "SXC"
     },
     "SX_TL": {
       "NAME": "铜川市",
       "TITLE": "铜川市",
       "KEYWORDS": "铜川市",
-      "DESCRIPTION": "铜川市"
+      "DESCRIPTION": "铜川市",
+      "PARENT": "SXC"
     },
     "SX_BJ": {
       "NAME": "宝鸡市",
       "TITLE": "宝鸡市",
       "KEYWORDS": "宝鸡市",
-      "DESCRIPTION": "宝鸡市"
+      "DESCRIPTION": "宝鸡市",
+      "PARENT": "SXC"
     },
     "SX_XY": {
       "NAME": "咸阳市",
       "TITLE": "咸阳市",
       "KEYWORDS": "咸阳市",
-      "DESCRIPTION": "咸阳市"
+      "DESCRIPTION": "咸阳市",
+      "PARENT": "SXC"
     },
     "SX_WN": {
       "NAME": "渭南市",
       "TITLE": "渭南市",
       "KEYWORDS": "渭南市",
-      "DESCRIPTION": "渭南市"
+      "DESCRIPTION": "渭南市",
+      "PARENT": "SXC"
     },
     "SX_YB": {
       "NAME": "延安市",
       "TITLE": "延安市",
       "KEYWORDS": "延安市",
-      "DESCRIPTION": "延安市"
+      "DESCRIPTION": "延安市",
+      "PARENT": "SXC"
     },
     "SX_HZ": {
       "NAME": "汉中市",
       "TITLE": "汉中市",
       "KEYWORDS": "汉中市",
-      "DESCRIPTION": "汉中市"
+      "DESCRIPTION": "汉中市",
+      "PARENT": "SXC"
     },
     "SX_YL": {
       "NAME": "榆林市",
       "TITLE": "榆林市",
       "KEYWORDS": "榆林市",
-      "DESCRIPTION": "榆林市"
+      "DESCRIPTION": "榆林市",
+      "PARENT": "SXC"
     },
     "SX_AK": {
       "NAME": "安康市",
       "TITLE": "安康市",
       "KEYWORDS": "安康市",
-      "DESCRIPTION": "安康市"
+      "DESCRIPTION": "安康市",
+      "PARENT": "SXC"
     },
     "SX_SL": {
       "NAME": "商洛市",
       "TITLE": "商洛市",
       "KEYWORDS": "商洛市",
-      "DESCRIPTION": "商洛市"
+      "DESCRIPTION": "商洛市",
+      "PARENT": "SXC"
     },
     "GS_LZ": {
       "NAME": "兰州市",