홈 탐색 도움말
로그인
qmx
/
qfw
7
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

wangshan 9 년 전
부모
79881efb01 87cba41139
커밋
022d9f6f31
9개의 변경된 파일과 104개의 추가작업 그리고 15개의 파일을 삭제
통합 보기 변경상태 보기
  1. 1 0
      core/src/qfw/search/searchService.go
  2. 2 2
      core/src/qfw/search/wxsearchservice.go
  3. BIN
      core/src/web/staticres/images/bottom_bg_b.png
  4. 10 1
      core/src/web/staticres/js/enterprise.js
  5. 3 0
      core/src/web/staticres/js/qfw.js
  6. 45 10
      core/src/web/templates/_error.html
  7. 6 0
      core/src/web/templates/common/errorhead.html
  8. 17 1
      core/src/web/templates/member/incmobile/detailindex.html
  9. 20 1
      core/src/web/templates/member/incmobile/list.html

+ 1 - 0
core/src/qfw/search/searchService.go
파일 보기 

@@ -318,6 +318,7 @@ func searhWebContentent(querymap map[string]string, n *Search, reqType string) (
 
 	tempBisOne := false
 
 	tempBisOne := false
 
 	ipcity := ""
 
 	ipcity := ""
 
 	var total int64 = 500
 
 	var total int64 = 500
 
+	fmt.Println("cityNo：", cityNo)
 
 	if cityNo == "" && len(queryStr) == 0 {
 
 	if cityNo == "" && len(queryStr) == 0 {
 
 		querymap["cityNo"] = "1"
 
 		querymap["cityNo"] = "1"
 
 		tn, er := ip.Find(n.Protocol())
 
 		tn, er := ip.Find(n.Protocol())

+ 2 - 2
core/src/qfw/search/wxsearchservice.go
파일 보기 

@@ -154,7 +154,7 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 
 						      }
 
 						      }
 
 						    }
 
 						    }
 
 						  }
 
 						  }
 
-						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","RegCapCurName","s_avatar"]
 
+						,"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","RegCapCurName","s_avatar","excDirect"]
 
 						,"from": ` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 
 						,"from": ` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 
 						"size":` + fmt.Sprintf("%v", perPage) + `,
 
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
 
 						  "sort": [{"_score": "desc"},{"OpSint":"desc"},{"RegCap":"desc"}]
 
@@ -295,7 +295,7 @@ func wxsearhWebContentent(querymap map[string]string, n *Wxsearch, reqType strin
 
 			"s_synopsis":{"force_source": true},
 
 			"s_synopsis":{"force_source": true},
 
 			"stock":{"force_source": true}
 
 			"stock":{"force_source": true}
 
         }
 
         }
 
-    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","s_submitid","RegCapCurName","s_avatar"]
 
+    },"_source":["_id","EntName","RegOrgName","RegNo","EntType","LeRep","EstDate","OpLocDistrictName","RegCap","OpStateName","OpState","s_servicenames","s_action","OpLocDistrict","s_submitid","RegCapCurName","s_avatar","excDirect"]
 
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 
 	"size":` + fmt.Sprintf("%v", perPage) +
 
 	"size":` + fmt.Sprintf("%v", perPage) +
 
 			`,"sort":[` + sort + `] }`
 
 			`,"sort":[` + sort + `] }`

BIN
core/src/web/staticres/images/bottom_bg_b.png
파일 보기


+ 10 - 1
core/src/web/staticres/js/enterprise.js
파일 보기 

@@ -70,7 +70,16 @@ function reloadData(obj,name){
 
 	$("#searchForm input[name=OpState]").val("");
 
 	$("#searchForm input[name=OpState]").val("");
 
 	$("#searchForm input[name=c_author]").val("");
 
 	$("#searchForm input[name=c_author]").val("");
 
 	$("#searchForm input[name="+name+"]").val(val);
 
 	$("#searchForm input[name="+name+"]").val(val);
 
-	
+	//
 
+	var wordsVal = $("#searchForm input[name=words]").val();
 
+	var cityVal = $("#searchForm input[name=city]").val();
 
+	var c_authorVal = $("#searchForm input[name=c_author]").val();
 
+	var OpStateVal = $("#searchForm input[name=OpState]").val();
 
+	var c_hflVal = $("#searchForm input[name=c_hfl]").val();
 
+	var c_zbVal = $("#searchForm input[name=c_zb]").val();
 
+	if(wordsVal=="" && cityVal=="" && c_authorVal=="" && OpStateVal=="" && c_hflVal=="" && c_zbVal==""){
 
+		$("#searchForm input[name=cityNo]").val("");
 
+	}
 
     document.forms['searchForm'].submit();
 
     document.forms['searchForm'].submit();
 
 }
 
 }

