修改我关注的企业字段

src/jfw/front/supsearch.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"math/rand"
 	"qfw/util"
+	"strings"
 	"time"
 
 	"github.com/go-xweb/xweb"
@@ -24,6 +25,7 @@ func init() {
 
 //
 func (p *Pcsearch) GetEntName() error {
+
 	return nil
 }
 
@@ -35,6 +37,35 @@ func (p *Pcsearch) PcSearchIndex() error {
 	if len(shareid) == 0 {
 		shareid = fmt.Sprintf("%s%d", config.Seoconfig["jysslby"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
+	industryData, ok := mongodb.Find("rc_rule", `{"s_name":{$ne:null}}`, `{"i_order":1}`, `{"_id":1,"s_name":1}`, false, -1, -1)
+	log.Println(len(*industryData), "---")
+	if ok && industryData != nil && len(*industryData) > 0 {
+		industry := map[string][]string{}
+		sortArray := []string{}
+		for _, v := range *industryData {
+			fatFlag := 0
+			//childFlag := 0
+			industryname, _ := v["s_name"].(string)
+			if strings.Contains(industryname, "_") {
+				fat := strings.Split(industryname, "_")[0]
+				child := strings.Split(industryname, "_")[1]
+				if len(industry[fat]) == 0 {
+					sortArray = append(sortArray, fat)
+				}
+				for _, fv := range industry[fat] {
+					if fv == strings.Trim(child, " ") {
+						fatFlag = 1
+						break
+					}
+				}
+				if fatFlag != 1 {
+					industry[fat] = append(industry[fat], child)
+				}
+			}
+		}
+		p.T["industry"] = industry
+		p.T["sortArray"] = sortArray
+	}
 	p.T["shareid"] = se.EncodeString(shareid)
 	log.Println("-------超级搜索：")
 	return p.Render("/pc/supsearch.html", &p.T)

src/jfw/modules/followent/src/config.json

@@ -13,5 +13,6 @@
     "cacheflag": false,
     "agreement": "http",
 	"followentlimit":10,
+    "followPushRpc": "127.0.0.1:8759",
     "recommendEntLimit":"50"
 }

src/jfw/modules/followent/src/followent/myfwent.go

@@ -44,9 +44,10 @@ func (m *Myfwent) Addfwent() error {
 		status = "m" //超过最大关注数
 	} else {
 		data := make(map[string]interface{})
-		data["winner"] = m.GetString("winner")
+		data["s_winner"] = m.GetString("winner")
 		data["s_userid"] = userId
 		data["s_openid"] = openid
+		data["i_ispush"] = 1
 		data["l_createtime"] = time.Now().Unix()
 		data["s_id"] = s_id
 		if followId = mongodb.Save("jylab_followent", data); len(followId) > 0 {

src/jfw/modules/weixin/src/wx/wx.go

@@ -1087,6 +1087,11 @@ func updateIsPush(openid string, status int) {
 			"i_ispush": status,
 		},
 	}, false, true)
+	tools.MQFW.Update("jylab_followent", map[string]interface{}{"s_openid": openid}, map[string]interface{}{
+		"$set": map[string]interface{}{
+			"i_ispush": status,
+		},
+	}, false, true)
 }
 
 //快速订阅关键词

src/web/staticres/css/dev2/biddingSearch.css

@@ -153,14 +153,58 @@
 #searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx {
   float: right;
   position: relative;
+  z-index: 999;
 }
 
-#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx img {
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx > img {
   width: 45px;
   height: 45px;
   cursor: pointer;
 }
 
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner {
+  transition: -webkit-transform 1.5s;
+  transition: transform 1.5s;
+  transition: transform 1.5s, -webkit-transform 1.5s;
+  -webkit-transform: scale(0);
+          transform: scale(0);
+  position: absolute;
+  left: -154px;
+  top: 0;
+  z-index: 999;
+  width: 200px;
+  font-size: 16px;
+  background-color: #ffffff;
+  border: 1px solid #e0e0e0;
+  cursor: pointer;
+}
+
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-title {
+  height: 44px;
+  line-height: 44px;
+  box-sizing: border-box;
+  padding-left: 10px;
+  color: #2cb7ca;
+  border-bottom: 1px solid #e0e0e0;
+  font-weight: bold;
+}
+
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-ewm {
+  width: 200px;
+  height: 200px;
+  box-sizing: border-box;
+}
+
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-bottom {
+  padding: 10px;
+  border-top: 1px solid #e0e0e0;
+  line-height: 20px;
+}
+
+#searchInner .searchHeader .searchHeader-container .searchInput .search-right-wx .search-right-wx-inner .wx-inner-bottom i {
+  color: #2cb7ca;
+}
+
 #searchInner .searchControl .searchTender {
   /*招标搜索页面*/
   padding: 0 14px;
@@ -254,7 +298,7 @@
 
 #searchInner .searchControl .searchTender .Price {
   /*价格区间*/
-  padding: 20px 0;
+  padding: 19px 0;
   border-bottom: 1px dashed #e0e0e0;
 }
 
