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

.gitignore

@@ -0,0 +1,8 @@
+pkg
+bin
+*/pkg
+*.exe
+*.log
+*/src/src
+*.data
+*/bin

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/entList",
+		"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/front/search.go

@@ -2,12 +2,14 @@ package front
 
 import (
 	"fmt"
-	"github.com/go-xweb/xweb"
-	"gopkg.in/mgo.v2/bson"
+	"jfw/jylabutil"
 	"jfw/wx"
 	"qfw/util"
 	"qfw/util/redis"
 	"strings"
+
+	"github.com/go-xweb/xweb"
+	"gopkg.in/mgo.v2/bson"
 )
 
 type Search struct {
@@ -21,6 +23,9 @@ func init() {
 	xweb.AddAction(&Search{})
 }
 func (s *Search) MainSearch() error {
+	if s.Session().Get("s_m_openid") == nil {
+		return s.Redirect("/swordfish/about")
+	}
 	if userid := s.GetSession("userId"); userid != nil {
 		history := redis.GetStr("other", "s_"+userid.(string))
 		arrs := strings.Split(history, ",")
@@ -46,6 +51,10 @@ func (s *Search) MainSearch() error {
 			}
 			s.T["msgset"] = keys
 		}
+		//判断是否开启超级搜索or中标搜索
+		myopenid := s.Session().Get("s_m_openid")
+		s.T["open_supersearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_supersearch")
+		s.T["open_entsesearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_entsesearch")
 	}
 	return s.Render("/weixin/search/mainSearch.html", &s.T)
 }
@@ -53,16 +62,18 @@ func (m *Search) SuperSearch() error {
 	defer util.Catch()
 	searchvalue := strings.Trim(m.GetString("searchvalue"), " ")
 	var list *[]map[string]interface{}
+	var historyFlag = 0
 	if userid := m.GetSession("userId"); userid != nil {
+		//历史记录
+		history := redis.GetStr("other", "s_"+userid.(string))
+		arrs := strings.Split(history, ",")
+		if history == "" {
+			arrs = make([]string, 0)
+		}
 		if len(searchvalue) > 0 {
 			searchname := strings.Replace(strings.Replace(searchvalue, " ", "+", -1), "++", "+", -1)
 			list = getWxsearchlistData(searchvalue, searchname, "", "", "", "", "", "", 1, "all")
-			history := redis.GetStr("other", "s_"+userid.(string))
-			arrs := strings.Split(history, ",")
-			if history == "" {
-				arrs = make([]string, 0)
-			}
-			var historyFlag = 0
+			//新增历史记录
 			for _, v := range arrs {
 				fmt.Print(v == strings.Trim(searchvalue, " "))
 				if v == strings.Trim(searchvalue, " ") {
@@ -78,25 +89,26 @@ func (m *Search) SuperSearch() error {
 				redis.Del("other", "s_"+userid.(string))
 				redis.Put("other", "s_"+userid.(string), strings.Join(arrs, ","), -1)
 			}
-			l := len(arrs) - 1
-			for i := 0; i < len(arrs)/2; i++ {
-				tmp := arrs[l-i]
-				arrs[l-i] = arrs[i]
-				arrs[i] = tmp
-			}
-			m.T["history"] = arrs
-			one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userid.(string))}, `{"o_jy":1}`)
-			if one != nil && len(*one) > 0 {
-				o_jy, _ := (*one)["o_jy"].(map[string]interface{})
-				a_key, _ := o_jy["a_key"].([]interface{})
-				var keys []interface{}
-				for _, v := range a_key {
-					keyMap, _ := v.(map[string]interface{})
-					key, _ := keyMap["key"].([]interface{})
-					keys = append(keys, key)
-				}
-				m.T["msgset"] = keys
+		}
+		l := len(arrs) - 1
+		for i := 0; i < len(arrs)/2; i++ {
+			tmp := arrs[l-i]
+			arrs[l-i] = arrs[i]
+			arrs[i] = tmp
+		}
+		m.T["history"] = arrs
+		//我的订阅
+		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userid.(string))}, `{"o_jy":1}`)
+		if one != nil && len(*one) > 0 {
+			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
+			a_key, _ := o_jy["a_key"].([]interface{})
+			var keys []interface{}
+			for _, v := range a_key {
+				keyMap, _ := v.(map[string]interface{})
+				key, _ := keyMap["key"].([]interface{})
+				keys = append(keys, key)
 			}
+			m.T["msgset"] = keys
 		}
 		m.T["list"] = list
 		m.T["pageSize"] = wx_pageSize

