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

src/index.yaml

@@ -96,3 +96,84 @@ topMenu:
         href: /front/entServerTransfer/nzbg
       - name: 招标项目管理
         href: /front/entServerTransfer/tbxmgl
+
+# 区位配置
+areaLocation:
+  - name: 华北
+    child:
+      - name: 北京
+        value: beijing
+      - name: 天津
+        value: tianjin
+      - name: 河北
+        value: hebei
+      - name: 山西
+        value: shanxi
+      - name: 内蒙古
+        value: neimenggu
+  - name: 华中
+    child:
+      - name: 河南
+        value: henan
+      - name: 湖北
+        value: hubei
+      - name: 湖南
+        value: hunan
+  - name: 东北
+    child:
+      - name: 辽宁
+        value: liaoning
+      - name: 吉林
+        value: jilin
+      - name: 黑龙江
+        value: heilongjiang
+  - name: 华东
+    child:
+      - name: 上海
+        value: shanghai
+      - name: 江苏
+        value: jiangsu
+      - name: 浙江
+        value: zhejiang
+      - name: 安徽
+        value: anhui
+      - name: 福建
+        value: fujian
+      - name: 江西
+        value: jiangxi
+      - name: 山东
+        value: shandong
+  - name: 华南
+    child:
+      - name: 广东
+        value: guangdong
+      - name: 广西
+        value: guangxi
+      - name: 海南
+        value: hainan
+  - name: 西南
+    child:
+      - name: 重庆
+        value: chongqing
+      - name: 四川
+        value: sichuan
+      - name: 贵州
+        value: guizhou
+      - name: 云南
+        value: yunnan
+      - name: 西藏
+        value: xizang
+  - name: 西北
+    child:
+      - name: 陕西
+        value: shaanxi
+      - name: 甘肃
+        value: gansu
+      - name: 青海
+        value: qinghai
+      - name: 宁夏
+        value: ningxia
+      - name: 新疆
+        value: xinjiang
+
+seoWebDomain: http://%s.myjy.cn

src/jfw/front/index.go

@@ -88,8 +88,6 @@ func (nIndex *NewIndex) NewIndex() error {
 	nIndex.T["strategyList"] = GetStrategyList()
 	//剑鱼课堂
 	nIndex.T["jySchool"] = jyutil.Course(6, 3)
-	//地区导航
-	nIndex.T["areaNav"] = GetAreaNav()
 
 	return nIndex.Render("/pc/newIndex.html", &nIndex.T)
 }
@@ -137,31 +135,6 @@ func (nIndex *NewIndex) EntServerTransfer(code string) {
 	_ = nIndex.Redirect(toUrl)
 }
 
-type AreaStruct struct {
-	Name string `json:"name"`
-	Url  string `json:"url"`
-}
-
-func GetAreaNav() []map[string]interface{} {
-	areaData := []map[string]interface{}{}
-	areaNode := common.ObjArrToMapArr(config.Seoconfig["areaLocation"].([]interface{}))
-	for _, v := range areaNode {
-		childArr := []AreaStruct{}
-		singleArea := common.ObjToMap(v)
-		for _, val := range common.ObjArrToMapArr((*singleArea)["child"].([]interface{})) {
-			childArr = append(childArr, AreaStruct{
-				Name: common.ObjToString(val["name"]),
-				Url:  fmt.Sprintf(common.InterfaceToStr(config.Seoconfig["seoWebDomain"]), common.ObjToString(val["value"])),
-			})
-		}
-		areaData = append(areaData, map[string]interface{}{
-			"name":  (*singleArea)["name"],
-			"child": childArr,
-		})
-	}
-	return areaData
-}
-
 // 推荐标讯专区
 func GetRecommendBidZone(typ int, pageSize int) (list []map[string]interface{}) {
 	if typ == 0 {

src/jfw/tag/a_init.go

@@ -16,4 +16,5 @@ func init() {
 	xweb.RootApp().AddTmplVar("ParseHtmlCss", ParseHtmlCss)
 	xweb.RootApp().AddTmplVar("ParseHtmlAttr", ParseHtmlAttr)
 	xweb.RootApp().AddTmplVar("Export", Export)
+	xweb.RootApp().AddTmplVar("GetAreaLocations", GetAreaLocations)
 }

src/jfw/tag/util.go

@@ -2,6 +2,10 @@ package tag
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jylog"
+	"context"
+	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
 	"html/template"
 )
 
@@ -24,3 +28,38 @@ func Division(num1, num2 interface{}) interface{} {
 	}
 	return n1 / n2
 }
