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

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

@@ -11,6 +11,7 @@
     "webrpcport": "84",
     "weixinrpc": "127.0.0.1:83",
     "cacheflag": false,
-    "agreement": "http"
-
+    "agreement": "http",
+	"followentlimit":10,
+    "recommendEntLimit":"50"
 }

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

@@ -5,31 +5,22 @@ import (
 	"log"
 	"qfw/util"
 	"qfw/util/redis"
-	_"strconv"
-	//"time"
 	"tools"
-	//"wx"
 	"github.com/go-xweb/xweb"
-
-	//"gopkg.in/mgo.v2/bson"
-	_"time"
 	"qfw/util/elastic"
-
-//"gopkg.in/mgo.v2/bson"
+	"config"
+	"strconv"
 )
 
-var se = util.SE
 var mongodb = tools.MQFW
 
 type FollowEnt struct {
 	*xweb.Action
-
 	entList xweb.Mapper `xweb:"/jylab/followent/entList"` //获取关注企业列表
 	addEnt  xweb.Mapper `xweb:"/jylab/followent/addEnt"`  //添加关注企业页面
-	newInfo xweb.Mapper `xweb:"/jylab/followent/newInfo"` //企业最新信息
+	newInfo xweb.Mapper `xweb:"/jylab/followent/newInfo/(.*)/(.*)"` //企业最新信息
 	recList xweb.Mapper `xweb:"/jylab/followent/recList"` //获取推荐企业列表
 	saveEnt xweb.Mapper `xweb:"/jylab/followent/saveEnt"` //保存关注企业
-
 }
 
 func init() {
@@ -46,28 +37,20 @@ func (f *FollowEnt) EntList() error {
 	//	entArr = append(entArr, entMap)
 	//}
 	//f.T["datas"] = entArr
-	f.T["followLimit"] = "10"
-
-	//{"s_userid":"`+f.GetSession("userId").(string)+`"}
-	datas, ok := mongodb.Find("follow_project", ``, `{"l_lastpushtime":-1,"l_createtime":-1}`, `{"s_projectname":1,"s_projectcode":1,"i_remind":1,"l_lastpushtime":1,"l_createtime":1}`, false, 0, 10)
+	f.T["followLimit"] = config.Sysconfig["followentlimit"]
+	datas, ok := mongodb.Find("jylab_followent", `{"s_userid":"`+f.GetSession("userId").(string)+`"}`, `{"l_createtime":-1}`, `{"_id":1,"winner":1,"s_userid":1,"s_openid":1,"l_createtime":1,"s_id":1}`, false, 0, 10)
 	f.T["flag"] = false
 	if ok && datas != nil && len(*datas) > 0 {
 		for k, v := range *datas {
 			v["_id"] = util.EncodeArticleId2ByCheck(util.BsonIdToSId(v["_id"]))
 			log.Println(k, ":", v["l_createtime"])
-			if v["l_lastpushtime"] == "" || v["l_lastpushtime"] == nil {
-				v["l_lastpushtime"] = v["l_createtime"]
-			}
 		}
 		f.T["datas"] = datas
 	}
-
-	f.T["name"] = "关注的企业---"
 	return f.Render("/weixin/list.html", &f.T)
 }
 
 func (f *FollowEnt) AddEnt() error {
-	f.T["name"] = "to add page---"
 	return f.Render("/weixin/add.html", &f.T)
 }
 
@@ -75,9 +58,13 @@ func (f *FollowEnt) RecList() {
 	fmt.Println("entName", f.GetString("entName"))
 	var entName = f.GetString("entName")
 	if entName!=""{
-		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, 10)
+		limit,_ := strconv.Atoi(config.Sysconfig["recommendEntLimit"].(string))
+		r := elastic.GetPage("winner", "winner", `{"winner":"`+entName+`"}`, ``, `"_id","winner"`, 0, limit)
 		if r!=nil && len(*r) != 0{
 			fmt.Println("RecList",r)
+			for _,v := range *r{
+				v["_id"] = util.EncodeArticleId2ByCheck(v["_id"].(string))
+			}
 			f.ServeJson(map[string]interface{}{
 				"recList": r,
 			})
@@ -94,15 +81,19 @@ func (f *FollowEnt) SaveEnt() {
 }
 
 //企业最新信息
-func (f *FollowEnt) NewInfo(id string) error {
-	//defer util.Catch()
-	//id = util.DecodeArticleId2ByCheck(id)
-	//fields := `{"s_id":1,"i_source":1,"s_projectname":1,"s_projectcode":1,"s_url":1,"i_remind":1,"s_type":1,"l_bidopentime":1,"l_remindtime":1,"a_relationinfo":1,"a_visited":1,"l_lastpushtime":1,"a_lastpushids":1}`
-	//data, ok := mongodb.FindOneByField("follow_project", map[string]interface{}{
-	//	"_id": bson.ObjectIdHex(id),
-	//	//"s_userid": m.GetSession("userId").(string),
-	//}, fields)
-
+func (f *FollowEnt) NewInfo(winner,id string) error {
+	defer util.Catch()
+	////var winner = "天津超林时代科技发展有限公司"
+	fields := `{"projectname":1,"projectcode":1,"bidamount":1,"title":1,"publishtime":1,"subtype":1}`
+	data, ok := mongodb.Find("bidding", `{"winner":"`+winner+`"}`, nil, fields, false, -1, -1)
+	if !ok || data == nil || len(*data) == 0 {
+		return f.Render("_error.html")
+	}
+	if ok && data != nil && *data != nil && len(*data) != 0 {
+		f.T["data"] = data
+		fmt.Println(f.T["data"])
+	}
+	f.T["winner"] = winner
 	return f.Render("/weixin/set.html", &f.T)
 }
 

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

@@ -0,0 +1,80 @@
+package followent
+
+import (
+	"config"
+	"log"
+	"qfw/util"
+	"qfw/util/elastic"
+	"time"
+
+	"github.com/go-xweb/xweb"
+)
+
+type Myfwent struct {
+	*xweb.Action
+
+	addfwent xweb.Mapper `xweb:"/jylab/followent/addfwent"`
+}
+
+//
+func init() {
+	xweb.AddAction(&Myfwent{})
+}
+
+//
+func (m *Myfwent) Addfwent() error {
+	defer util.Catch()
+	userId := m.GetSession("userId").(string)
+	openid := m.GetSession("s_m_openid").(string)
+	followId := ""
+	s_id := ""
+	entname := m.GetString("winner")
+	if m.GetString("id") == "" {
+		s_id = Findent(entname)
+	} else {
+		s_id = util.DecodeArticleId2ByCheck(m.GetString("id"))[0]
+	}
+	log.Println("---s_id:", s_id)
+	var status = "n"
+	if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
+		status = "e" //已经关注过此企业
+	} else if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`"}`) >= util.IntAll(config.Sysconfig["followentlimit"]) {
+		status = "m" //超过最大关注数
+	} else {
+		data := make(map[string]interface{})
+		data["winner"] = m.GetString("winner")
+		data["s_userid"] = userId
+		data["s_openid"] = openid
+		data["l_createtime"] = time.Now().Unix()
+		data["s_id"] = s_id
+		if followId = mongodb.Save("jylab_followent", data); len(followId) > 0 {
+			status = "y"
+		}
+	}
+	m.ServeJson(map[string]interface{}{
+		"status":   status,
+		"followId": util.EncodeArticleId2ByCheck(followId),
+		"infoId":   util.EncodeArticleId2ByCheck(s_id),
+	})
+	return nil
+}
+
+//
+func Findent(entname string) string {
+	defer util.Catch()
+	tem, ok := mongodb.FindOneByField("winner", `{"winner":"`+entname+`"}`, `{"_id":1}`)
+	winnerid := ""
+	if ok && len(*tem) == 0 {
+		data := map[string]interface{}{}
+		data["winner"] = entname
+		data["winnersign"] = 1
+		data["l_createtime"] = time.Now().Unix()
+		winnerid = mongodb.Save("winner", data)
+		data["_id"] = winnerid
+		flag := elastic.Save("winner", "winner", data)
+		if !flag {
+			log.Println("企业保存elastic出错！")
+		}
+	}
+	return winnerid
+}

src/jfw/modules/followent/src/web/staticres/jylab/followent/css/follow.css

@@ -432,6 +432,7 @@
     font-size: 18px;
     margin-top: 20px;
     text-align: center;
+	margin-bottom: 20px;
 
 }
 .setpage .noticehead{

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

@@ -35,6 +35,7 @@
 	}
 </style>
 <script type="text/javascript">
+	var winner_id = "";
     $(function(){
 		/*
 		 $(window).bind("pageshow", function(event){
@@ -45,6 +46,7 @@
 		 new FastClick(document.body);
 		 */
         $("input").on("input propertychange",function(){
+            winner_id = "";
             var count = $.trim(this.value).length;
             if(count > 100){
                 this.value = this.value.substring(0,100);
@@ -69,19 +71,20 @@
                 return;
             }
             $(this).addClass("disabled");
-            $.post("/jylab/followent/saveEnt",{entName:entName},function(r){
-//                if(r.status == "y" && r.id != ""){
-//                    if(sessionStorage){
-//                        sessionStorage.version="0";
-//                    }
-//                    window.location.href = "/followeEnt/set/add/"+r.id;
-//                }else if(r.status == "m"){
-//                    EasyAlert.show("最多可关注<br>10个项目！");
-//                }else{
-//                    EasyAlert.show("数据提交失败！");
-//                    $(".opation").removeClass("disabled");
-//                }
-                window.location.href = "/jylab/followent/entList";
+            $.post("/jylab/followent/addfwent",{winner:entName,id:winner_id},function(r){
+                console.log(r);
+                if(r.status == "y" || r.status == "e"){
+                    if(sessionStorage){
+                        sessionStorage.version="0";
+                    }
+                    //window.location.href = "/followeEnt/set/add/"+r.id;
+                    window.location.href = "/jylab/followent/entList";
+                }else if(r.status == "m"){
+                    EasyAlert.show("最多可关注<br>10个企业！");
+                }else{
+                    EasyAlert.show("数据提交失败！");
+                    $(".opation").removeClass("disabled");
+                }
             });
         });
     });
@@ -108,6 +111,7 @@
 			$(".rec").click(function(){
                     if($(this).text()!=""){
                         $("input").val($(this).text());
+                        winner_id = $(this).attr("data-id");
                         $("#recList").hide();
                     }
 			});

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

@@ -23,18 +23,15 @@ if(sessionStorage){
         var allHtml = "";
         var data = {{.T.datas}};
         var jyno = 0;
-        data.sort(function(a,b){return a.l_lastpushtime<b.l_lastpushtime});
+        data.sort(function(a,b){return a.l_createtime<b.l_createtime});
         for (var i in data){
-            var lastpushtime = data[i]["l_lastpushtime"];
+            var l_createtime = data[i]["l_createtime"];
             var rem = "";
             var tdf = "";
             var timestamp = parseInt($.now()/ 1000);
-            if (lastpushtime == undefined||lastpushtime==""){
-                lastpushtime = data[i]["l_createtime"];
-            }
 
             //时间标志
-            tdf = timeDiff(new Date(Number(lastpushtime+"000")));
+            tdf = timeDiff(new Date(Number(l_createtime+"000")));
             if (tdf != null){
                 tdf = "<img style='width:15px;position: relative;padding: 2px 4px;' src='/images/wx/jyclock.png'>"+tdf+"</div>";
             }else{
@@ -42,9 +39,9 @@ if(sessionStorage){
             }
 
             var listno = parseInt(i)+parseInt(1);
-            allHtml +="<li data-id='"+data[i]["_id"]+"' Sort='"+lastpushtime+"'>"
+            allHtml +="<li data-id='"+data[i]["_id"]+"' data-winner='"+data[i]["winner"]+"' Sort='"+l_createtime+"'>"
                 +"<div class='jyfwlistno'>"+listno+".</div>"
-                +"<div class='jyfwlisttitle'>"+(data[i]["s_projectname"]?data[i]["s_projectname"]:data[i]["s_projectcode"])+"</div>"
+                +"<div class='jyfwlisttitle'>"+(data[i]["winner"]?data[i]["winner"]:data[i]["winner"])+"</div>"
                 +"<div style='clear:both;'></div>"+rem
                 +"<img src='/images/wx/d.png' class='arrow-right'>"
                 +"<div class='jytimest'>"
@@ -59,7 +56,8 @@ if(sessionStorage){
             if(sessionStorage){
                 sessionStorage.version="0";
             }
-            window.location.href = "/jylab/followent/newInfo/";
+
+            window.location.href = "/jylab/followent/newInfo/"+$(this).attr("data-winner")+"/"+$(this).attr("data-id");
         });
 	    //
         $("#addDiv").click(function(){

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

@@ -2,22 +2,53 @@
 <head>
 <title>企业信息</title>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-<link href="/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-<link href="/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/common.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
-<script src="/mobiscroll/mobiscroll.min.js"></script>
+<link href="/jylab/followent/mobiscroll/mobiscroll.min.css" rel="stylesheet">
+<link href="/jylab/followent/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/follow.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<link href="/jylab/followent/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+<script src="/jylab/followent/js/jquery.js"></script>
+<script src="/jylab/followent/js/common.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/mobiscroll/mobiscroll.min.js"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
-<script src="/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="/js/jy.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jylab/followent/js/jy.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
+	var data = {{.T.data}};
+	var winner = {{.T.winner}};
+	
 	$(function(){
 		var easyPopup = new EasyPopup("easypopup");
+		$(".noticehead").html(winner)
 		
-		//取消企业关注
+		for(var i = 0; i < data.length; i++){
+			var noticetime = '';
+			var type = '';
+			var listhtml = '';
+			var title = data[i]["title"];
+			var amount = parseInt(data[i]["bidamount"])/10000
+
+			if(data[i]["publishtime"]){
+				noticetime = new Date(Number(data[i]["publishtime"]+"000")).Format("MM-dd");	
+			}
+			if(typeof(data[i]["subtype"]) != "undefined" && data[i]["subtype"] != "" && data[i]["subtype"] !=null){
+				type = data[i]["subtype"];
+			}
+			listhtml = '<div class="jynoticelist">'
+			   	 			+'<div>'
+			        			+'<span class="noticetime">'+noticetime+'</span>'
+			       		 		+'<span class="type">'+type+'</span>'
+			    			+'</div>'
+			    	 		+'<div class="timeaxis">'
+			        	 		+'<span></span>'
+			    	 		+'</div>'
+			       			+'<div>'
+								+title
+								+'<span class="priceStyle">'+amount+'万元中标</span>'
+			       			+'</div>'
+			    		+'</div>'
+			$(".jynotice").append(listhtml)			
+		}
 		$(".qy-followcancel").click(function(){
 			easyPopup.show();
 		})
@@ -28,66 +59,20 @@
 			setTimeout(function(){
 				window.location.href = "/followEnt/entList";
 			},500);
-			
-			
 		});
 		//取消
 		$("#cancel").click(function(){
 			easyPopup.hide();
 		});
 	})
+	
 </script>
 </head>
-
 <body class="setpage">
-	{{if .T.isDel}}<div class="disabledMask"></div>{{end}} 
-	<div class="noticehead">
-		万达集团股份有限公司
-	</div>
+	<div class="noticehead"></div>
 	<ul>
 		<li id="notice">企业最新信息</li>
-		<li class="jynotice">
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">中标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle">200万元中标</span>
-       			</div>
-    		</div>
-			
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">中标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle">200万元中标</span>
-       			</div>
-    		</div>
-			
-			<div class="jynoticelist">
-   	 			<div>
-        			<span class="noticetime">06-14</span>
-       		 		<span class="type">废标</span>
-    			</div>
-    	 		<div class="timeaxis">
-        	 		<span></span>
-    	 		</div>
-       			<div>
-					河南省畜牧局物业管理项目二次招标中标公示
-					<span class="priceStyle"></span>
-       			</div>
-    		</div>
+		<li class="jynotice">	
 		</li>
 	</ul>
 	<div class="qy-followcancel">

src/web/templates/weixin/wxpush.html

@@ -19,7 +19,6 @@ if(sessionStorage){
 	initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 var b_view = "{{.T.view}}";
 $(function(){
-	console.log("----:"+{{.T.data}})
 	//
 	var zbadd = {{Msg "seo" "ZBADDRESS"}}
 	var width=$(window).width();
@@ -48,6 +47,9 @@ $(function(){
 			a_type[i]=o_pushinfo[i]["stype"];
 			topstype[i]=o_pushinfo[i]["topstype"];
 			substype[i]=o_pushinfo[i]["substype"];
+			projectname[i]=o_pushinfo[i]["projectname"];
+			projectid[i]=o_pushinfo[i]["projectid"];
+			buyer[i]=o_pushinfo[i]["buyer"];
 		}
 	}
 	if(typeof(s_words) != "undefined" && s_words.length > 0){
@@ -258,6 +260,7 @@ a{
 
 <body>
 <div></div>
+<div class=""></div>
 <div class="listcontent"></div>
 <span class=" text-center findnull">
 <div>