+ 3 - 0
core/src/web/staticres/js/qfw.js
파일 보기 

@@ -304,6 +304,9 @@ function webSiteInit(){
 
 	}
 
 	}
 
 	try{
 
 	try{
 
 		var setBottomPadding = function(){
 
 		var setBottomPadding = function(){
 
+			if($("#testBottom").length == 0){
 
+				return;
 
+			}
 
 			$("#qfw-bottom").css("padding-top","0px");
 
 			$("#qfw-bottom").css("padding-top","0px");
 
 			var testBottom_offsetTop = $("#testBottom").offset().top;
 
 			var testBottom_offsetTop = $("#testBottom").offset().top;
 
 			var windowHeight = $(window).height();
 
 			var windowHeight = $(window).height();

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 45 - 10
core/src/web/templates/_error.html


+ 6 - 0
core/src/web/templates/common/errorhead.html
파일 보기 

@@ -8,6 +8,12 @@ body{
 
 h5 a{
 
 h5 a{
 
 	color: #a0a0a0;
 
 	color: #a0a0a0;
 
 }
 
 }
 
+.b-head .head-hideMenu li:hover {
 
+    color: inherit;
 
+}
 
+.b-head .head-hideMenu li:hover>i {
 
+    color: inherit;
 
+}
 
 </style>
 
 </style>
 
 <div class="b-head">
 
 <div class="b-head">
 
 	{{include "/common/top.html"}}
 
 	{{include "/common/top.html"}}

+ 17 - 1
core/src/web/templates/member/incmobile/detailindex.html
파일 보기 

@@ -72,6 +72,22 @@
 
 		li {
 
 		li {
 
 			width: 100%;
 
 			width: 100%;
 
 		}
 
 		}
 
+		.ent-status-g, .ent-status-r{
 
+			padding-top: 0px;
 
+			padding-bottom: 0px;
 
+			font-size: 14px;
 
+			margin-left: 5px;
 
+			font-weight: normal;
 
+		}
 
+		.excDirect{
 
+			font-size: 14px;
 
+			padding: 0px 6px;
 
+		    border: 1px solid #FF5A5F;
 
+		    color: #FF5A5F;
 
+			margin-left: 5px;
 
+			font-weight: normal;
 
+			background-color: #fff;
 
+		}
 
 	</style>
 
 	</style>
 
  </head>
 
  </head>
 
  <body>
 
  <body>
 
@@ -102,7 +118,7 @@
 
 					
 					
 				</script>
 
 				</script>
 
 				</div>
 
 				</div>
 
-			<!--	<div  class="abn" >经营异常</div>-->
 
+				{{if .T.res.excDirect}}<span class="excDirect">经营异常</span>{{end}}
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
 		<div class="col-xs-12 index-middle">
 
 		<div class="col-xs-12 index-middle">

+ 20 - 1
core/src/web/templates/member/incmobile/list.html
파일 보기 

@@ -28,6 +28,21 @@
 
 	#reg li,#category li{
 
 	#reg li,#category li{
 
 		width: 100%;
 
 		width: 100%;
 
 	}
 
 	}
 
+	.ent-status-g, .ent-status-r{
 
+		padding-top: 0px;
 
+		padding-bottom: 0px;
 
+		font-size: 14px;
 
+		margin-left: 5px;
 
+		font-weight: normal;
 
+	}
 
+	.excDirect{
 
+		font-size: 14px;
 
+		padding: 0px 6px;
 
+	    border: 1px solid #FF5A5F;
 
+	    color: #FF5A5F;
 
+		margin-left: 5px;
 
+		font-weight: normal;
 
+	}
 
 	</style>
 
 	</style>
 
  </head>
 
  </head>
 
  <body>
 
  <body>
 
@@ -139,7 +154,7 @@
 
 		var data={{.T.data}}
 
 		var data={{.T.data}}
 
 		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><\/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="";
 
@@ -165,6 +180,7 @@
 
 											 .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"])
 
+											 .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"])
 
 											 .replace("$OpStateName",data[i]["OpStateName"].substr(0,2));
 
 											 .replace("$OpStateName",data[i]["OpStateName"].substr(0,2));
 
@@ -173,6 +189,9 @@
 
 					}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("$excClass","excDirect");
 
 					if(data[i]["status"]=="y"){
 
 					if(data[i]["status"]=="y"){
 
 						tmp=tmp.replace("$gz","yiguanzhu").replace("$gzt","已关注");	
 						tmp=tmp.replace("$gz","yiguanzhu").replace("$gzt","已关注");	
 					}else{
 
 					}else{

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.