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

core/src/qfw/front/webcentent.go

@@ -376,8 +376,8 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 
 		log.Println("querymap:", querymap)
 		//查询生成列表数据
-		if list == "qykb" {
-			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "qykb"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
 			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {
@@ -390,8 +390,8 @@ func (n *Newscont) GetExpressList(list /*分类*/, param /*参数*/ string) erro
 		bs, _ := base64.StdEncoding.DecodeString(paramstr)
 		querymap := map[string]string{}
 		json.Unmarshal(bs, &querymap)
-		if list == "qykb" {
-			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "qykb"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
+		if list == "qykb" || list == "zhsk" {
+			hotnews := elastic.GetPage("content", "content", `{"s_contenttype": "`+list+`"}`, `{"praise":-1}`, `{"_id":1,"s_title":1,"praise":1}`, 0, 10)
 			data, pagination := searhWebContent(querymap)
 			n.Render("/manage/web_newexpresslist.html", &xweb.T{"querymap": querymap, "data": data, "pagination": pagination, "hotnews": hotnews})
 		} else if list == "zcfg" {

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-26 16:25:08"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-26 16:25:08"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-02-29 13:47:52"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-02-29 13:47:52"}},"marketisstart":true,"marketrate":300}

core/src/web/templates/common/newshead.html

@@ -5,7 +5,9 @@
 		<ul>
 			<li class="b-nav-logo"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
 			<li class="b-nav-link b-nav-main"><a href="/front/content_qykb_list.html">新闻资讯</a></li>
-			<li class="b-h-search">
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a href="/front/content_qykb_list.html" class="news"  id="qykb">新闻资讯</a><a class="b-nav-s"></a></li>
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="zhsk"  href="/front/content_zhsk_list.html">知识库</a></li>
+			<li class="b-h-search hidden">
 				<div class="input-group">
 			        <div class="input-group-btn hide">
 			        	<button type="button" id="header-searchBtn" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><font>服务</font><span class="hide caret margin-l-10"></span></button>

core/src/web/templates/index.html

@@ -152,12 +152,12 @@
 			   <!-- 轮播（Carousel）项目 -->
 			   <div class="carousel-inner">
 			         	{{$s:=(Ad "index-center-06" 16)}}
-			      <div class="item active">
+			      <div class="item active itemno">
 						<div class="index-qysq">
 						{{range $k,$v := $s}}
 						{{if eq $k 4}}</div><div class="index-qysq">{{end}}
 						
-						{{if eq $k 8}} </div></div><div class="item"><div class="index-qysq">{{end}}
+						{{if eq $k 8}} </div></div><div class="item itemno"><div class="index-qysq">{{end}}
 			    		{{if eq $k 12}}</div><div class="index-qysq">{{end}}
 				
 						<div class="index-new-qysqlist text-center">
@@ -171,11 +171,13 @@
 			      </div>
 			    
 			   </div>
+			
 			   <!-- 轮播（Carousel）导航 -->
 			   <a class="carousel-control" href="#myCarousel" 
 			      data-slide="prev"><img id="qysq-left" src="/images/qysq-left.png"></a>
 			   <a class="carousel-control rightmenu" href="#myCarousel" 
 			      data-slide="next"><img id="qysq-right" src="/images/qysq-right.png"></a>
+			
 			</div>
 		</div> 
 	</div>
@@ -333,6 +335,10 @@
 </div>
 {{include "/common/bottom.html"}}
 <script>
+var itm = $(".itemno").length;
+if (itm < 2){
+	$(".carousel-control").addClass("hidden");
+}
 $(function(){
 var areload=$("a.reload");
 areload.click(function(){

core/src/web/templates/manage/web_newexpresslist.html

@@ -62,6 +62,7 @@ font-weight:normal;
 }
 .a-content{
 	margin-top:10px;
+	margin-bottom:10px;
 }
 .b-head .head-hidemenu li:hover {
     background-color: #FF5A5F;
@@ -141,6 +142,13 @@ font-weight:normal;
 #newsdiv{
 	margin-left:-45px;
 }
+.news-left #content{
+	border-top-left-radius: 0px;
+}
+.forwat{
+	color:#ff5a5f !important;
+	font-weight:bold;
+}
 </style>
 </head>
 <body>
@@ -238,6 +246,14 @@ font-weight:normal;
 {{include "/common/bottom.html"}}
 <script src="/js/qfwtable.js"></script>
 <script type="text/javascript">
+
+	var ctp = {{.T.querymap.contentType}};
+	if (ctp == "qykb"){
+		$("#qykb").addClass("forwat");
+	}else if(ctp == "zhsk"){
+		$("#zhsk").addClass("forwat");
+		
+	}
 	var html = ""
 	{{range $k,$v:=.T.hotnews}}
 		var k = {{$k}}+1

core/src/web/templates/manage/web_regulationslist.html

@@ -41,6 +41,24 @@ body{
 .index-new-head .head-hidemenu i {
     color: #FF7F47;
 }
+.nav-tabs li.active {
+    border-top: 3px solid #FF7F47;
+	margin-left: 20px;
+}
+.nav-tabs > li {
+    width: 110px;
+}
+.nav-tabs #c_all{
+	padding-left:35px;
+}
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover{
+	border:0px;
+}
+.nav-tabs{
+	border:0px;
+	background-color:#F6F8FA;
+	margin-left: -20px;
+}
 </style>
 </head>
 <body>
@@ -71,7 +89,7 @@ body{
     <div class="borderB text-primary fontb frontS">所有分类</div>-->
 	<!--筛选条件_begin-->
 	
-    <ul class="nav nav-tabs" style="margin-top:10px;position:relative">
+    <ul class="nav nav-tabs" style="margin-top:-10px;position:relative">
                <li class="active"><a href="#home" data-toggle="tab" id="c_all" name="all" value="c_all">全部</a></li>
                <li style=" display:none;" role="presentation"><a href="#" role="tab" data-toggle="tab">日期</a></li>
 			<li style=" display:none;" role="presentation"><a href="#" role="tab" data-toggle="tab">颁发单位</a></li>