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

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

@@ -1512,7 +1512,36 @@ a{
 	margin-right: 5px;
 }
 .d-bg-green{
-	
+	background-image:url(/images/tbn8.png);
+}
+.d-bg-gray{
+	background-image:url(/images/tbn8.png);
+}
+.d-bg-blue{
+	background-image:url(/images/tbn7.png);
+}
+.a-bg-gray-new{
+	display:inline-block;
+	height:21px;
+	width:81px;
+	background:#FFF;
+	background-image:url(/images/tbn9.png);
+	position: relative;
+  	  top: -4px;
+}
+.d-bg-green, .d-bg-gray,.d-bg-blue{
+	width:81px;
+	height:21px;
+	color:#FFF;
+	padding-left:0px;;
+	position: static !important;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	text-overflow: none;
+	overflow: none;
+	white-space: nowrap;
+	line-height:21px !important;
 }
 .a-servicedetail #no_reg{ 
 	margin-bottom:100px; 

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

@@ -50,7 +50,7 @@
 							{{else if eq .T.demandInfo.i_status 3}}
 							<span class="a-bg-gray a-bg-gray-new">任务超时</span>
 							{{else if eq .T.demandInfo.i_status 4}}
-							<span class="a-bg-gray">已撤销</span>
+							<span class="a-bg-gray  a-bg-gray-new">已撤销</span>
 							{{end}}
 				 			{{if .T.edit}}
 							<span>

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -150,8 +150,8 @@
 								</div>
 								<br><img src="/images/entcommunity/triangle.png">
 							</span>
-							<div><span>注册号</span><span>{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span></div>
-							<div><span>行业</span><span>{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span></div>
+							{{if .T.res.RegNo}}<div><span>注册号</span><span>{{.T.res.RegNo}}</span></div>{{end}}
+							{{if .T.res.IndustryPhyName}}<div><span>行业</span><span>{{.T.res.IndustryPhyName}}</span></div>{{end}}
 						</div>
 						<!--成立日期-->
 						<div class="entinfo-estdate">