@@ -276,7 +320,7 @@
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput {
   float: left;
-  margin-top: -2px;
+/*  margin-top: -2px;*/
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput input[type="text"] {
@@ -302,7 +346,7 @@
   float: left;
   width: 58px;
   height: 28px;
-  margin: -2px 0 0 8px;
+  margin: 0px 0 0 8px;
   background-color: #2cb7ca;
   color: #ffffff;
   cursor: pointer;
@@ -310,7 +354,7 @@
 
 #searchInner .searchControl .searchTender .release-time {
   /*发布时间*/
-  padding: 20px 0;
+  padding: 18px 0 19px;
   border-bottom: 1px dashed #e0e0e0;
 }
 
@@ -327,8 +371,11 @@
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput {
-  margin-top: -2px;
+  margin-top: -7px;
   margin-left: 40px;
+	border: 1px solid #fff;
+    background-color: #fff;
+    padding: 3px 5px;
 }
 
 #searchInner .searchControl .searchTender .release-time .timerInput input[type="text"] {

src/web/staticres/css/dev2/biddingSearch1.css

@@ -1,31 +1,12 @@
-.popQR{
-	position:absolute;
-	border: 1px solid #ccc;
-    width: 200px;
-    right: 0px;
-    height: 290px;
-	background-color: #fff;
-    top: 0px;
-	z-index: 99;
-	box-shadow: 0 0 10px rgba(0,0,0, .24);
-	cursor: pointer;
+.customtime-active{
+    background-color: #F8F7FC !important;
+    border: 1px solid #ddd !important;
+    padding: 3px 5px;
 }
-.promptheader{
-	font-size: 16px;
-    color: #2cb7ca;
-    font-weight: bold;
-    padding-left: 10px;
-    text-align: left;
-    border-bottom: 1px solid #f4f4f9;
-    line-height: 40px;
-}
-#keyImg{
-	width: 190px !important;
-    height: 190px !important;
-    vertical-align: middle;
-}
-.promptbottom{
-	padding:10px;
-	line-height:22px;
-	text-align:center;
+.pricefat{
+	float: left;
+	margin-top: -8px;
+	border: 1px solid #fff;
+    background-color: #fff;
+	padding: 3px 5px;
 }

src/web/staticres/js/biddingSearch.js

@@ -1,5 +1,23 @@
 $(function() {
 
+	/*二维码鼠标移入移出*/
+	ewmMoveHover()
+
+	function ewmMoveHover() {
+		var $div = $(".search-right-wx .search-right-wx-inner"),
+			$parent = $(".search-right-wx");
+		$parent.on("mouseover",function(){
+			$div.css({
+				"transform":"scale(1)"
+			})
+		})
+		$parent.on("mouseout",function(){
+			$div.css({
+				"transform":"scale(0)"
+			})
+		})
+	}
+
 	/*筛选下拉*/
 	screenBtnTab();
 
@@ -78,7 +96,7 @@ $(function() {
 		/*更多显示 影藏*/
 		if($moreBtn !== "") {
 			/*影藏行业*/
-			$content.children().not(".parent-node").hide();
+			$content.children().not(".parent-node").not("#induAll").hide();
 			$moreBtn.on('click', function() {
 				$(this).toggleClass("up");
 				if($(this).hasClass("up")) {
@@ -86,7 +104,7 @@ $(function() {
 					$content.children().show();
 				} else {
 					$(this).text("更多");
-					$content.children().not(".parent-node").hide();
+					$content.children().not(".parent-node").not("#induAll").hide();
 				}
 			});
 		}
@@ -137,33 +155,34 @@ $(function() {
 			$(this).addClass("active").siblings().removeClass("active")
 		})
 	}
-	
+
 	/*表格 列表样式切换*/
 	tabListsConcrol()
-	function tabListsConcrol (){
+
+	function tabListsConcrol() {
 		var $tabBtn = $(".seaTender-inner  .right-tabBtn button"),
 			$controlDiv = $(".tabContainer>div"),
 			$controlDiv_2 = $(".tabContainer-2>div");
-			$tabBtn.on("click",function(){
-				$(this).addClass("active").siblings().removeClass("active");
-				$controlDiv.eq($(this).index()).show().siblings().hide();
-				$controlDiv_2.eq($(this).index()).show().siblings().hide();
-			})
-		
+		$tabBtn.on("click", function() {
+			$(this).addClass("active").siblings().removeClass("active");
+			$controlDiv.eq($(this).index()).show().siblings().hide();
+			$controlDiv_2.eq($(this).index()).show().siblings().hide();
+		})
+
 	}
-	
+
 	/*全文搜索 标题搜索 添加类名*/
 	luceneTab();
-	function luceneTab(){
+
+	function luceneTab() {
 		var $tab = $(".seaTender-inner .tabTitle li"),
 			$tabDIv = $(".tabContainer");
-			
-		$tab.on("click",function(){
+
+		$tab.on("click", function() {
 			$(this).find("a").addClass("active").parent().siblings().find("a").removeClass("active");
 			$tabDIv.eq($(this).index()).show().siblings().not(".tabTitle").hide()
-			
+
 		})
 	}
-	
 
 })

src/web/staticres/js/superSearch.js

@@ -0,0 +1,37 @@
+$(function() {
+	$("#minprice").click(function(){
+		$(".pricebut").show();
+		$(".pricefat").addClass("customtime-active");
+	})
+	$("#maxprice").click(function(){
+		$(".pricebut").show();
+		$(".pricefat").addClass("customtime-active");
+	})
+	$("#mintime").click(function(){
+		$("#timebut").show();
+		$(".timerInput").addClass("customtime-active");
+	})
+	$("#maxtime").click(function(){
+		$("#timebut").show();
+		$(".timerInput").addClass("customtime-active");
+	})
+	//
+	$(".pricebut").click(function(){
+		var minp = $("#minprice").val();
+		var maxp = $("#maxprice").val();
+		if (minp==""||maxp==""){
+			return false;
+		}
+		if (minp>maxp){
+			$("#minprice").val(maxp);
+			$("#maxprice").val(minp);
+		}
+		$(this).hide();
+		$(".pricefat").removeClass("customtime-active");
+	})
+	//
+	$("#timebut").click(function(){
+		$(this).hide();
+		$(".timerInput").removeClass("customtime-active");
+	})
+})

src/web/templates/pc/supsearch.html

@@ -12,7 +12,6 @@
 <link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script src="/js/jquery.cookie.js"></script>
-<script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
 <style type="text/css">
 /*j-wx-code Start*/
 .j-wx-code{
@@ -89,21 +88,31 @@
 	     -o-animation-fill-mode:forwards;
 	        animation-fill-mode:forwards;
 }
-.navigation{
-	display:block;
-}
 a{
 	text-decoration: none !important;
 }
 </style>
 <script>
 $(function(){
-	$(".searchname").on("input propertychange",function(){
-		var inputval = $("#searchinput").val();
-		
-  	});
+	var industry = {{.T.industry}}
+	var sortArray = {{.T.sortArray}}
+	var industryhtml = '<span id="induAll" class="active">全部</span>';
+	if (sortArray!=null&&sortArray.length>0){
+		for(var i in sortArray){
+			var fat = sortArray[i]
+			var childlist = industry[fat]
+			industryhtml+='<i class="diver"></i>'
+					+'<font class="parent-node ">'+fat+'</font>'
+			for (var j in childlist){
+				industryhtml+='<font>'+childlist[j]+'</font>'
+			}
+		}
+		$(".industry-content").html(industryhtml)
+	}
 })
 </script>
+<script src="/js/biddingSearch.js?v={{Msg "seo" "version"}}"></script>
+<script src="/js/superSearch.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <body>
 {{include "/common/pchead.html"}}
@@ -122,7 +131,7 @@ $(function(){
 					<input class="searchname" autocomplete="off" type="search" name="" id="searchinput" value="" name="keywords" placeholder="高速公路" />
 
 					<input type="submit" value="搜索" />
-					<div class="searchSlideText">
+<!--					<div class="searchSlideText">
 						<ul>
 							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
 							<li>滁州市<i>万达集团</i>公司</li>
@@ -137,7 +146,7 @@ $(function(){
 							<li>大连<i>万达集团</i>股份有限公司天津共享服务分公司</li>
 							<li>大连<i>万达集团</i>股份有限公司北京投资管理分公司</li>
 						</ul>
-					</div>
+					</div>-->
 				</form>
 				<!--筛选-->
 				<div id="screenBtn" class="screen up">
@@ -150,10 +159,16 @@ $(function(){
 				<!--二维码-->
 				<div class="search-right-wx">
 					<img src="/images/biddingSearch/sea-right-wx.png" />
-					<div class="popQR" style="display:none;">
-						<div class="promptheader">扫描订阅关键词</div>
-						<div><img  id="keyImg" src="/front/share/{{.T.shareid}}"/></div>
-						<div class="promptbottom">微信扫一扫<br>随时随地掌握招标信息</div>
+					<div class="search-right-wx-inner">
+						<div class="wx-inner-title">
+							扫码关注剑鱼招标订阅
+						</div>
+						<div class="wx-inner-ewm">
+							<img  id="keyImg" src="/front/share/{{.T.shareid}}"/>
+						</div>
+						<div class="wx-inner-bottom">
+							微信扫一扫,及时获取及时获取<i>"1"</i>相关招标信息
+						</div>
 					</div>
 				</div>
 			</div>
@@ -175,80 +190,7 @@ $(function(){
 					更多
 				</div>
 				<div class="industry-content">
-					<span id="induAll" class="active">全部</span>
-					<i class="diver"></i>
-					<font class="parent-node ">建筑工程</font>
-					<font>勘察设计</font>
-					<font>工程施工</font>
-					<font>工程监理</font>
-					<font>材料设备</font>
-					<i class="diver"></i>
-					<font class="parent-node">水利水电</font>
-					<font>水利工程</font>
-					<font>发电工程</font>
-					<font>航运工程</font>
-					<font>其他工程</font>
-					<i class="diver"></i>
-					<font class="parent-node">能源化工</font>
-					<font>原材料</font>
-					<font>仪器仪表</font>
-					<font>设备</font>
-					<font>化工产品</font>
-					<font>新能源</font>
-					<i class="diver"></i>
-					<font class="parent-node">弱电安防</font>
-					<font>综合布线</font>
-					<font>智能系统</font>
-					<font>智能家居</font>
-					<i class="diver"></i>
-					<font class="parent-node">信息技术</font>
-					<font>系统集成及安全</font>
-					<font>软件开发</font>
-					<font>运维服务</font>
-					<font>其他</font>
-					<i class="diver"></i>
-					<font class="parent-node">行政办公</font>
-					<font>办公家具</font>
-					<font>通用办公设备</font>
-					<font>专业设备</font>
-					<font>办公用品</font>
-					<i class="diver"></i>
-					<font class="parent-node">机械设备</font>
-					<font>农业机械 </font>
-					<font>矿山机械</font>
-					<font>工程机械</font>
-					<font>机械零部件 </font>
-					<font>机床</font>
-					<font>车辆</font>
-					<font>其他机械设备</font>
-					<i class="diver"></i>
-					<font class="parent-node">交通工程</font>
-					<font>道路工程 </font>
-					<font>轨道工程</font>
-					<font>桥梁工程</font>
-					<font>隧道工程 </font>
-					<font>其他工程</font>
-					<i class="diver"></i>
-					<font class="parent-node">医疗卫生</font>
-					<font>设备 </font>
-					<font>耗材</font>
-					<font>药品</font>
-					<i class="diver"></i>
-					<font class="parent-node">市政设施</font>
-					<font>市政道路</font>
-					<font>市政绿化</font>
-					<font>管网线路</font>
-					<font>综合项目</font>
-					<i class="diver"></i>
-					<font class="parent-node">服务采购</font>
-					<font>法律咨询</font>
-					<font>会计服务</font>
-					<font>物业服务</font>
-					<font>审计服务</font>
-					<font>安保服务</font>
-					<font>物流服务</font>
-					<font>其他服务</font>
-
+					
 				</div>
 			</div>
 			<!--价格区间-->
@@ -258,12 +200,14 @@ $(function(){
 				</div>
 				<div class="Price-content clearfix">
 					<span class="active">全部</span>
-					<div class="PriceInput">
-						<input type="text" name="" id="" value="" placeholder="最低价              万元" />
-						<span></span>
-						<input type="text" name="" id="" value="" placeholder="最高价              万元" />
+					<div class="pricefat">
+						<div class="PriceInput">
+							<input type="text" name="minprice" id="minprice" value="" placeholder="最低价              万元" />
+							<span></span>
+							<input type="text" name="maxprice" id="maxprice" value="" placeholder="最高价              万元" />
+						</div>
+						<button class="pricebut" style="display:none;">确定</button>
 					</div>
-					<button>确定</button>
 				</div>
 			</div>
 			<!--发布时间-->
@@ -280,10 +224,10 @@ $(function(){
 					</ul>
 				</div>
 				<div class="timerInput fl">
-					<input type="text" name="" id="" value="" placeholder="" />
+					<input type="text" name="mintime" id="mintime" value="" placeholder="" />
 					<span></span>
-					<input type="text" name="" id="" value="" placeholder="" />
-					<button class="fl">确定</button>
+					<input type="text" name="maxtime" id="maxtime" value="" placeholder="" />
+					<button class="fl" id="timebut">确定</button>
 				</div>
 			</div>
 			<!--项目地区-->