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

core/src/qfw/searchmarket/marketservice.go

@@ -196,7 +196,7 @@ func searhService(querymap map[string]string, n *Market) (*[]map[string]interfac
             "s_name":{"force_source": true},
 			"s_introduction":{"force_source": true}
         }
-    },"_source":["_id","s_name","s_images","i_comments","i_hits","i_sales","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","i_identType","i_comauthenttype"]
+    },"_source":["_id","s_name","s_images","i_comments","i_hits","i_sales","i_status","i_bids","s_enterprisename","s_enterpriseid","s_nickname","s_introduction","l_createdate","i_identType","f_price","i_identtype","i_comauthenttype"]
 	,"from":` + fmt.Sprintf("%v", ((currentPage-1)*perPage)) + `,
 	"size":` + fmt.Sprintf("%v", perPage) +
 		`,"sort":[` + sort + `] }`

core/src/web/staticres/css/dev-qfw.css

@@ -702,8 +702,9 @@ a{
 }
 
 .a-table tr:first-child>td {
-	background-color: #f7f6f4;
+	background-color: #FBF0F1;
 	line-height: 40px !important;
+	color: #FF5A5F;
 }
 
 .a-table .a-table-operation a{
@@ -1287,18 +1288,18 @@ a{
 }
 
 .a-servicedetail .d_fwfl {
-	padding-left: 5px;
+	background-color: #F6F8FA;
 	height: 40px;
-	border-bottom: 1px solid #CCCCCC;
-	border-top: 1px solid #CCCCCC;
-	background-color: #f7f6f4;
 }
 
-.a-servicedetail .d_fwfl>a {
-	margin-left: -4px;
-	background-color: #f7f6f4;
-	border-radius: 0px;
-	border-right: 1px solid #CCCCCC;
+.a-servicedetail .d_fwfl a {
+	float: left;
+	display: block;
+	border-right: 1px solid #FFF;
+	min-width: 115px;
+	height: 40px;
+	line-height: 40px;
+	text-align: center;
 	font-size: 13px;
 }
 
@@ -1337,10 +1338,11 @@ a{
 }
 
 .a-servicedetail .d_star_f {
-	margin-top: 20px;
+	margin-top: 10px;
 	height: 40px;
-	background-color: #f7f6f4;
+	background-color: #FBF0F1;
 	padding: 10px;
+	margin-left: 4px;
 }
 
 .a-servicedetail .d_star_f input {
@@ -1381,10 +1383,6 @@ a{
 	line-height: 32px;
 }
 
-.a-servicedetail .d_liebiao table {
-	border-bottom: 1px solid #CCCCCC;
-}
-
 .a-servicedetail .d_liebiao tr td:first-child {
 	text-align: center;
 	padding-left: 22px;
@@ -1461,7 +1459,6 @@ style="color:#D03102;margin-right:5px;"
 	color: #555;
 	background-color: #fff;
 	border: 1px solid #ccc;
-	border-radius: 4px;
 }
 
 .a-servicelist .d_group {
@@ -1503,7 +1500,7 @@ style="color:#D03102;margin-right:5px;"
 	height: 45px;
 	padding: 10px 20px;
 	width:112px;
-	font-size: 14px;
+	font-size: 13px;
 	text-align:center;
 
 }
@@ -1668,6 +1665,10 @@ style="color:#D03102;margin-right:5px;"
 	color: #fff;
 	background-color: #DC4715;
 }
+.m-detailintroduction{
+	background:#FFF;
+	padding:15px;
+}
 .f-d.u-overflow img,.m-detailintroduction img{
 	max-width:100%;
 }

core/src/web/staticres/js/marketlist.js

@@ -1,7 +1,6 @@
 
 var citySim = [{"k":" 11","n":"北京市"},{"k":" 12","n":"天津市"},{"k":" 13","n":"河北省"},{"k":" 14","n":"山西省"},{"k":" 15","n":"内蒙古"},{"k":" 21","n":"辽宁省"},{"k":" 22","n":"吉林省"},{"k":" 23","n":"黑龙江省"},{"k":" 31","n":"上海市"},{"k":" 32","n":"江苏省"},{"k":" 33","n":"浙江省"},{"k":" 34","n":"安徽省"},{"k":" 35","n":"福建省"},{"k":" 36","n":"江西省"},{"k":" 37","n":"山东省"},{"k":" 41","n":"河南省"},{"k":" 42","n":"湖北省"},{"k":" 43","n":"湖南省"},{"k":" 44","n":"广东省"},{"k":" 45","n":"广西"},{"k":" 46","n":"海南省"},{"k":" 50","n":"重庆市"},{"k":" 51","n":"四川省"},{"k":" 52","n":"贵州省"},{"k":" 53","n":"云南省"},{"k":" 54","n":"西藏"},{"k":" 61","n":"陕西省"},{"k":" 62","n":"甘肃省"},{"k":" 63","n":"青海省"},{"k":" 64","n":"宁夏"},{"k":" 65","n":"新疆"},{"k":" 71","n":"台湾省"},{"k":" 81","n":"香港"},{"k":" 82","n":"澳门"}];
 $(function() {
-
   getServiceType();
   //地区下拉框
   if ($chiancity) {
@@ -25,8 +24,7 @@ $(function() {
 	$(".d_tj div").click(function(n){
 			var node=$(n.target);
 			if(!node.hasClass("d_zhpx")){
-				
-				
+				$("form#searchForm").attr("action","/market/"+$("#c_fwtype").val()+"/list.html");
 				searchBeforeSumbit("c_sorttype",node.attr("value"))
 			}
 	})
@@ -45,6 +43,8 @@ $(function() {
 			}
 			if(name=="c_fwtype"){
 				$("form#searchForm").attr("action","/market/"+node.attr("value")+"/list.html");
+			}else{
+				$("form#searchForm").attr("action","/market/"+$("#c_fwtype").val()+"/list.html");
 			}
 			searchBeforeSumbit(name,node.attr("value"));
   });
@@ -180,8 +180,7 @@ function getServiceType(){
 		}
 	}
 	str += "</ul>";
-	$("#fwlb").html(str);
-	
+	$("#fwlb").html(str);	
 }
 
 function less(obj) {

core/src/web/templates/service/detail.html

@@ -27,8 +27,9 @@
 	.text-muted a{
 		color: #aea79f;
 	}
-	.text-primary{
-		color:#FF5A5F;
+	.a-servicedetail .btnactive{
+		border-top:3px solid #FF5A5F;
+		line-height: 30px !important;
 	}
 	</style>
 <link href="/css/index-new.css" rel="stylesheet">
@@ -150,9 +151,9 @@
 		<div class="d_fwfl" >
 			
 			{{if eq .T.isComment 0}}	
-			<a type="button" class="btn text-muted btnactive" >服务详情</a>
-			<a type="button" class="btn text-muted">服务评价({{.T.sinfo.i_comments}})</a>
-			<a type="button" class="btn text-muted">预约记录({{.T.appcount}})</a>
+			<a type="button" class="text-muted btnactive" style="margin-left:18px;border-left:1px solid #FFF;">服务详情</a>
+			<a type="button" class="text-muted">服务评价({{.T.sinfo.i_comments}})</a>
+			<a type="button" class="text-muted">预约记录({{.T.appcount}})</a>
 			{{end}}
 			
 			{{if .T.status }}
@@ -169,23 +170,21 @@
 		
 		{{if eq .T.isComment 0}}	
 		<!--添加详情-->
-		<div class="margin-15 m-detailintroduction">
+		<div class="m-detailintroduction" style="padding:30px 100px 30px 100px;">
 		{{.T.sinfo.s_introduction}}
 		
 		
 		</div>
 		
 		<!--服务评价-->
-		<div class="margin-15 hide">
-			 <div>
-			 <span>综合评分：<div class="gray-star1">
-			 <div class="green-star1" style="width:{{.T.style}}%"></div>
-			 </div>
-			 <div  class="d_service_app1">
-			 <span  class="margin-lr-15" >{{.T.fscore}} 分 </span>
-			 <span  >共 {{.T.sinfo.i_comments}}条评价 </span>
+		<div class="m-detailintroduction hide">
+			<div style="margin-left:40px;">
+				<span class="text-muted">综合评分：<div class="gray-star1">
+				<div class="green-star1" style="width:{{.T.style}}%"></div>
+			</div>
+		 	<div  class="d_service_app1">
+				 <span  class="margin-lr-15" >{{.T.fscore}} 分 </span>
 			 </div>
-		 
 		 </div>
 		 <div class="d_star_f radio">
 		  <label class="rad">
@@ -209,7 +208,7 @@
 		{{end}}
 		</div>
 		<!--预约记录-->
-		<div class="margin-15 hide">
+		<div class="m-detailintroduction hide">
 			<div class="d_liebiao">
 				<table class="table a-table"  id="appRecord">
 				     <tr style="height:30px;"  id="tableTitle">
@@ -296,7 +295,7 @@
 compulsoryreRresh = true;
 $(function(){
 	
-	$(".d_fwfl a").eq(0).addClass(".d_fwfl")
+	$(".d_fwfl a").eq(0).addClass("d_fwfl")
 	$(".m-comment li").mouseover(function(a,b,c){
 			var node=$(a.currentTarget);
 			$("#i_score").val(node.index()+1);

core/src/web/templates/service/list.html

@@ -81,7 +81,7 @@
 					<div class="d_style_hylb text-muted less u-key" style="width:80%;" id="fwlb"></div>
 					<div class="d_more qfw-text-more" onClick="less(this)"><small  style="cursor:hand">更多></small></div>	
 				</div>
-				<div class="f_zw">
+				<div class="f_zw ">
 					
 				</div>
 				<div class="list-new-row">
@@ -134,19 +134,51 @@
 						</div></a>
 					{{end}}
 				</div>
-				<div class="col-sm-6 col-xs-8">		
-				<div class="title">
+				<div class="col-sm-4 col-xs-8">		
+				<div class="title" style="height:40px;" >
 					{{if eq "demand" $.T.querymap.c_searchtype}}
-						<a target="_blank" href="/market/demandview/{{$v._id}}.html">{{$v.s_name}}</a>
+						<a target="_blank" style="float: left;max-width: 230px;display: inline-block;word-break: break-all;" href="/market/demandview/{{$v._id}}.html">{{$v.s_name}}</a>
 					{{else}}
-						<a target="_blank" href="/market/detail/{{$v._id}}.html">{{$v.s_name}}</a>	
+						<a target="_blank" style="float: left;max-width: 230px;display: inline-block;word-break: break-all;" href="/market/detail/{{$v._id}}.html">{{$v.s_name}}</a>	
+					{{end}}
+					{{if eq "demand" $.T.querymap.c_searchtype}}
+					
+					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
+					{{if eq $v.i_status 1.0 }}
+						<img src="/images/u288.png" />
+					{{else}}
+						{{if eq $v.i_status 2.0}}
+						<img src="/images/u252.png" />
+						{{end}}
+					{{end}}
+					</div>
+					
 					{{end}}
 				</div>
-				<div style="padding-top:10px;padding-bottom:10px;">
-					<span class="d_service_span text-muted">{{if $v.s_enterprisename}}<a style="color:#aea79f;" href="/enterprise/{{$v.s_enterpriseid}}.html" target="_blank">{{$v.s_enterprisename}}</a>{{else}}{{$v.s_nickname}}{{end}}</span>
-				</div>
-					<div class="col-xs-12" style="margin-left:-9px;">
-					{{if $v.s_enterprisename}} 
+				<div class="col-xs-12" style="margin-top:2px;margin-left:-9px;{{if $v.s_enterprisename}} margin-bottom:5px;{{else}}margin-bottom:25px;{{end}}">
+				{{if $v.s_enterprisename}} 
+					{{if eq "demand" $.T.querymap.c_searchtype}}
+						{{ if $v.i_identtype }}
+							{{ if eq $v.i_identtype 1.0}}
+								<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证企业　</small></span>
+								{{ if $v.i_comauthenttype }}
+										{{ if eq $v.i_comauthenttype "2"}}
+											<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+										{{else if eq $v.i_comauthenttype "1"}}
+											<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+										{{else if eq $v.i_comauthenttype "3"}}
+											<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+										{{end}}
+								{{else}}
+										<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+								{{end}}
+							{{else if eq $v.i_identtype 2.0}}
+								<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:-5px;margin-right:5px;"> 已认证个人</small></span>
+							{{else if eq $v.i_identtype 3.0}}
+								<span class="glyphicon jgrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证机构</small></span>
+							{{end}}
+						{{end}}
+					{{else}}
 						{{ if $v.i_identType }}
 							{{ if eq $v.i_identType "1"}}
 								<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small style="margin-left:5px;margin-right:5px;">已认证企业　</small></span>
@@ -168,18 +200,26 @@
 							{{end}}
 						{{end}}
 					{{end}}
+				{{end}}
+				</div>
+					<div style="padding-top:10px;padding-bottom:10px;">
+						<span class="d_service_span text-muted" style="margin-top:10px;">{{if $v.s_enterprisename}}<a style="color:#aea79f;" href="/enterprise/{{$v.s_enterpriseid}}.html" target="_blank">{{$v.s_enterprisename}}</a>{{else}}{{$v.s_nickname}}{{end}}</span>
 					</div>
 				</div>
+				
 				{{if eq "service" $.T.querymap.c_searchtype}}
-				<div class="col-sm-4 col-xs-4 text-center hidden-xs" style="margin-top:10px;padding-right:0px;margin-left:30px;">
+				<div class="col-sm-2 col-xs-4" style="margin-top: 5px;">
+					价格：<span class="text-primary text-bold">5000</span>元
+				</div>
+				<div class="col-sm-4 col-xs-4 text-center hidden-xs" style="margin-top:5px;padding-right:0px;margin-left:30px;">
 					<div class="col-sm-8 " style="float:right;text-align:right;">
 						<div style="float:right;"><span class="d_col_span" style="font-size:14px;">成交量：<span style="color:#FF5A5F;font-weight:600;">{{$v.i_sales}}</span></span></div>
 						<div style="float:right;" ><span class="d_col_span" style="font-size:14px;">评价数：<span style="color:#FF5A5F;font-weight:600;">{{$v.i_comments}}</span></span>&nbsp;&nbsp;|&nbsp;&nbsp;</div>
 					</div>
 				</div>
 				{{else}}
-				<div class="col-sm-4 col-xs-4 text-center">
-					<div><span class="d_col_span">报价服务商:{{$v.i_bids}}</span></div>
+				<div class="col-sm-4 col-xs-4" style="margin-left:10px;float: right;">
+					<div style="width: 130px;float: right;">预算：<span class="d_col_span text-primary text-bold f-price" style="font-size:13px;">{{$v.f_price}}</span></div>
 				</div>
 				{{end}}
 			</div>
@@ -262,6 +302,14 @@
 			$(".a-c-right.hidden-xs").hide();
 			$(".list-new-list").css("max-width","1200px");
 		}
+		$(".f-price").each(function(i,n){
+			var text=$(n).text();
+			if(text=="0"){
+				$(n).text("面议");
+			}else{
+				$(n).text(parseFloat(text)+"元");
+			}
+		});
 	});
 </script>
 </body>