cc

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

@@ -18,7 +18,7 @@ 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"` //保存关注企业
 }
@@ -38,8 +38,7 @@ func (f *FollowEnt) EntList() error {
 	//}
 	//f.T["datas"] = entArr
 	f.T["followLimit"] = config.Sysconfig["followentlimit"]
-	limit,_ := strconv.Atoi(config.Sysconfig["followentlimit"].(string))
-	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, limit)
+	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 {
@@ -59,7 +58,8 @@ 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, config.Sysconfig["recommendEntLimit"].(int))
+		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{
@@ -81,7 +81,7 @@ func (f *FollowEnt) SaveEnt() {
 }
 
 //企业最新信息
-func (f *FollowEnt) NewInfo(winner string) error {
+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}`

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

@@ -36,10 +36,10 @@ func (m *Myfwent) Addfwent() error {
 	}
 	log.Println("---s_id:", s_id)
 	var status = "n"
-	if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`"}`) > util.IntAll(config.Sysconfig["followentlimit"]) {
-		status = "m" //超过最大关注数
-	} else if mongodb.Count("jylab_followent", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
+	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")

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

@@ -80,7 +80,7 @@
                     //window.location.href = "/followeEnt/set/add/"+r.id;
                     window.location.href = "/jylab/followent/entList";
                 }else if(r.status == "m"){
-                    EasyAlert.show("最多可关注<br>10个项目！");
+                    EasyAlert.show("最多可关注<br>10个企业！");
                 }else{
                     EasyAlert.show("数据提交失败！");
                     $(".opation").removeClass("disabled");

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

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