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

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

@@ -39,6 +39,9 @@ type Short struct {
 
 func init() {
 	xweb.AddAction(&Short{})
+	if config.Seoconfig["hotArea"] != nil {
+		utils.HotArea = config.Seoconfig["hotArea"].(string)
+	}
 }
 
 var DateFullLayout = "2006-01-02 15:04:05"
@@ -194,6 +197,11 @@ func (s *Short) Article(contentType, stype, id string) error {
 					}
 				}
 			}
+		} else {
+			//未登录顶部导航
+			s.T["hotArea"] = utils.HotAreas
+			s.T["areaList"] = utils.AreaInfo
+			s.T["infoTypeList"], _ = utils.GetInfoType()
 		}
 		//超前项目推送处理
 		s.T["canRead"] = canRead

src/jfw/modules/app/src/web/templates/tags/template/tag-area-nav.html

@@ -2,26 +2,11 @@
   <div class="tag-area-nav-list-container simple-area">
     <div class="tag-area-nav-list-title">分站</div>
     <ul class="tag-area-nav-list">
-      <!-- {{range $val:=.T.hotArea}}
+      {{range $val:=.T.hotArea}}
       <li class="tag-area-nav-item">
         <a href="{{$val.Url}}" title="{{$val.Name}}招标网">{{$val.Name}}</a>
       </li>
-      {{end}} -->
-      <li class="tag-area-nav-item">
-        <a href="/list/area/BJ.html" title="北京招标网">北京</a>
-      </li>
-      <li class="tag-area-nav-item">
-        <a href="/list/area/SD.html" title="山东招标网">山东</a>
-      </li>
-      <li class="tag-area-nav-item">
-        <a href="/list/area/SXC.html" title="陕西招标网">陕西</a>
-      </li>
-      <li class="tag-area-nav-item">
-        <a href="/list/area/JS.html" title="江苏招标网">江苏</a>
-      </li>
-      <li class="tag-area-nav-item">
-        <a href="/list/area/GD.html" title="广东招标网">广东</a>
-      </li>
+      {{end}}
       <li class="tag-area-nav-item highlight-text action-show-more">更多 &gt;</li>
     </ul>
   </div>