feat: merge

src/jfw/front/pcIndex.go

@@ -122,16 +122,12 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			m.T["recommend"] = ContentRecommendation()
 			//推荐标讯专区
 			m.T["recommendBeacon"] = RecommendationBeacon()
-<<<<<<< HEAD
 			//热门采购单位
 			m.T["hotBuyers"] = HotBuyerList(entIsNew)
-			m.T["hasLogin"] = m.GetSession("userId") != ""
-=======
 			m.T["hasLogin"] = util.ObjToString(m.GetSession("userId")) != ""
 			m.T["includedInfo"] = GetIncludedInfo()
 			m.T["newbids"] = NewIndexbids(m.Session(), m.Request)
 			m.T["hotkey"] = hotKeyArr
->>>>>>> master
 			return m.Render("/pc/index.html", &m.T)
 		}
 	}

src/web/staticres/css/pc/index.css

@@ -361,14 +361,9 @@
   color: #2A97D1;
   background-color: #fff;
 }
-<<<<<<< HEAD
+
 .jy-index-search .tips .cai-gou{
   /* display: none; */
-=======
-
-.jy-index-search .tips .cai-gou {
-  display: none;
->>>>>>> master
 }
 
 .jy-index-search .tips span.active,

src/web/templates/pc/index.html

@@ -595,14 +595,10 @@
         if(localStorage.pcMainSearchRangeForContent == 'true'){
           $('input[name="selectType"]').val('title,content')
         }
-<<<<<<< HEAD
+
+        // this.lunBoFn() // banner轮播
         // this.getBuyerSearchPower() // 采购单位搜索权限
-        this.lunBoFn() // banner轮播
-        this.getOnlineDataFn() // 在线数据
-=======
-        this.getBuyerSearchPower() // 采购单位搜索权限
         // this.getOnlineDataFn() // 在线数据
->>>>>>> master
         this.setCopyRightForBottom() // 设置copyright
         this.onClickEvent()
       },