Merge branch 'dev2.0' of 192.168.3.17:qmx/jy into dev2.0

extend/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"log"
+	"qfw/util/mongodb"
+)
+
+func main() {
+
+	mongodb.InitMongodbPool(1, "192.168.3.207:27080", "spider")
+	//log.Println(FindById("enterprise", "556d858ec2e875307286f863", `{"_id":1}`))
+	//log.Println(FindOne("identification", "{'o_identificationinfo.s_id':'12312312312312312x','i_identificationtype':2}"))
+	//查id字段
+	log.Println(mongodb.FindById("bidding", "58d8ae66e13823122b666c56", `{"title":1}`))
+	//log.Println((*FindById("user", "5668e447af537458a9000006", `{"credit_a":1}`))["credit_a"].(int64))
+
+}

src/config.json

@@ -14,7 +14,7 @@
     "agreement": "http",
     "webdomain": "http://webws.qmx.top",
     "redirect": {
-        "searchinfo": "/swordfish/search",
+        "searchinfo": "/jylab/mainSearch",
         "rssset": "/wxkeyset/keyset/index",
         "viewdemo": "/front/viewdemo",
         "wxpushlist": "/wxpush/bidinfo/%s",
@@ -29,7 +29,9 @@
         "about": "/swordfish/about",
         "followset": "/follow/set/%s/%s",
         "myfeedbacks": "/swordfish/myFeedbacks",
-        "zqluckdraw": "/active/zqLuckdraw"
+        "zqluckdraw": "/active/zqLuckdraw",
+		"followent":"/jylab/followent/addEnt",
+		"labindex":"/jylab/index"
     },
     "jy_activeset": {
         "activitystartcode": "3201000000",

src/jfw/front/entsearch.go

@@ -100,7 +100,7 @@ func (e *Entsearch) PcSearchZbqyAjax() error {
 	fmt.Println("pricetype==", pricetype)
 
 	list := []map[string]interface{}{}
-	list = jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, 1, 10)
+	//list = jylabutil.GetProjectByEntName(searchvalue, area, minprice, maxprice, 1, 10)
 	//jyutil.BidListConvert("", &list)
 
 	for k, v := range list {

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

@@ -846,36 +846,47 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 	urlstr := fmt.Sprintf("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s/wx/oauth/%s&response_type=code&scope=snsapi_base&state=1#wechat_redirect", config.Sysconfig["appid"], config.Sysconfig["webdomain"], "%s")
 	log.Println(urlstr)
 	menu := &Menu{make([]MenuButton, 3)}
-	menu.Buttons[0].Name = "招标搜索"
+	menu.Buttons[0].Name = "搜索"
 	menu.Buttons[0].Type = MenuButtonTypeUrl
 	menu.Buttons[0].Url = fmt.Sprintf(urlstr, "searchinfo")
 
-	menu.Buttons[1].Name = "招标订阅"
-	menu.Buttons[1].Type = MenuButtonTypeUrl
-	menu.Buttons[1].Url = fmt.Sprintf(urlstr, "rssset")
+	menu.Buttons[1].Name = "发现"
+	menu.Buttons[1].SubButtons = make([]MenuButton, 5)
 
-	menu.Buttons[2].Name = "发现"
-	menu.Buttons[2].SubButtons = make([]MenuButton, 5)
+	menu.Buttons[1].SubButtons[0].Name = "产品更新/帮助"
+	menu.Buttons[1].SubButtons[0].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[0].Url = fmt.Sprintf(urlstr, "useskill")
 
-	menu.Buttons[2].SubButtons[0].Name = "产品更新/帮助"
+	menu.Buttons[1].SubButtons[1].Name = "关于剑鱼/合作"
+	menu.Buttons[1].SubButtons[1].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[1].Url = fmt.Sprintf(urlstr, "about")
+
+	menu.Buttons[1].SubButtons[2].Name = "\u270d意见反馈"
+	menu.Buttons[1].SubButtons[2].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[2].Url = fmt.Sprintf(urlstr, "feedback")
+
+	menu.Buttons[1].SubButtons[3].Name = string(0x1F465) + "招标社区"
+	menu.Buttons[1].SubButtons[3].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[3].Url = fmt.Sprintf(urlstr, "community")
+
+	menu.Buttons[1].SubButtons[4].Name = string(0x1F4A1) + "剑鱼实验室"
+	menu.Buttons[1].SubButtons[4].Type = MenuButtonTypeUrl
+	menu.Buttons[1].SubButtons[4].Url = fmt.Sprintf(urlstr, "labindex")
+
+	menu.Buttons[2].Name = "我"
+	menu.Buttons[2].SubButtons = make([]MenuButton, 3)
+
+	menu.Buttons[2].SubButtons[0].Name = "关注的企业"
 	menu.Buttons[2].SubButtons[0].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[0].Url = fmt.Sprintf(urlstr, "useskill")
+	menu.Buttons[2].SubButtons[0].Url = fmt.Sprintf(urlstr, "followent")
 
-	menu.Buttons[2].SubButtons[1].Name = "\u2139关于剑鱼"
+	menu.Buttons[2].SubButtons[1].Name = string(0x1F4C1) + "关注的项目"
 	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "about")
+	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "myfollow")
 