+
+type AreaLocation struct {
+	Name  string    `json:"name"`
+	Child []AreaDom `json:"child"`
+}
+
+type AreaDom struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+	Url   string `json:"url"`
+}
+
+var JyAreaLocation []*AreaLocation
+
+var initAreaLocations = func() []*AreaLocation {
+	var jyAreaLocation []*AreaLocation
+	if err := g.Cfg("index").MustGet(context.Background(), "areaLocation").Struct(&jyAreaLocation); err != nil {
+		jylog.Errorf("加载areaLocation异常", err)
+		return nil
+	}
+	seoWebDomainFormat := g.Cfg("index").MustGet(context.Background(), "seoWebDomain").String()
+	for i := 0; i < len(jyAreaLocation); i++ {
+		for j := 0; j < len(jyAreaLocation[i].Child); j++ {
+			jyAreaLocation[i].Child[j].Url = fmt.Sprintf(seoWebDomainFormat, jyAreaLocation[i].Child[j].Value)
+		}
+	}
+	return jyAreaLocation
+}
+
+func GetAreaLocations() []*AreaLocation {
+	if len(JyAreaLocation) == 0 {
+		JyAreaLocation = initAreaLocations()
+	}
+	return JyAreaLocation
+}

src/seo.json

@@ -4800,167 +4800,5 @@
   "secSeoWebConfig": {
     "areaCodeMap": {"上海": "shanghai", "云南": "yunnan", "内蒙古": "neimenggu", "北京": "beijing", "吉林": "jilin", "四川": "sichuan", "天津": "tianjin", "宁夏": "ningxia", "安徽": "anhui", "山东": "shandong", "山西": "shanxi", "广东": "guangdong", "广西": "guangxi", "新疆": "xinjiang", "江苏": "jiangsu", "江西": "jiangxi", "河北": "hebei", "河南": "henan", "浙江": "zhejiang", "海南": "hainan", "湖北": "hubei", "湖南": "hunan", "甘肃": "gansu", "福建": "fujian", "西藏": "xizang", "贵州": "guizhou", "辽宁": "liaoning", "重庆": "chongqing", "陕西": "shaanxi", "青海": "qinghai", "黑龙江": "heilongjiang"},
     "area_href_format": "https://%s.jianyu360.cn"
-  },
-  "areaLocation": [
-    {
-      "name": "华北",
-      "child": [
-        {
-          "name":"北京",
-          "value":"beijing"
-        },
-        {
-          "name":"天津",
-          "value":"tianjin"
-        },
-        {
-          "name":"河北",
-          "value":"hebei"
-        },
-        {
-          "name":"山西",
-          "value":"shanxi"
-        },
-        {
-          "name":"内蒙古",
-          "value":"neimenggu"
-        }
-      ]
-    },
-    {
-      "name": "华中",
-      "child": [
-        {
-          "name":"河南",
-          "value":"henan"
-        },
-        {
-          "name":"湖北",
-          "value":"hubei"
-        },
-        {
-          "name":"湖南",
-          "value":"hunan"
-        }
-      ]
-    },
-    {
-      "name": "东北",
-      "child": [
-        {
-          "name":"辽宁",
-          "value":"liaoning"
-        },
-        {
-          "name":"吉林",
-          "value":"jilin"
-        },
-        {
-          "name":"黑龙江",
-          "value":"heilongjiang"
-        }
-      ]
-    },
-    {
-      "name": "华东",
-      "child": [
-        {
-          "name":"上海",
-          "value":"shanghai"
-        },
-        {
-          "name":"江苏",
-          "value":"jiangsu"
-        },
-        {
-          "name":"浙江",
-          "value":"zhejiang"
-        },
-        {
-          "name":"安徽",
-          "value":"anhui"
-        },
-        {
-          "name":"福建",
-          "value":"fujian"
-        },
-        {
-          "name":"江西",
-          "value":"jiangxi"
-        },
-        {
-          "name":"山东",
-          "value":"shandong"
-        }
-      ]
-    },
-    {
-      "name": "华南",
-      "child": [
-        {
-          "name":"广东",
-          "value":"guangdong"
-        },
-        {
-          "name":"广西",
-          "value":"guangxi"
-        },
-        {
-          "name":"海南",
-          "value":"hainan"
-        }
-      ]
-    },
-    {
-      "name": "西南",
-      "child": [
-        {
-          "name":"重庆",
-          "value":"chongqing"
-        },
-        {
-          "name":"四川",
-          "value":"sichuan"
-        },
-        {
-          "name":"贵州",
-          "value":"guizhou"
-        },
-        {
-          "name":"云南",
-          "value":"yunnan"
-        },
-        {
-          "name":"西藏",
-          "value":"xizang"
-        }
-      ]
-    },
-    {
-      "name": "西北",
-      "child": [
-        {
-          "name":"陕西",
-          "value":"shaanxi"
-        },
-        {
-          "name":"甘肃",
-          "value":"gansu"
-        },
-        {
-          "name":"青海",
-          "value":"qinghai"
-        },
-        {
-          "name":"宁夏",
-          "value":"ningxia"
-        },
-        {
-          "name":"新疆",
-          "value":"xinjiang"
-        }
-      ]
-    }
-  ],
-  "seoWebDomain": "http://%s.myjy.cn"
+  }
 }