src/jfw/modules/entsesearch/src/search/entsesearch.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	wx_maxPageNum         = 20
-	wx_pageSize           = 1
+	wx_pageSize           = 10
 )
 type EntSeSearch struct {
 	*xweb.Action

src/jfw/modules/entsesearch/src/web/templates/weixin/entseSearch.html

@@ -36,7 +36,7 @@
     var reqParam = null;
     $(function () {
         reqParam = {
-            "searchname": $.trim($(".searchname").val()),
+            "searchname": $.trim($("#searchname").val()),
             "money_from": "",
             "money_to": "",
             "scope": "",
@@ -570,7 +570,7 @@
 
         //搜索框输入
         $("#searchname").on("input propertychange",function(){
-            var snqc = $(".searchname").val();
+            var snqc = $("#searchname").val();
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -588,7 +588,7 @@
 
         //搜索框选中
         $("#searchname").focus(function(){
-            var snqc = $(".searchname").val();
+            var snqc = $("#searchname").val();
             if(snqc.length > 0){
                 $(".qc").removeClass("hidden");
                 $(".tubiao").removeClass("hidden");
@@ -600,7 +600,7 @@
 
         //清除
         $(".qc").click(function(){
-            $(".searchname").val("");
+            $("#searchname").val("");
             $(".qc").addClass("hidden");
             $(".tubiao").addClass("hidden");
             $(".jydqsure").css("background","#ccc");
@@ -710,7 +710,7 @@
         document.onkeydown = function () {
             if (window.event && window.event.keyCode == 13) {
                 window.event.returnValue = false;
-                if($.trim($(".searchname").val()) == ""){
+                if($.trim($("#searchname").val()) == ""){
                     return;
                 }
                 $("#searchname").blur();
@@ -791,7 +791,7 @@
     }
 
     function beforeSubmit() {
-        var searchname = $.trim($(".searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
+        var searchname = $.trim($("#searchname").val().replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
 
         var money = "";
         var money_from  = "";

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

@@ -7,11 +7,13 @@ import (
 	"qfw/util/elastic"
 	"qfw/util/redis"
 	"strconv"
+	"strings"
 	"time"
 	"tools"
 
-	"github.com/go-xweb/xweb"
 	"jfw/jylabutil"
+
+	"github.com/go-xweb/xweb"
 )
 
 var mongodb = tools.MQFW
@@ -34,11 +36,11 @@ func init() {
 
 func (f *FollowEnt) EntList() error {
 	defer util.Catch()
-	if f.Session().Get("s_m_openid") == nil{
+	if f.Session().Get("s_m_openid") == nil {
 		return f.Redirect("/swordfish/about")
 	}
 	f.T["followLimit"] = config.Sysconfig["followentlimit"]
-	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`","s_entname":{$ne:""}}`, `{"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
+	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`","s_entname":{"$ne":""}}`, `{"l_createtime":-1}`, `{"_id":1,"s_entname":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1,"i_ispush":1}`, false, 0, 10)
 	f.T["flag"] = false
 	if ok && datas != nil && len(*datas) > 0 {
 		for _, v := range *datas {
@@ -56,9 +58,9 @@ func (f *FollowEnt) AddEnt() error {
 
 func (f *FollowEnt) RecList() {
 	var entName = f.GetString("entName")
-	limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
-	re := jylabutil.GetEenNameImmediate(entName,limit)
-	if re!=nil && len(re) != 0{
+	limit, _ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+	re := jylabutil.GetEenNameImmediate(entName, limit)
+	if re != nil && len(re) != 0 {
 		for _, v := range re {
 			v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
 		}
@@ -73,11 +75,17 @@ func (f *FollowEnt) SaveEnt() {
 }
 
 //企业最新信息
-func (f *FollowEnt) NewInfo(winner, id string) error {
+func (f *FollowEnt) NewInfo(winnerid string) error {
 	defer util.Catch()
-	if f.Session().Get("s_m_openid") == nil{
+	if f.Session().Get("s_m_openid") == nil {
 		return f.Redirect("/swordfish/about")
 	}
+	winner := ""
+	id := ""
+	if winnerid != "" {
+		winner = strings.Split(winnerid, "___")[0]
+		id = strings.Split(winnerid, "___")[1]
+	}
 	userId := f.GetSession("userId").(string) //用户id
 	var follow = "n"
 	s_id := ""
@@ -123,7 +131,7 @@ func (f *FollowEnt) NewInfo(winner, id string) error {
 //取消企业关注
 func (f *FollowEnt) QgFollow() error {
 	defer util.Catch()
-	if f.Session().Get("s_m_openid") == nil{
+	if f.Session().Get("s_m_openid") == nil {
 		return f.Redirect("/swordfish/about")
 	}
 	status := "n"

src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -62,7 +62,7 @@ if(sessionStorage){
                 sessionStorage.version="0";
             }
 
-            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-entname")+"/"+$(this).attr("data-id");
+            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-entname")+"___"+$(this).attr("data-id");
         });
 	    //
         $("#addDiv").click(function(){

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/css/search/superSearch.css

@@ -1615,35 +1615,47 @@ body{
 	color: #2cb7ca;
 }
 #table{
-	width: 100%;
-	padding-left: 20px;
-	padding-top: 20px;
+	
 }
 #table>.data{
+	width: 100%;
 	overflow-x: scroll;
 }
 #table>.TableTip{
-	padding-top: 10px;
-	padding-right: 10px;
+	padding: 20px 20px 0px 20px;
 	color: #686868;
 }
 #table table{
-	width: 525px;
+	width: 870px;
+	padding: 20px 20px 0px 20px;
+	display:block;
 }
-#table table>tr>td:nth-child(1){
+#table table>tbody>tr>td:nth-child(1){
 	width:30px;
 }
 #table table>tbody>tr>td:nth-child(2){
-	width:68px;
+	width:60px;
 }
 #table table>tbody>tr>td:nth-child(3){
-	width:74px;
+	width:100px;
 }
 #table table>tbody>tr>td:nth-child(4){
 	width:160px;
 }
 #table table>tbody>tr>td:nth-child(5){
-	width: 160px;
+	width:200px;
+}
+#table table>tbody>tr>td:nth-child(6){
+	width:40px;
+}
+#table table>tbody>tr>td:nth-child(7){
+	width:100px;
+}
+#table table>tbody>tr>td:nth-child(8){
+	width: 140px;
+}
+#table table>tbody>tr>td:nth-child(9){
+	width: 40px;
 }
 #table tr td{
 	border: 1px solid #E0E0E0;
@@ -1707,7 +1719,7 @@ body{
 	background-color: #fff;
 	border-top: 1px solid #e0e0e0;
 }
-.inputDiv .history li,.inputDiv .myMsgset li,.inpTitle{
+.inputDiv .history li,.inputDiv .myMsgset li,.inpTitle_history,.inpTitle_msgset{
 	width: 100%;
 	height: 38px;
 	border-left: 1px solid #e0e0e0;
@@ -1724,11 +1736,11 @@ body{
 .inputDiv img{
 	width: 20px;
 }
-.inpTitle{
+.inpTitle_history,.inpTitle_msgset{
 	color:#888;
 	font-size: 16px;
 }
-.inpTitle span{
+.inputDiv span{
 	padding-left: 10px;
 }
 #del_history{

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">

src/web/templates/weixin/search/mainSearch.html

@@ -120,7 +120,7 @@
            margin: 0px;
             padding: 0px;
         }
-        .inputDiv .history li,.inputDiv .myMsgset li,.inpTitle{
+        .inputDiv .history li,.inputDiv .myMsgset li,.inpTitle_history,.inpTitle_msgset{
             width: 100%;
             height: 38px;
             border-left: 1px solid #e0e0e0;
@@ -137,11 +137,11 @@
         .inputDiv img{
             width: 20px;
         }
-        .inpTitle{
+        .inpTitle_history,.inpTitle_msgset{
             color:#888;
             font-size: 16px;
         }
-        .inpTitle span{
+        .inputDiv span{
             padding-left: 10px;
         }
         #del_history{
@@ -152,6 +152,8 @@
     <script>
         var myHistory={{.T.history}};
         var msgset={{.T.msgset}};
+		var open_supersearch={{.T.open_supersearch}};
+		var open_entsesearch={{.T.open_entsesearch}};
         //initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
         $(function(){
             $(".searchvalue").on("input propertychange",function(){
@@ -175,13 +177,28 @@
                         url:"/swordfish/delWxHistorySearch",
                         success:function(rt){
                             $(".inputDiv .history").find("li").remove();
+							$(".inputDiv .inpTitle_history").addClass("hidden");	
                         }
                     });
                 }
             })
-			$("#superSearch").click(function(){window.location.href='/jylab/superSearch';});
-			$("#entseSearch").click(function(){window.location.href='/jylab/entsesearch/search';});
+			//判断是否开启服务
+			if(open_supersearch==true){
+				$("#superSearch").click(function(){window.location.href='/jylab/superSearch';});	
+			}else{
+				$("#superSearch").click(function(){window.location.href='/jylab/index';});	
+			}
+			if(open_entsesearch==true){
+				$("#entseSearch").click(function(){window.location.href='/jylab/entsesearch/search';});
+			}else{
+				$("#entseSearch").click(function(){window.location.href='/jylab/index';});	
+			}
+			//点击帮助
+			$(".help").click(function(){
+			window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
+		    })
         });
+		//回车搜索
         document.onkeydown = function(e){
             if(!e){
                 e = window.event;
@@ -203,24 +220,33 @@
         function loadTipMsg(myhistory,msgset){
             //历史信息
             if(myhistory!=null){
-                historyHtml ="";
-                for(var i=0;i<myhistory.length;i++){
-                    historyHtml+="<li>"+myhistory[i]+"</li>"
-                }
-                $(".inputDiv .history").html(historyHtml);
+				if(myhistory.length==0){
+					$(".inputDiv .inpTitle_history").addClass("hidden")	
+				}else{
+					 historyHtml ="";
+	                for(var i=0;i<myhistory.length;i++){
+	                    historyHtml+="<li>"+myhistory[i]+"</li>"
+	                }
+	                $(".inputDiv .history").html(historyHtml);
+				}
             }
 
             //订阅信息
             if(msgset!=null){
-                msgsetHtml="";
-                for(var n=0;n<msgset.length;n++){
-                    var  mymsgset="";
-                    for(var m=0;m<msgset[n].length;m++){
-                        mymsgset+=msgset[n][m]+" "
-                    }
-                    msgsetHtml+="<li>"+mymsgset+"</li>";
-                }
-                $(".inputDiv .myMsgset").html(msgsetHtml);
+				
+				if(msgset.length==0){
+					$(".inputDiv .inpTitle_msgset").addClass("hidden")	
+				}else{
+					 msgsetHtml="";
+	                for(var n=0;n<msgset.length;n++){
+	                    var  mymsgset="";
+	                    for(var m=0;m<msgset[n].length;m++){
+	                        mymsgset+=msgset[n][m]+" "
+	                    }
+	                    msgsetHtml+="<li>"+mymsgset+"</li>";
+	                }
+	                $(".inputDiv .myMsgset").html(msgsetHtml);
+				}
             }
 
             //点击提示框内容 进行搜索
@@ -238,13 +264,13 @@
         <div class="wxhead">
             <input class="form-control searchvalue" id="searchvalue" name="searchvalue" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="示例：税务局 软件"/>
             <div class="inputDiv hidden">
-                <div class="inpTitle"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
+                <div class="inpTitle_history"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
                 <div>
                     <ul class="history">
                     </ul>
                 </div>
                 <div style="clear: both"></div>
-                <div class="inpTitle"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
+                <div class="inpTitle_msgset"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
                 <div>
                     <ul class="myMsgset">
                     </ul>

src/web/templates/weixin/search/superSearch.html

@@ -45,19 +45,20 @@
         $(function(){
             //loadTipMsg加载历史记录和我的订阅
             loadTipMsg(myHistory,msgset);
-
+					
             //筛选菜单展示or隐藏
-            $(".wxhead").find(".screen").click(function(){
+            $(".wxhead").find(".screen").click(function(){	
                 $(".wxsearch").toggleClass("hidden");
                 $("#selLable").toggleClass("hidden");
 
                 if($("#list").text()==""){
-                    $(".nullcontent").toggleClass("hidden");
+					if(s_words!=""){
+						$(".nullcontent").toggleClass("hidden");	
+					}
                 }else{
                     $("#wrapper").toggleClass("hidden");
                 }
             });
-
             /**********************分页请求start****************************/
 			//铺数据 1.首次跳转传过来的数据  2.页面搜索数据 3.下拉查询数据
             //下拉更新
@@ -186,6 +187,7 @@
                         url:"/swordfish/delWxHistorySearch",
                         success:function(rt){
 							$(".inputDiv .history").find("li").remove();
+							$(".inputDiv .inpTitle_history").addClass("hidden")	
                         }
                     });
                 }
@@ -295,8 +297,6 @@
                 $(".selLable").removeClass("hidden");
                 $(".wxsearch").addClass("hidden");
             }
-
-
             if ($("#list").text() == "") {
                 $("#wrapper").addClass("hidden");
                 $(".nullcontent").removeClass("hidden");
@@ -407,14 +407,16 @@
 				if(industry!=""){
                     industry='<span class="industry">'+industry+'</span>';
 				}
-
+				//项目
+				var projectname=list[i].projectname==null?"":list[i].projectname;
+				
                 //时间
                 var tdf = list[i].publishtime;
                 var fullTime="";
                 if(tdf){
                     var thisTime=new Date(Number(tdf+"000"))
-					var month=(thisTime.getMonth()+1)>10?(thisTime.getMonth()+1):"0"+(thisTime.getMonth()+1);
-					var date=(thisTime.getDate())>10?(thisTime.getDate()):"0"+(thisTime.getDate());
+					var month=(thisTime.getMonth()+1)>=10?(thisTime.getMonth()+1):"0"+(thisTime.getMonth()+1);
+					var date=(thisTime.getDate())>=10?(thisTime.getDate()):"0"+(thisTime.getDate());
                     fullTime=thisTime.getFullYear()+"<br>"+month+date;
                     tdf = timeDiff(new Date(Number(tdf+"000")));
                     if(tdf != null){
@@ -438,7 +440,22 @@
                 }
 				//招标单位
                 var agency=list[i].agency==null?"":list[i].agency;
-
+				//预算
+				var budget=list[i].budget==null?"":list[i].budget/10000;
+				//开标时间
+				var bidopentime=""
+				var optim=list[i].bidopentime;
+				if(optim){
+					var openTime=new Date(Number(optim+"000"));
+					bidopentime=openTime.getFullYear()+"-"+((openTime.getMonth()+1)>=10?(openTime.getMonth()+1):"0"+(openTime.getMonth()+1))+"-"
+					+((openTime.getDate())>=10?(openTime.getDate()):"0"+(openTime.getDate()))+"<br>"+(openTime.getHours()>=10?openTime.getHours():"0"+openTime.getHours())+":"
+					+(openTime.getMinutes()>=10?openTime.getMinutes():"0"+openTime.getMinutes());
+				}
+				//中标单位
+				var winner=list[i].winner==null?"":list[i].winner;
+				//中标金额
+				var bidamount=list[i].bidamount==null?"":list[i].bidamount/10000;
+				
                 ListHtml += '<div class="tslist">'
                     +'<div class="resnumb">'
                     +'<div class="one">'
@@ -461,7 +478,11 @@
                     '<td>'+fullTime+'</td>'+
                     '<td>'+datatype+'公告</td>'+
                     '<td>'+agency+'</td>'+
-                    '<td>'+title+'</td>'+
+                    '<td>'+projectname+'</td>'+
+					'<td>'+budget+'</td>'+
+					'<td>'+bidopentime+'</td>'+
+					'<td>'+winner+'</td>'+
+					'<td>'+bidamount+'</td>'+
                     '</tr>'
             }
             html["ListHtml"]=ListHtml;
@@ -472,6 +493,9 @@
         function hasNoData(){ //搜索信息为空
             $(".nullcontent").removeClass("hidden");
             $("#wrapper").addClass("hidden");
+			if(s_words==""){
+				$(".nullcontent").addClass("hidden");
+			}
         }
         function hasData(){ //搜索信息不为空
             $(".nullcontent").addClass("hidden");
@@ -525,7 +549,7 @@
                 var sds = s_words.replace(/\+/g,"+");
                 myredirect(h,sid,sds);
             })
-            $("#table .content").html("<tr><td>序号</td><td>发布时间</td><td>公告类型</td><td>招标单位</td><td>项目名称</td></tr>");
+            $("#table .content").html("<tr><td>序号</td><td>发布时间</td><td>公告类型</td><td>招标单位</td><td>项目名称</td><td>预算（万元）</td><td>开标时间</td><td>中标单位</td><td>中标金额（万元）</td></tr>");
             $("#table .content").append(TableHtmlobj);
 
             if(!window.top.isBackIndex){
@@ -554,27 +578,36 @@
         }
        	function loadTipMsg(myhistory,msgset){
 		//历史信息
-			if(myhistory!=null){
-                historyHtml ="";
-                for(var i=0;i<myhistory.length;i++){
-                    historyHtml+="<li>"+myhistory[i]+"</li>"
-                }
-                $(".inputDiv .history").html(historyHtml);
-			}
-
-		//订阅信息
-			if(msgset!=null){
-                msgsetHtml="";
-                for(var n=0;n<msgset.length;n++){
-                    var  mymsgset="";
-                    for(var m=0;m<msgset[n].length;m++){
-                        mymsgset+=msgset[n][m]+" "
-                    }
-                    msgsetHtml+="<li>"+mymsgset+"</li>";
-                }
-                $(".inputDiv .myMsgset").html(msgsetHtml);
-			}
+            if(myhistory!=null){
+				if(myhistory.length==0){
+					$(".inputDiv .inpTitle_history").addClass("hidden")	
+				}else{
+					$(".inputDiv .inpTitle_history").removeClass("hidden")	
+					 historyHtml ="";
+	                for(var i=0;i<myhistory.length;i++){
+	                    historyHtml+="<li>"+myhistory[i]+"</li>"
+	                }
+	                $(".inputDiv .history").html(historyHtml);
+				}
+            }
 
+            //订阅信息
+            if(msgset!=null){
+				if(msgset.length==0){
+					$(".inputDiv .inpTitle_msgset").addClass("hidden")	
+				}else{
+					$(".inputDiv .inpTitle_msgset").removeClass("hidden")
+					 msgsetHtml="";
+	                for(var n=0;n<msgset.length;n++){
+	                    var  mymsgset="";
+	                    for(var m=0;m<msgset[n].length;m++){
+	                        mymsgset+=msgset[n][m]+" "
+	                    }
+	                    msgsetHtml+="<li>"+mymsgset+"</li>";
+	                }
+	                $(".inputDiv .myMsgset").html(msgsetHtml);
+				}
+            }
 		//点击提示框内容 进行搜索
             $(".inputDiv li").click(function () {
                 $("input[name=searchvalue]").val($(this).text());
@@ -592,13 +625,13 @@
 		<form class="searchform" id="searchform" method="post" action="/jylab/superSearch" >
 			<input class="form-control searchvalue slistbkc" name="searchvalue" maxlength ="50" value="{{if .T.searchvalue}}{{.T.searchvalue}}{{end}}" placeholder="示例：税务局 软件"/>
 			<div class="inputDiv hidden">
-				<div class="inpTitle"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
+				<div class="inpTitle_history"><img src="/images/search/history.png"><span>历史搜索</span><img id="del_history" src="/images/search/history_clean.png"></div>
 					<div>
 						<ul class="history">
 						</ul>
 					</div>
 					<div style="clear: both"></div>
-				<div class="inpTitle"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
+				<div class="inpTitle_msgset"><img src="/images/search/msgset.png"><span>我的订阅的关键词</span></div>
 					<div>
 						<ul class="myMsgset">
 						</ul>
@@ -640,129 +673,6 @@
 							</li>
 						</ul>
 					</div>
-					<!--<ul class="hyHead">
-						<li class="on">全部</li>
-						<li>建筑工程</li>
-						<li>水利水电</li>
-						<li>能源化工</li>
-						<li>弱点安防</li>
-						<li>信息技术</li>
-						<li>行政办公</li>
-						<li>机械设备</li>
-						<li>交通工程</li>
-						<li>医疗卫生</li>
-						<li>市政设施</li>
-						<li>服务采购</li>
-					</ul>
-					<div class="hyBody">
-
-						<div style="display: block;" class="iner-list">
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="建筑工程_勘察设计,建筑工程_工程施工,建筑工程_工程监理,建筑工程_材料设备">全部</li>
-								<li  data-value="建筑工程_勘察设计">勘察设计</li>
-								<li  data-value="建筑工程_工程施工">工程施工</li>
-								<li  data-value="建筑工程_工程监理">工程监理</li>
-								<li  data-value="建筑工程_材料设备">材料设备</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="水利水电_水利工程,水利水电_发电工程,水利水电_航运工程,水利水电_其他工程">全部</li>
-								<li  data-value="水利水电_水利工程">水利工程</li>
-								<li  data-value="水利水电_发电工程">发电工程</li>
-								<li  data-value="水利水电_航运工程">航运工程</li>
-								<li  data-value="水利水电_其他工程">其他工程</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="能源化工_原材料,能源化工_仪器仪表,能源化工_设备,能源化工_化工产品,能源化工_新能源">全部</li>
-								<li  data-value="能源化工_原材料">原材料</li>
-								<li  data-value="能源化工_仪器仪表">仪器仪表</li>
-								<li  data-value="能源化工_设备">设备</li>
-								<li  data-value="能源化工_化工产品">化工产品</li>
-								<li  data-value="能源化工_新能源">新能源</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="弱点安防_综合布线,弱点安防_智能系统,弱点安防_智能家居">全部</li>
-								<li  data-value="弱点安防_综合布线">综合布线</li>
-								<li  data-value="弱点安防_智能系统">智能系统</li>
-								<li  data-value="弱点安防_智能家居">智能家居</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="信息技术_系统集成及安全,信息技术_软件开发,信息技术_运维服务,信息技术_其他">全部</li>
-								<li  data-value="信息技术_系统集成及安全">系统集成及安全</li>
-								<li  data-value="信息技术_软件开发">软件开发</li>
-								<li  data-value="信息技术_运维服务">运维服务</li>
-								<li  data-value="信息技术_其他">其他</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="行政办公_办公家具,行政办公_通用办公设备,行政办公_专业设备,行政办公_办公用品">全部</li>
-								<li  data-value="行政办公_办公家具">办公家具</li>
-								<li  data-value="行政办公_通用办公设备">通用办公设备</li>
-								<li  data-value="行政办公_专业设备">专业设备</li>
-								<li  data-value="行政办公_办公用品">办公用品</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="机械设备_农业机械,机械设备_矿山机械,机械设备_工程机械,机械设备_机械零部件,机械设备_机床,机械设备_车辆,机械设备_其他机械设备">全部</li>
-								<li  data-value="机械设备_农业机械">农业机械</li>
-								<li  data-value="机械设备_矿山机械">矿山机械</li>
-								<li  data-value="机械设备_工程机械">工程机械</li>
-								<li  data-value="机械设备_机械零部件">机械零部件</li>
-								<li  data-value="机械设备_机床">机床</li>
-								<li  data-value="机械设备_车辆">车辆</li>
-								<li  data-value="机械设备_其他机械设备">其他机械设备</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="交通工程_隧道工程,交通工程_轨道工程,交通工程_桥梁工程,交通工程_其他工程">全部</li>
-								<li  data-value="交通工程_隧道工程">隧道工程</li>
-								<li  data-value="交通工程_轨道工程">轨道工程</li>
-								<li  data-value="交通工程_桥梁工程">桥梁工程</li>
-								<li  data-value="交通工程_其他工程">其他工程</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="医疗卫生_设备,医疗卫生_耗材,医疗卫生_药品">全部</li>
-								<li  data-value="医疗卫生_设备">设备</li>
-								<li  data-value="医疗卫生_耗材">耗材</li>
-								<li  data-value="医疗卫生_药品">药品</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="市政设施_市政道路,市政设施_市政绿化,市政设施_管道线路,市政设施_综合项目">全部</li>
-								<li  data-value="市政设施_市政道路">市政道路</li>
-								<li  data-value="市政设施_市政绿化">市政绿化</li>
-								<li  data-value="市政设施_管道线路">管道线路</li>
-								<li  data-value="市政设施_综合项目">综合项目</li>
-							</ul>
-						</div>
-						<div class="iner-list">
-							<ul>
-								<li  data-value="服务采购_法律咨询,服务采购_会计服务,服务采购_物业服务,服务采购_审计服务,服务采购_安保服务，服务采购_物流服务，服务采购_其他服务">全部</li>
-								<li  data-value="服务采购_法律咨询">法律咨询</li>
-								<li  data-value="服务采购_会计服务">会计服务</li>
-								<li  data-value="服务采购_物业服务">物业服务</li>
-								<li  data-value="服务采购_审计服务">审计服务</li>
-								<li  data-value="服务采购_安保服务">安保服务</li>
-								<li  data-value="服务采购_物流服务">物流服务</li>
-								<li  data-value="服务采购_其他服务">其他服务</li>
-							</ul>
-						</div>
-					</div>-->
 				</div>
 				<!-->金额<-->
 				<div class="money-dialog hidden">
@@ -910,17 +820,6 @@
 		</div>
 		<div id="wrapper">
 			<div id="list" ></div>
-			<!--<div id="table" class="hidden">
-				<table class="content">
-					<tr>
-						<td>序号</td>
-						<td>发布时间</td>
-						<td>公告类型</td>
-						<td>招标单位</td>
-						<td>项目名称</td>
-					</tr>
-				</table>
-			</div>-->
 			<div id="table" class="hidden">
 				<div class="data"><table class="content">
 					<tr>
@@ -929,6 +828,10 @@
 						<td>公告类型</td>
 						<td>招标单位</td>
 						<td>项目名称</td>
+						<td>预算（万元）</td>
+						<td>开标时间</td>
+						<td>中标单位</td>
+						<td>中标金额（万元）</td>
 					</tr>
 				</table></div>
 				<div class="TableTip">提示：为了获得更佳的体验，推荐使用电脑浏览器访问剑鱼网站jianyu360.com查看数据表格。</div>