-	menu.Buttons[2].SubButtons[2].Name = "\u270d意见反馈"
+	menu.Buttons[2].SubButtons[2].Name = "\u2764招标订阅"
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "feedback")
-
-	menu.Buttons[2].SubButtons[3].Name = string(0x1F465) + "招标社区"
-	menu.Buttons[2].SubButtons[3].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[3].Url = fmt.Sprintf(urlstr, "community")
-
-	menu.Buttons[2].SubButtons[4].Name = "\u2764我关注的项目"
-	menu.Buttons[2].SubButtons[4].Type = MenuButtonTypeUrl
-	menu.Buttons[2].SubButtons[4].Url = fmt.Sprintf(urlstr, "myfollow")
+	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "rssset")
 
 	err := Mux.CreateMenu(menu)
 	if err != nil {

src/web/staticres/js/login.js

@@ -65,6 +65,7 @@ var JYLogin = function(shareid,kopshareid,num){
 				getNewShareId(mynum);
 				jylgi = 0;
 			}
+			console.log(jylgi+"-----")
 		}
 	},1500)
 }
@@ -220,6 +221,7 @@ var processpage = function(shareid,num){
 				break;
 			}
 			$("#myModal").modal("hide");
+			$("#labModal").modal("hide");
 			if(dataId!=""){
 				setTimeout(function(){
 					var aHref = "";

src/web/templates/common/pcbottom.html

@@ -94,7 +94,7 @@
 				</div>
 			</div>
 			<div class="jy_renzheng">
-				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
+				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
 				<div style="color: #B9B9BB;" id="cpinfo">©2015-2016 zhaobiao.info 版权所有 | 豫ICP备15016539号-2</div>
 			</div>
 		</div>
@@ -162,13 +162,13 @@
 //
 function areasearch(scope){
 		$("#bottomform").remove();
-		$(".j-bottom").append('<form id="bottomform" action="/swordfish/searchinfolist.html" method="post" class="hide" ><input type="hidden" name="area" value="'+scope+'"></form>');
+		$(".j-bottom").append('<form id="bottomform" action="/jylab/supsearch/index.html" method="post" class="hide" ><input type="hidden" name="area" value="'+scope+'"></form>');
 		$("#bottomform").submit();
 }
 //
 function stypesearch(stype){
 		$("#bottomform").remove();
-		$(".j-bottom").append('<form id="bottomform" action="/swordfish/searchinfolist.html" method="post" class="hide" ><input type="hidden" name="subtype" value="'+stype+'"></form>');
+		$(".j-bottom").append('<form id="bottomform" action="/jylab/supsearch/index.html" method="post" class="hide" ><input type="hidden" name="subtype" value="'+stype+'"></form>');
 		$("#bottomform").submit();
 }
 //

src/web/templates/common/pchead.html

@@ -3,7 +3,7 @@
 		<ul>
 			<li class="j-nav-logo" onclick="window.location.href='/'" style="width:120px;"><a><img src="/images/swordfish/sf_01.png"></a></li>
 				<li class="navigation">
-					<form method="post" action="/swordfish/searchinfolist.html" id="zbSeatchIndex" style="position:relative;">
+					<form method="post" action="/jylab/supsearch/index.html" id="zbSeatchIndex" style="position:relative;">
 			            <span class="j-inputgroup">
 							<input class="nav-search" type="text" name="keywords" placeholder="请输入您要查询的招标信息" value="{{.T.keywords}}" />
 			<!--				<img src="/images/pc_20.png" class="j-clearicon" id="t-clear">-->
@@ -17,7 +17,7 @@
 				<div class='useronline' id="login"></div>
 			</li>
 			<li class="j-nav-link" data-toggle="modal" data-target="#bidcommunity"><a>招标社区</a></li>
-			<li class="j-nav-link" onclick="window.location.href='/swordfish/searchinfolist.html'">
+			<li class="j-nav-link" onclick="window.location.href='/jylab/supsearch/index.html'">
 			<a class="newhead">招标搜索</a></li>
 			<li class="j-nav-link" onclick="window.location.href='/list/stype/NJ.html'"><a>拟建项目</a></li>
 			<li class="j-nav-link" onclick="window.location.href='/front/subscribe.html'"><a>招标订阅</a></li>

src/web/templates/pc/classifylist.html

@@ -172,6 +172,13 @@ a{
 .j-clearicon{
 	right:118px !important;
 }
+.bidbut{
+	background-color: #2cb7ca;
+    color: #fff;
+    font-size: 14px;
+    padding: 4px 22px 5px 23px;
+	cursor: pointer;
+}
 </style>
 <script>
 var industrylist = {{.T.industrylist}}
@@ -260,6 +267,7 @@ $(function(){
 	$("#t-clear").click(function(){
 		$("#t-clear").hide();
 		$("#searchinput").val("").focus();
+		$("#zbSeatchT [name='searchvalue']").val("");
 	})
 })
 </script>

src/web/templates/pc/supsearch.html

@@ -10,7 +10,7 @@
 <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/dev2/biddingSearch1.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/css/dev2/superSearch.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <script src="/js/jquery.cookie.js"></script>
 <script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
 <style type="text/css">
@@ -177,6 +177,7 @@ var sortArray = {{.T.sortArray}}
 var list = {{.T.list}}
 var searchvalue = {{.T.searchvalue}};
 var searchvalueArray = searchvalue.split("+");
+var dataId = "";
 $(function(){
 	if(selectType=="all"){
 		$("#newsclass li:nth-child(1) a").addClass("active");
@@ -191,6 +192,7 @@ $(function(){
 	$("#zbSeatchT [name='searchvalue']").val($.trim(keys));
 	$("#searchinput").focus();
 	if($.trim(keys)!=""){
+		$("#t-clear").show();
 		searchvalue = $.trim(keys);
 		searchvalueArray = searchvalue.split("+");
 		$("#newsclass").show();
@@ -232,6 +234,7 @@ $(function(){
 	$("#t-clear").click(function(){
 		$("#t-clear").hide();
 		$("#searchinput").val("").focus();
+		$("#zbSeatchT [name='searchvalue']").val("");
 	})
 	
 	var industryhtml = '<span id="induAll" class="active">全部</span>';
@@ -355,7 +358,7 @@ $(function(){
 			<div class="control-tabBtn">
 				<a href="#" class="on" style="display:none;">超级搜索</a>
 				<span class="bidbut">招标搜索</span>
-				<a href="#">中标企业搜索</a>
+				<a href="/jylab/bidsearchforent/index.html">中标企业搜索</a>
 			</div>
 			<!--搜索-->
 			<div class="searchInput clearfix">