src/web/templates/pc/template/index/area-nav-module.html

@@ -4,171 +4,19 @@
     <h3 class="module-card-title">地区导航</h3>
   </header>
   <main class="module-card-content area-navigation-card">
+    {{range $v:= GetAreaLocations}}
     <div class="area-aside-item">
       <div class="area-aside-item-name">
-        <p class="highlight-text">华北</p>
+        <p class="highlight-text">{{$v.Name}}</p>
       </div>
       <div class="area-aside-item-children">
+        {{range $n:=$v.Child}}
         <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_bj.html" target="_blank">北京</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_tj.html" target="_blank">天津</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_heb.html" target="_blank">河北</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_sx.html" target="_blank">山西</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_nmg.html" target="_blank">内蒙古</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">华中</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_ha.html" target="_blank">河南</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_hb.html" target="_blank">湖北</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_hn.html" target="_blank">湖南</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">华东</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_sh.html" target="_blank">上海</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_js.html" target="_blank">江苏</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_zj.html" target="_blank">浙江</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_ah.html" target="_blank">安徽</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_fj.html" target="_blank">福建</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_jx.html" target="_blank">江西</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_sd.html" target="_blank">山东</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">西南</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_cq.html" target="_blank">重庆</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_sc.html" target="_blank">四川</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_gz.html" target="_blank">贵州</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_yn.html" target="_blank">云南</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_xz.html" target="_blank">西藏</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">西北</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_sn.html" target="_blank">陕西</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_gs.html" target="_blank">甘肃</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_qh.html" target="_blank">青海</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_nx.html" target="_blank">宁夏</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_xj.html" target="_blank">新疆</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">东北</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_ln.html" target="_blank">辽宁</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_jl.html" target="_blank">吉林</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_hlj.html" target="_blank">黑龙江</a>
-        </div>
-      </div>
-    </div>
-    <div class="area-aside-item">
-      <div class="area-aside-item-name">
-        <p class="highlight-text">华南</p>
-      </div>
-      <div class="area-aside-item-children">
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_gd.html" target="_blank">广东</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_gx.html" target="_blank">广西</a>
-        </div>
-
-        <div class="area-aside-item-child">
-          <a class="cms-link" href="/a_hi.html" target="_blank">海南</a>
+          <a class="cms-link" href="{{$n.Url}}" target="_blank">{{$n.Name}}</a>
         </div>
+        {{end}}
       </div>
     </div>
+    {{end}}
   </main>
 </section>