Browse Source

wip:菜单底部走配置

wangkaiyue 1 năm trước cách đây
mục cha
commit
e598205287
3 tập tin đã thay đổi với 11 bổ sung9 xóa
  1. 1 1
      src/config.yaml
  2. 6 5
      src/jfw/tag/menu.go
  3. 4 3
      src/web/templates/common/pc-header-nav-mini.html

+ 1 - 1
src/config.yaml

@@ -11,5 +11,5 @@ publicserviceKey: "publicservice.rpc"
 
 database:
   default:
-    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo?dial_timeout=2000ms&max_execution_time=60"
+    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
     debug: true

+ 6 - 5
src/jfw/tag/menu.go

@@ -8,9 +8,10 @@ import (
 )
 
 const (
-	mainSite  = iota //剑鱼主站
-	brandFlag        //品牌网站
-	infoFlag         //资讯网站
+	mainSite   = iota //剑鱼主站
+	brandFlag         //品牌网站
+	infoFlag          //资讯网站
+	commonSite        //新版首页
 
 	cacheKey = "jyMenuCache"
 )
@@ -80,7 +81,7 @@ func AllMenuCache() (cache *MenuCache) {
 func (mc *MenuCache) GetSite(url string, isTopMenu bool) int {
 	//配置文件
 	if url == "/" {
-		return mainSite
+		return commonSite
 	} else if url == "/brand" {
 		return brandFlag
 	} else if url == "/industryInfo/index" {
@@ -112,7 +113,7 @@ func (mc *MenuCache) GetSite(url string, isTopMenu bool) int {
 	if len(sites) == 1 {
 		return sites[0]
 	}
-	return mainSite
+	return commonSite
 }
 
 type SiteMenu struct {

+ 4 - 3
src/web/templates/common/pc-header-nav-mini.html

@@ -31,9 +31,10 @@
                 <li class="menu-item">
                     <a class="menu-vip-button" href="/product/index?serviceType=0"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
                 </li>
-                {{range $menu :=(Ad "jy-pc-new-top-btns" -1 .Host )}}
-                <li class="menu-item hover-underline" name="{{$menu.S_remark}}">
-                  <a href="{{$menu.S_link}}">{{$menu.S_remark}}</a>
+                {{$TopMenus :=JyTopMenu .Request.URL.Path}}
+                {{range $menu := $TopMenus.MenuList }}
+                <li class="menu-item hover-underline" name="{{$menu.Title}}">
+                  <a href="{{$menu.Link}}">{{$menu.Title}}</a>
                 </li>
                 {{end}}
                 <li class="menu-item message-menu login-show" id="noticed" style="display: none;">