wangchuanjin 9 years ago
parent
commit
8277a6bad1

+ 2 - 4
core/src/qfw/search/wxsearchservice.go

@@ -6,7 +6,6 @@ import (
 	"github.com/go-xweb/xweb"
 	"github.com/go-xweb/xweb"
 	"github.com/p/mahonia"
 	"github.com/p/mahonia"
 	"html/template"
 	"html/template"
-	"log"
 	"qfw/coreutil"
 	"qfw/coreutil"
 	"qfw/mobile"
 	"qfw/mobile"
 	. "qfw/util"
 	. "qfw/util"
@@ -90,14 +89,13 @@ func FormatData(data *[]map[string]interface{}, action *xweb.Action) string {
 			"EstDate":       estDate,
 			"EstDate":       estDate,
 			"OpStateName":   fmt.Sprint(v["OpStateName"]),
 			"OpStateName":   fmt.Sprint(v["OpStateName"]),
 			"status":        "n",
 			"status":        "n",
+			"excDirect":     fmt.Sprint(v["excDirect"]),
 		}
 		}
 		//是否关注
 		//是否关注
 		entId := tmp["_id"]
 		entId := tmp["_id"]
 		userId := action.GetSession("userId").(string)
 		userId := action.GetSession("userId").(string)
 		if userId != "" {
 		if userId != "" {
-			log.Println(userId)
 			if Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
 			if Count("follow_enterprise", `{"s_userid":"`+userId+`","s_entid":"`+entId+`"}`) > 0 {
-				log.Println("进入")
 				tmp["status"] = "y"
 				tmp["status"] = "y"
 			}
 			}
 		}
 		}
@@ -425,7 +423,7 @@ func wxsearhWebContententMp(querymap map[string]string, n *Wxsearch, reqType str
 	    "_source": [
 	    "_source": [
 	        "_id","EntName","RegOrgName","RegNo","EntType",
 	        "_id","EntName","RegOrgName","RegNo","EntType",
 	        "LeRep","EstDate","OpLocDistrictName","OpStateName",
 	        "LeRep","EstDate","OpLocDistrictName","OpStateName",
-	        "s_servicenames","s_action","OpLocDistrict","s_submitid"
+	        "s_servicenames","s_action","OpLocDistrict","s_submitid","excDirect"
 	    ],
 	    ],
 	    "from": 0,"size": 10,
 	    "from": 0,"size": 10,
 	    "sort": [{"OpSint": "desc","RegCap": "desc"}]
 	    "sort": [{"OpSint": "desc","RegCap": "desc"}]

+ 2 - 0
core/src/web/templates/member/incmobile/detailindex.html

@@ -87,6 +87,8 @@
 			margin-left: 5px;
 			margin-left: 5px;
 			font-weight: normal;
 			font-weight: normal;
 			background-color: #fff;
 			background-color: #fff;
+			margin-top: 5px;
+			display: inline-block;
 		}
 		}
 	</style>
 	</style>
  </head>
  </head>

+ 1 - 3
core/src/web/templates/member/incmobile/list.html

@@ -155,7 +155,6 @@
 		var entcard={{.T.querymap.entcard}};
 		var entcard={{.T.querymap.entcard}};
 		var strVar = "";
 		var strVar = "";
 		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><b class=\"$status\" style='display:inline-block;'>$OpStateName<\/b><b class=\"$excClass\" style='display:inline-block;'>$excDirect<\/b><\/div><div style='float:right;margin-right:10px;' data-id='$Id' onclick='follow(this)'><i class='glyphicon $gz' style=\"font-size:11px;\">&nbsp;<\/i><span>$gzt</span><\/div><\/caption><tr><td class=\"left\">注册号:<span>$RegNo<\/span><\/td><td align='right'>法定代表人:<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间:<span>$EstDate<\/span><\/td><td align='right'>所在地:<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
 		strVar += "<li class=\"col-xs-12\"><table align=\"center\"><caption><div class=\"left\"><a href=\"/enterprise/$Id.html\">$EntName</a><b class=\"$status\" style='display:inline-block;'>$OpStateName<\/b><b class=\"$excClass\" style='display:inline-block;'>$excDirect<\/b><\/div><div style='float:right;margin-right:10px;' data-id='$Id' onclick='follow(this)'><i class='glyphicon $gz' style=\"font-size:11px;\">&nbsp;<\/i><span>$gzt</span><\/div><\/caption><tr><td class=\"left\">注册号:<span>$RegNo<\/span><\/td><td align='right'>法定代表人:<span>$LeRep<\/span><\/td><\/tr><tr><td class=\"left\">成立时间:<span>$EstDate<\/span><\/td><td align='right'>所在地:<span>$OpLocDistrict<\/span><\/td><\/tr><tr><td colspan=\"2\"><hr class=\"list\"><\/td><\/tr><\/table><\/li>";
-		
 		function loadData(){
 		function loadData(){
 			   var li="";
 			   var li="";
 				var len=i+5;
 				var len=i+5;
@@ -179,7 +178,7 @@
 											 .replace("$RegNo",data[i]["RegNo"])
 											 .replace("$RegNo",data[i]["RegNo"])
 											 .replace("$LeRep",data[i]["LeRep"])
 											 .replace("$LeRep",data[i]["LeRep"])
 											 .replace("$OpLocDistrict",data[i]["OpLocDistrict"])
 											 .replace("$OpLocDistrict",data[i]["OpLocDistrict"])
-											 .replace("$EstDate",data[i]["EstDate"])
+											 .replace("$EstDate",data[i]["EstDate"]=="1970-01-01"?"":data[i]["EstDate"])
 											 .replace("$excDirect",data[i]["excDirect"]?"经营异常":"$excDirect")
 											 .replace("$excDirect",data[i]["excDirect"]?"经营异常":"$excDirect")
 											 .replace("$Id",data[i]["_id"])
 											 .replace("$Id",data[i]["_id"])
 											 .replace("$Id",data[i]["_id"])
 											 .replace("$Id",data[i]["_id"])
@@ -189,7 +188,6 @@
 					}else{
 					}else{
 						tmp=tmp.replace("$status","ent-status-g");
 						tmp=tmp.replace("$status","ent-status-g");
 					}
 					}
-					console.info(tmp);
 					tmp=tmp.replace("<b class=\"$excClass\" style='display:inline-block;'>$excDirect<\/b>","");
 					tmp=tmp.replace("<b class=\"$excClass\" style='display:inline-block;'>$excDirect<\/b>","");
 					tmp=tmp.replace("$excClass","excDirect");
 					tmp=tmp.replace("$excClass","excDirect");
 					if(data[i]["status"]=="y"){
 					if(data[i]["status"]=="y"){