Merge branch 'release_1.3_20160104' of 192.168.3.17:zhanghongbo/qfw into release_1.3_20160104

core/src/qfw/front/wxpush.go

@@ -21,7 +21,7 @@ func (w *Wxpush) WxpushList(s_m_openid string, _id string, msgid string) error {
 		mongodb.Update("message", `{"_id":"`+msgid+`"}`, `{"$set":{"i_status":1}}`, false, false)
 	}()
 	**/
-	w.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1}`)
+	w.T["data"] = *mongodb.FindById("wxpush", _id, `{"s_content":1,"s_words":1,"a_visitedindex":1,"a_publishtime":1,"s_type":1}`)
 	w.T["_id"] = _id
 	return w.Render("/wxpush/index.html", &w.T)
 }

core/src/qfw/mobile/wxmenu.go

@@ -52,7 +52,7 @@ func (m *Mobile) Wxrssset() error {
 			}
 		}
 		//m.T["mid"] = openid
-		return m.Render("/member/message/wxrssset.html", &m.T)
+		return m.Render("/swordfish/wxrssset.html", &m.T)
 	} else {
 		return m.Render("_err.html")
 	}

core/src/qfw/swordfish/swordfishmanage.go

@@ -9,12 +9,12 @@ import (
 
 //跳转到用户中心剑鱼首页
 func (s *SwordFish) Swordfish() error {
-	if ret := redis.Get("other", "swordfish"); ret != nil && false {
+	if ret := redis.Get("other", "swordfish"); ret != nil {
 		return s.SetBody([]byte(ret.(string)))
 	} else {
 		now := time.Now()
 		unix := time.Date(now.Year(), now.Month(), now.Day(), now.Hour()-2, now.Minute(), now.Second(), now.Nanosecond(), time.Local).Unix()
-		r := mongodb.Find("bidding_back", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
+		r := mongodb.Find("bidding", bson.M{"comeintime": bson.M{"$lte": unix}}, `{"comeintime":-1}`, `{"title":1,"href":1,"publishtime":1}`, false, 0, 5)
 		if r != nil {
 			s.T["data"] = r
 		}

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

@@ -873,6 +873,18 @@ span.highlight {
 	content: "\61";
 }
 
+.tuichu:before {
+	content: "\2A";
+}
+
+.youjian1:before {
+	content: "\2C";
+}
+
+.ren1:before {
+	content: "\2B";
+}
+
 .icon-small {
 	font-size: 12px;
 }

core/src/web/staticres/css/swordfish.css

@@ -3,34 +3,108 @@ body{
 	background-color: #F0F0F0;
 }
 .logo{
-	width: 161px;
-	height: 68px;
+	width: 156px;
+	height: 66px;
 }
 a:focus, a:hover{
 	color: #37C6DA !important;
 }
+.round-dot{
+	background-color: #37C6DA;
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	position: absolute;
+	display: block;
+	top: 0px;
+}
 /********剑鱼********/
 .swordfish-head{
 	box-shadow: 0px 2px 2px #F4F4F4;
 }
-.swordfish-head .loginStatus{
-	padding-right: 15px;
+.swordfish-head .swordfish-loginStatus{
+	padding: 0px 15px;
+	position: relative;
+}
+.swordfish-head .swordfish-loginStatus:hover{
+	background-color: #F7F9FB;
+}
+.swordfish-head .swordfish-loginStatus:hover>a{
+	color: inherit !important;
+}
+.swordfish-head .swordfish-loginStatus>span{
+	position: relative;
+	display: inline-block;
+}
+.swordfish-head .swordfish-loginStatus>span .round-dot{
+	right: 5px;
+	width: 8px;
+	height: 8px;
+}
+.swordfish-head .swordfish-loginStatus>a{
+	display: inline-block;
+	position: relative;
+}
+.swordfish-head .head-hideMenu{
+	display: none;
+	position: absolute;
+	width: 120px;
+	left: 50%;
+	margin-left: -60px;
 }
-.swordfish-head .loginStatus>.badge{
-	right: 21px;
+.swordfish-head .head-hideMenu ul{
+	background-color: #F7F9FB;
+	box-shadow: 0 5px 10px rgba(0,0,0,.2);
+	margin-top: 1px;
+	float: left;
 }
-.swordfish-head .loginStatus li a:hover {
+.swordfish-head .head-hideMenu li{
+	width: 100%;
+	border-bottom: 1px solid #EDEEEF;
+	line-height: 40px;
+	padding-left: 20px;
+	cursor: pointer;
+}
+.swordfish-head .head-hideMenu li .round-dot{
+	right: -6px;
+}
+.swordfish-head .head-hideMenu li>span{
+	position: relative;
+}
+.swordfish-head .head-hideMenu i{
+	color: #37C6DA;
+	margin-right: 5px;
+}
+.swordfish-head .head-hideMenu i.youjian{
+	font-size: 12px;
+}
+.swordfish-head .head-hideMenu i.ren1{
+	margin-left: 2px;
+}
+.swordfish-head .head-hideMenu i.ren1,.swordfish-head .head-hideMenu i.tuichu{
+	font-size: 16px;
+	margin-right: 15px !important;
+}
+.swordfish-head .head-hideMenu li:hover{
 	background-color: #37C6DA;
-	color: #fff !important;
+	color: #fff;
+}
+.swordfish-head .head-hideMenu li:hover>i{
+	color: #fff;
+}
+.swordfish-head .head-hideMenu li:hover .round-dot{
+	background-color: #FFFFFF;
 }
 .swordfish-head a{
 	text-decoration: none;
 }
 .swordfish-top{
-	height: 30px;
-	line-height: 30px;
+	height: 25px;
+	line-height: 25px;
 	padding-right: 50px;
 	background-color: #464645;
+	font-size: 12px;
+	font-family: "SimSun";
 }
 .swordfish-top>div,.swordfish-content{
 	max-width: 1200px;
@@ -48,36 +122,49 @@ a:focus, a:hover{
 .swordfish-top a{
 	color: #A0A0A0;
 }
-.swordfish-top i{
-	font-size: 12px;
-	display: inline-block;
-	background-color: #A0A0A0;
-	width: 20px;
-	height: 20px;
+.swordfish-top li>span{
 	margin-right: 5px;
+	background-color: #A0A0A0;
 	text-align: center;
-	padding-top: 4px;
+	padding: 3px 9px;
+	position: relative;
+}
+.swordfish-top i{
+	position: absolute;
+	left: 0px;
 }
 .swordfish-top i.fuwushichang{
-	padding-top: 5px;
-	padding-right: 5px;
+	left: 3px;
+	top: 3px;
+}
+.swordfish-top i.qiyeshequ{
+	left: 4.5px;
+	top: 2px;
 }
 .swordfish-top i.jianyu{
-	padding-left: 2px;
+	font-size: 16px;
+	left: 3px;
+	top: 1px;
+}
+.swordfish-top i.weiguanwang1{
+	left: 4px;
+	top: 1px;
+	font-size: 14px
 }
 .swordfish-top i.zhengcefagui{
-	padding-top: 5px;
+	left: 4.5px;
+	top: 2px;
 }
 .swordfish-i-a{
 	background-color: #37C6DA !important;
 }
 .swordfish-nva{
-	border-top: 5px solid #37C6DA;
+	border-top: 3px solid #37C6DA;
 	background-color: #FFFFFF;
 }
 .swordfish-nva>ul{
-	height: 70px;
-	line-height: 70px;
+	height: 66px;
+	line-height: 66px;
 	max-width: 1200px;
 	margin: auto;
 }
@@ -87,7 +174,6 @@ a:focus, a:hover{
 .swordfish-nva-c{
 	width: 100px;
 	text-align: center;
-	font-size: 16px;
 }
 .swordfish-nva-s{
 	width: 1px;
@@ -96,32 +182,44 @@ a:focus, a:hover{
 	border-left: 1px solid #e5e6e9;
 	border-right: 1px solid #ffffff;
 	float: right;
-	margin-right: -2px;
 }
-.swordfish-nva-active{
+.swordfish-nva-main{
 	background-color: #37C6DA;
 }
-.swordfish-nva-active a{
+.swordfish-nva-main a{
+	font-size: 18px;
 	color: #FFFFFF !important;
+	font-weight: bold;
 }
-.swordfish-nva-active .swordfish-nva-s{
-	height: 0px;
+.swordfish-nva-rssset,.swordfish-nva-infolist{
+	font-family: "SimSun";
+}
+.swordfish-nva-rssset a:hover,.swordfish-nva-infolist a:hover,.swordfish-nva-active a{
+	font-weight: bold;
+	color: #37C6DA !important;
 }
 .swordfish-head .headimg{
 	width: 40px;
 	height: 40px;
+	margin-right: 5px;
 }
 .swordfish-content{
 	padding: 15px 0px 15px 0px;
 }
-.swordfish-left>.swordfish-left-c{
+.swordfish-left{
 	background-color: #FFFFFF;
-	padding: 10px;
-	min-height:670px;
+	padding: 15px;
+	width: 940px;
+	display: inline-block;
+	vertical-align: top;
 }
 .swordfish-right{
 	padding-right: 0px;
 	background-color: #FFFFFF;
+	max-width: 250px;
+	display: inline-block;
+	vertical-align: top;
+	float: right;
 }
 .swordfish-page-title{
 	padding-bottom: 10px;
@@ -149,7 +247,7 @@ a:focus, a:hover{
 .swordfish-rssset .btn>span{
 	margin-right: 5px;
 }
-.swordfish-rssset .swordfish-left-c>div{
+.swordfish-rssset .swordfish-left>div{
 	margin-bottom: 15px;
 }
 .swordfish-qrcode{
@@ -180,8 +278,7 @@ a:focus, a:hover{
 }
 .swordfish-panel-t{
 	padding: 10px;
-	font-size: 18px;
-	font-weight: bold;
+	font-size: 20px;
 	color: #37C6DA;
 	background-color: #F6F8FA;
 }
@@ -223,9 +320,11 @@ a:focus, a:hover{
 	cursor: pointer;
 }
 .swordfish-panel-c-t>div>span{
-	font-size: 14px;
+	font-family: "SimSun";
+	font-size: 12px;
 	color: #A0A0A0;
 	margin-left: 10px;
+	font-weight: normal;
 }
 .swordfish-panel-c-t i{
 	font-size: 14px;
@@ -247,10 +346,15 @@ a:focus, a:hover{
 	width: 400px;
 	display: inline-block;
 	margin: 0px 10px;
+	border-radius: 0px;
+	border-color: #e5e6e9;
+	box-shadow: none;
+	font-family: "SimSun";
 }
-.swordfish-keywords b{
+.swordfish-keywords lable{
 	display: inline-block;
 	width: 70px;
+	font-family: "SimSun";
 }
 .swordfish-keywords img{
 	width: 20px;
@@ -259,6 +363,12 @@ a:focus, a:hover{
 }
 .swordfish-keywords button{
 	margin-left: 80px;
+	padding-top: 6px;
+	padding-bottom: 6px;
+}
+.swordfish-scope button{
+	padding-top: 2px;
+	padding-bottom: 2px;
 }
 .swordfish-scope-dialog li{
 	width: 100%;
@@ -384,4 +494,18 @@ a:focus, a:hover{
 }
 .swordfish-visited{
 	color: #999;
+}
+.swordfish-index .carousel-indicators li{
+	width: 8px !important;
+	height: 8px !important;
+	border-radius: 8px !important;
+	margin-right: 10px;
+}
+@media (max-width: 1200px) {
+	.swordfish-left{
+		width: 100%;
+	}
+	.swordfish-right{
+		display: none;
+	}
 }

core/src/web/staticres/wxrssset/style.css

@@ -9,7 +9,7 @@ ul{
 	margin: 0px;
 }
 img{
-	vertical-align: middle;
+	vertical-align: sub;
 }
 .overflow-hidden{
 	overflow: hidden;
@@ -68,16 +68,10 @@ img{
 	position: relative;
 	font-size: 16px;
 }
-.operation>.parent-node:first-child>img{
-	margin-right: 2.5px;
-	margin-left: 12.5px;
-	width: 20px;
-	height: 19.5px;
-}
 .operation>.parent-node>img{
 	margin-left: 10px;
-	width: 25px;
-	height: 25px;
+	width: 20px;
+	height: 20px;
 }
 .operation>.parent-node>span img{
 	position: absolute;

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

@@ -3,21 +3,21 @@
 	<div class="swordfish-top">
 		<div>
 			<ul class="pull-right">
-				<li><i class="img-circle glyphicon fuwushichang"></i><a href="/market/0/list.html">服务市场</a></li>
-				<li><i class="img-circle glyphicon jianyu swordfish-i-a"></i><a href="/front/swordfish">剑鱼</a></li>
-				<li><i class="img-circle glyphicon qiyeshequ"></i><a href="/search/enterprise/ent.html">企业社区</a></li>
-				<li><i class="img-circle glyphicon weiguanwang1"></i><a href="/front/wsite.html">微官网</a></li>
-				<li><i class="img-circle glyphicon zhengcefagui"></i><a href="/front/content_zcfg_list.html">政策法规</a></li>
+				<li><span class="img-circle"><i class="glyphicon fuwushichang"></i></span><a href="/market/0/list.html">服务市场</a></li>
+				<li><span class="img-circle swordfish-i-a"><i class="glyphicon jianyu"></i></span><a href="/front/swordfish">剑鱼</a></li>
+				<li><span class="img-circle"><i class="glyphicon qiyeshequ"></i></span><a href="/search/enterprise/ent.html">企业社区</a></li>
+				<li><span class="img-circle"><i class="glyphicon weiguanwang1"></i></span><a href="/front/wsite.html">微官网</a></li>
+				<li><span class="img-circle"><i class="glyphicon zhengcefagui"></i></span><a href="/front/content_zcfg_list.html">政策法规</a></li>
 			</ul>
 		</div>
 	</div>
 	<div class="swordfish-nva">
 		<ul>
 			<li class="swordfish-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="swordfish-nva-c"><a href="/front/swordfish">剑鱼</a><a class="swordfish-nva-s"></a></li>
-			<li class="swordfish-nva-c"><a id="goToRssset">订阅设置</a><a class="swordfish-nva-s"></a></li>
-			<li class="swordfish-nva-c"><a id="goToInfolist">推送记录</a></li>
-			<li class="pull-right loginStatus" id="loginStatus"></li>
+			<li class="swordfish-nva-c swordfish-nva-main"><a href="/front/swordfish">剑鱼</a></li>
+			<li class="swordfish-nva-c swordfish-nva-rssset"><a id="goToRssset">订阅设置</a><a class="swordfish-nva-s"></a></li>
+			<li class="swordfish-nva-c swordfish-nva-infolist"><a id="goToInfolist">推送记录</a></li>
+			<li class="pull-right swordfish-loginStatus" id="swordfish-loginStatus"></li>
 		</ul>
 	</div>
 </div>
@@ -45,64 +45,30 @@ function reLoadTop(){
 				if(headImg != ""){
 					headImg = result.headImg;
 				}
-				var html = '<img class="img-circle headimg" src="'+headImg+'" onerror="this.src=\'/images/swordfish/headimg.png\'">'
-							+'<a href="/member/show/memberindex" id="topNickName" class="nickName">'+result.nickName+'</a><span class="caret"></span>';
+				var html = '<span><img class="img-circle headimg" src="'+headImg+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
 				if(hasMsgCount){
-					html += '<span class="badge">'+msgCount+'</span>';
+					html += '<a class="round-dot"></a>';
 				}
-				$("#loginStatus").html(html);
-				var content = '<ul>'
-						    	+'<li><a href="/member/msgcenter">消息中心';
+				html += '</span><a href="/member/show/memberindex">'+result.nickName+'</a>';
+				html += '<div id="head-hideMenu" class="head-hideMenu"><ul>'
+					    	+'<li onclick="window.location.href=\'/member/msgcenter\'"><i class="glyphicon youjian"></i><span>消息中心';
 				if(hasMsgCount){
-					content += '<span class="badge">'+msgCount+'</span>';
+					html += '<a class="round-dot"></a>';
 				}
-				content +='</a></li>'
-								+'<li><a href="/member/show/memberindex">用户中心</a></li>'
-								+'<li><a href="/front/logout">退出</a></li>'
-						  	+'</ul>';
-				$("#topNickName").popover({
-					html: true,
-					trigger: "manual",
-					placement: "bottom",
-					content: content
+				html += '</span></li>'
+						+'<li onclick="window.location.href=\'/member/show/memberindex\'"><i class="glyphicon ren1">&nbsp;</i>用户中心</li>'
+						+'<li onclick="window.location.href=\'/front/logout\'" class="border-b-0"><i class="glyphicon tuichu">&nbsp;</i>退出</li>';
+						+'</ul></div>';
+				$("#swordfish-loginStatus").html(html)
+				.mouseover(function(){
+					$("#head-hideMenu").show();
+				}).mouseleave(function(){
+					$("#head-hideMenu").hide();
 				});
-				var hideflag = false;
-				$("#topNickName").mouseover(function() {
-					hideflag = true;
-					var obj = null;
-					if(typeof($("#topNickName").attr("aria-describedby")) == "undefined"){
-						$("#topNickName").popover('show');
-						obj = $("#"+$("#topNickName").attr("aria-describedby"));
-						var cssObj = {top: 45};
-						if(!hasMsgCount){
-							cssObj["text-align"] = "center";
-						}
-						obj.css(cssObj);
-						obj.find("li").mouseover(function(){
-							$(this).addClass("acitve");
-						}).mouseleave(function(){
-							$(this).removeClass("acitve");
-						});
-					}else{
-						obj = $("#"+$("#topNickName").attr("aria-describedby"));
-					}
-					obj.mouseover(function(){
-						hideflag = true;
-					}).mouseleave(function(){
-						hideflag = false;
-						setTimeout(function(){
-							if(!hideflag){
-								$("#topNickName").popover('hide');
-							}
-						},100);
-					});
+				$("#head-hideMenu").mouseover(function(){
+					$(this).show();
 				}).mouseleave(function(){
-					hideflag = false;
-					setTimeout(function(){
-						if(!hideflag){
-							$("#topNickName").popover('hide');
-						}
-					},100);
+					$(this).hide();
 				});
 				//立即体验
 				$("#experience").click(function(){
@@ -122,7 +88,8 @@ function reLoadTop(){
 				}
 			}else{
 				isLogined = false;
-				$("#loginStatus").html('<a onclick="loginModalShow();">登录/注册</a>');
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#swordfish-loginStatus").html(html);
 				//立即体验
 				$("#experience").click(function(){
 					loginModalShow();
@@ -143,6 +110,12 @@ function reLoadTop(){
 		}
 	});
 }
+function swordfishLayoutInit(){
+	if(document.body.scrollHeight <= document.body.clientHeight){
+		$(".swordfish-left").height(document.body.clientHeight-$(".swordfish-head").height() - $("#qfw-bottom").height());
+		webSiteInit();
+	}
+}
 $(function(){
 	reLoadTop();
 });

core/src/web/templates/swordfish/index.html

@@ -8,52 +8,50 @@
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
 <div class="swordfish-content container-fluid swordfish-index">
-	<div class="swordfish-left col-xs-9">
-		<div class="swordfish-left-c">
-			<div id="swordfish-guide" class="swordfish-guide carousel slide" data-ride="carousel">
-			    <div class="swordfish-guide-left">
-					<i class="bootstrap-glyphicon glyphicon glyphicon-menu-left" href="#swordfish-guide" data-slide="prev"></i>
-				</div>
-				<!-- Wrapper for slides -->
-			  	<div class="carousel-inner" role="listbox">
-				    <div class="item active">
-				      	<img src="/images/swordfish/guide-1.png">
-				     	<div class="carousel-caption"></div>
-				    </div>
-				    <div class="item">
-				      	<img src="/images/swordfish/guide-2.png">
-				      	<div class="carousel-caption"></div>
-				    </div>
-					<div class="item">
-				      	<img src="/images/swordfish/guide-3.png">
-				     	<div class="carousel-caption"></div>
-				    </div>
-				    <div class="item">
-				      	<img src="/images/swordfish/guide-4.png">
-				      	<div class="carousel-caption"></div>
-				    </div>
-					<div class="item">
-				      	<img src="/images/swordfish/guide-5.png">
-				     	<div class="carousel-caption"></div>
-				    </div>
-			  	</div>
-				<div class="swordfish-guide-right">
-					<i class="bootstrap-glyphicon glyphicon glyphicon-menu-right" href="#swordfish-guide" data-slide="next"></i>
-				</div>
-				<span class="swordfish-guide-bottom">
-					<a class="btn" role="button" id="experience">立即体验</a>
-					<ol class="carousel-indicators">
-					    <li data-target="#swordfish-guide" data-slide-to="0" class="active"></li>
-					    <li data-target="#swordfish-guide" data-slide-to="1"></li>
-						<li data-target="#swordfish-guide" data-slide-to="2"></li>
-					    <li data-target="#swordfish-guide" data-slide-to="3"></li>
-						<li data-target="#swordfish-guide" data-slide-to="4"></li>
-				  	</ol>
-				</span>
+	<div class="swordfish-left">
+		<div id="swordfish-guide" class="swordfish-guide carousel slide" data-ride="carousel">
+		    <div class="swordfish-guide-left">
+				<i class="bootstrap-glyphicon glyphicon glyphicon-menu-left" href="#swordfish-guide" data-slide="prev"></i>
 			</div>
+			<!-- Wrapper for slides -->
+		  	<div class="carousel-inner" role="listbox">
+			    <div class="item active">
+			      	<img src="/images/swordfish/guide-1.png">
+			     	<div class="carousel-caption"></div>
+			    </div>
+			    <div class="item">
+			      	<img src="/images/swordfish/guide-2.png">
+			      	<div class="carousel-caption"></div>
+			    </div>
+				<div class="item">
+			      	<img src="/images/swordfish/guide-3.png">
+			     	<div class="carousel-caption"></div>
+			    </div>
+			    <div class="item">
+			      	<img src="/images/swordfish/guide-4.png">
+			      	<div class="carousel-caption"></div>
+			    </div>
+				<div class="item">
+			      	<img src="/images/swordfish/guide-5.png">
+			     	<div class="carousel-caption"></div>
+			    </div>
+		  	</div>
+			<div class="swordfish-guide-right">
+				<i class="bootstrap-glyphicon glyphicon glyphicon-menu-right" href="#swordfish-guide" data-slide="next"></i>
+			</div>
+			<span class="swordfish-guide-bottom">
+				<a class="btn" role="button" id="experience">立即体验</a>
+				<ol class="carousel-indicators">
+				    <li data-target="#swordfish-guide" data-slide-to="0" class="active"></li>
+				    <li data-target="#swordfish-guide" data-slide-to="1"></li>
+					<li data-target="#swordfish-guide" data-slide-to="2"></li>
+				    <li data-target="#swordfish-guide" data-slide-to="3"></li>
+					<li data-target="#swordfish-guide" data-slide-to="4"></li>
+			  	</ol>
+			</span>
 		</div>
 	</div>
-	<div class="swordfish-right col-xs-3">
+	<div class="swordfish-right">
 		<div class="swordfish-right-title">
 			剑鱼最新消息
 		</div>
@@ -64,12 +62,13 @@
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
 $(function(){
+	swordfishLayoutInit();
 	$('#swordfish-guide').carousel({
 	  	interval: 8000
 	});
 	//
 	var data = {{.T.data}};
-	if(data != "" && data.length > 0){
+	if(data && data != "" && data.length > 0){
 		var html = '';
 		for(var i=0;i<data.length;i++){
 			html += '<div class="tslist"><div class="time"><img src="/images/swordfish/circle.png">'
@@ -82,7 +81,6 @@ $(function(){
 		$(".swordfish-index").find(".swordfish-left").removeClass("col-xs-9");
 		$(".swordfish-index").find(".swordfish-right").remove();
 	}
-	$(".swordfish-nva>ul>li:eq(1)").addClass("swordfish-nva-active");
 });
 </script>
 </body>

core/src/web/templates/swordfish/infolist.html

@@ -45,23 +45,18 @@ $(function(){
 				a_interest={{.T.msgset.o_msgset.tender.a_key}};
 			}
 			$("#conlist").append('<div id="ycwords">'+str+'</div>');
-			
 			if(s_words.length!=0){
-				for(var i=0;i<s_words.length;i++){
-					$("#okeywords").append(s_words[i]+" ");
-				}
+				$("#okeywords").append(s_words.join(" ; ").replace(/\+/gm," "));
 			}else{
 				$("#zhaob").addClass("hide");
 			}
 			if(a_interest.length!=0){
-				for(var i=0;i<a_interest.length;i++){
-					$("#ointerest").append(a_interest[i]+" ");
-				}	
+				$("#ointerest").append(a_interest.join(" ; ").replace(/\+/gm," "));
 			}else{
 				$("#zhongb").addClass("hide");
 			}
 			if(s_words.length!=0 && a_interest.length!=0){
-				$("#zhaob>font").prepend("，");
+				$("#zhongb").append("，");
 			}
 			
 			//信息条总数
@@ -117,17 +112,15 @@ $(function(){
 						var leave2=leave1%(3600*1000);//计算小时数后剩余的毫秒数
 						var minutes=Math.floor(leave2/(60*1000));
 						//计算相差秒数
-						var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
-						var seconds=Math.round(leave3/1000);
-						var timeDiff = null;
+						/*var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
+						var seconds=Math.round(leave3/1000);*/
+						var timeDiff = "1分钟";
 						if(days > 0){
 							timeDiff = days+"天";
 						}else if(hours > 0){
 							timeDiff = hours+"小时";
 						}else if(minutes > 0){
 							timeDiff = minutes+"分钟";
-						}else{
-							timeDiff = seconds+"秒";
 						}
 						return '<span class="time-diff">'+timeDiff+'前</span>';
 					}
@@ -244,17 +237,15 @@ function loadMore(){
 							var leave2=leave1%(3600*1000);//计算小时数后剩余的毫秒数
 							var minutes=Math.floor(leave2/(60*1000));
 							//计算相差秒数
-							var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
-							var seconds=Math.round(leave3/1000);
-							var timeDiff = null;
+							/*var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
+							var seconds=Math.round(leave3/1000);*/
+							var timeDiff = "1分钟";;
 							if(days > 0){
 								timeDiff = days+"天";
 							}else if(hours > 0){
 								timeDiff = hours+"小时";
 							}else if(minutes > 0){
 								timeDiff = minutes+"分钟";
-							}else{
-								timeDiff = seconds+"秒";
 							}
 							return '<span class="time-diff">'+timeDiff+'前</span>';
 						}
@@ -288,10 +279,10 @@ function loadMore(){
 <style type="text/css">
 #kong{margin-top:220px; font-size:18px;cursor:hand}
 .visited{
-	color: #999;
+	color: #a0a0a0;
 }
 .time-diff{
-	color: #999;
+	color: #a0a0a0;
 	font-size: 14px;
 	display: inline-block;
 	width: 40px;
@@ -304,7 +295,7 @@ function loadMore(){
 .tim{padding:21px 0px;}
 .row{margin-left:10px;margin-right:10px;}
 #ycwords>div:first-child{display:none;}
-#forkw{margin-top: 15px;padding:10px 0px 10px 50px;background-color: #F7F8FA;}
+#forkw{margin-top: 15px;padding:10px 0px 10px 50px;background-color: #F7F8FA;color: #a0a0a0;}
 .xh{width: 10%;color:#35C5DA;font-size:15px;font-weight:bold;margin:0px 20px;float:left;display: inline-block; width:18px;text-align:right;}
 .tslist{border-bottom:1px solid #ccc;width:100%; padding:15px 0px;}
 #timestamp{color:#ccc;}
@@ -321,29 +312,25 @@ function loadMore(){
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
 <div class="swordfish-content container-fluid">
-	<div class="swordfish-left col-xs-9">
-		<div class="swordfish-left-c">
-			<div class="swordfish-page-title">
-			<i class="img-circle glyphicon jianyu"></i>信息列表
-			</div>
-			
-			<!-- 关键词提示start -->
-			<div id="forkw" >根据你设置的关键词<span id="zhongb"><font style="color:#FF5A5F;">招标公告</font>（<span id="ointerest"></span>）</span><span id="zhaob"><font style="color:#FF5A5F;">中标公告</font>（<span id="okeywords"></span>）</span>为你推送以下信息：</div>
-			<!-- 关键词提示end -->
-			<!-- 列表start -->
-			<div class="row"><div  class="col-sm-12" id="conlist"></div></div>
-			<!-- 列表end -->
-			<div id="more">
+	<div class="swordfish-left">
+		<div class="swordfish-page-title">
+			<i class="img-circle glyphicon jianyu"></i>推送记录
+		</div>
+		<!-- 关键词提示start -->
+		<div id="forkw" >根据你设置的<span id="zhongb">招标公告关键词（<span id="ointerest" style="color:#FF5A5F;"></span>）</span><span id="zhaob">中标公告关键词（<span id="okeywords" style="color:#FF5A5F;"></span>）</span>为你推送以下信息：</div>
+		<!-- 关键词提示end -->
+		<!-- 列表start -->
+		<div class="row"><div  class="col-sm-12" id="conlist"></div></div>
+		<!-- 列表end -->
+		<div id="more">
 			<div class="row">
-		    <div class="col-sm-12 btn btn-link text-center" onClick="loadMore()">
-	         点击加载更多
-			</div>
+			    <div class="col-sm-12 btn btn-link text-center" onClick="loadMore()">
+		        点击加载更多
+				</div>
 			</div>
-			</div>
-			
 		</div>
 	</div>
-	<div class="swordfish-right col-xs-3 swordfish-qrcode text-center">
+	<div class="swordfish-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>

core/src/web/templates/swordfish/rssset.html

@@ -8,78 +8,76 @@
 {{include "/common/swordfishhead.html"}}
 <!-- 中间 -->
 <div class="swordfish-content container-fluid swordfish-rssset">
-	<div class="swordfish-left col-xs-9">
-		<div class="swordfish-left-c">
-			<div class="swordfish-page-title">
-				<i class="img-circle glyphicon jianyu"></i>订阅设置
-			</div>
-			<div class="swordfish-explain">
-				“剑鱼”是企明星的特色产品，它借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，
-				为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，
-				比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。
-				您在输入了想要订阅的信息主题以后，网上一旦发布这些主题的信息，剑鱼就会第一时间将信息推送给您。
-				<br><span class="pull-right">信息类型太少？没有找到想要的？<a id="yjfk">去提意见</a></span>
-				<div class="clearfix"></div>
+	<div class="swordfish-left">
+		<div class="swordfish-page-title">
+			<i class="img-circle glyphicon jianyu"></i>订阅设置
+		</div>
+		<div class="swordfish-explain">
+			“剑鱼”是企明星的特色产品，它借助内置的互联网搜索引擎、大数据平台和自然语言分析系统，
+			为企业从互联网上自动抓取、分析、筛选并推送富有价值的信息情报，
+			比如本企业或其他企业的失信行为信息、受到行政处罚的信息、招标公告、中标公告等等。
+			您在输入了想要订阅的信息主题以后，网上一旦发布这些主题的信息，剑鱼就会第一时间将信息推送给您。
+			<br><span class="pull-right">信息类型太少？没有找到想要的？<a id="yjfk">去提意见</a></span>
+			<div class="clearfix"></div>
+		</div>
+		<div class="swordfish-panel" id="tender">
+			<div class="swordfish-panel-t">
+				<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
+				<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
+				招标公告
 			</div>
-			<div class="swordfish-panel" id="tender">
-				<div class="swordfish-panel-t">
-					<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
-					<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
-					招标公告
+			<div class="swordfish-panel-c">
+				<div>
+					<div class="swordfish-panel-c-t">
+						<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
+					</div>
+					<div class="swordfish-panel-c-c swordfish-keywords" id="tender-keywords">
+						<button class="btn" id="tender-addkeyword"><span>+</span>添加关键词</button>
+					</div>
 				</div>
-				<div class="swordfish-panel-c">
-					<div>
-						<div class="swordfish-panel-c-t">
-							<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
-						</div>
-						<div class="swordfish-panel-c-c swordfish-keywords" id="tender-keywords">
-							<button class="btn" id="tender-addkeyword"><span>+</span>添加关键词</button>
-						</div>
+				<div class="border-b-0">
+					<div class="swordfish-panel-c-t">
+						<span></span><div data-toggle="modal" data-target="#tender-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
 					</div>
-					<div class="border-b-0">
-						<div class="swordfish-panel-c-t">
-							<span></span><div data-toggle="modal" data-target="#tender-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
-						</div>
-						<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#tender-scope-dialog">
-						
-						</div>
+					<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#tender-scope-dialog">
+					
 					</div>
 				</div>
 			</div>
-			<div class="swordfish-panel" id="bid">
-				<div class="swordfish-panel-t">
-					<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
-					<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
-					中标公告
+		</div>
+		<div class="swordfish-panel" id="bid">
+			<div class="swordfish-panel-t">
+				<img class="swordfish-uncheck" src="/images/swordfish/checkbox.png">
+				<img class="swordfish-checked" src="/images/swordfish/checkbox-a.png">
+				中标公告
+			</div>
+			<div class="swordfish-panel-c">
+				<div>
+					<div class="swordfish-panel-c-t">
+						<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
+					</div>
+					<div class="swordfish-panel-c-c swordfish-keywords" id="bid-keywords">
+						<button class="btn swordfish-addkeyword" id="bid-addkeyword"><span>+</span>添加关键词</button>
+					</div>
 				</div>
-				<div class="swordfish-panel-c">
-					<div>
-						<div class="swordfish-panel-c-t">
-							<span></span><div>订阅关键词<span>最多订阅5组关键词</span></div>
-						</div>
-						<div class="swordfish-panel-c-c swordfish-keywords" id="bid-keywords">
-							<button class="btn swordfish-addkeyword" id="bid-addkeyword"><span>+</span>添加关键词</button>
-						</div>
+				<div class="border-b-0">
+					<div class="swordfish-panel-c-t">
+						<span></span><div data-toggle="modal" data-target="#bid-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
 					</div>
-					<div class="border-b-0">
-						<div class="swordfish-panel-c-t">
-							<span></span><div data-toggle="modal" data-target="#bid-scope-dialog">信息范围<i class="bootstrap-glyphicon glyphicon glyphicon-menu-down"></i></div>
-						</div>
-						<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#bid-scope-dialog">
-							
-						</div>
+					<div class="swordfish-panel-c-c swordfish-scope" data-toggle="modal" data-target="#bid-scope-dialog">
+						
 					</div>
 				</div>
 			</div>
-			<div class="swordfish-panel swordfish-intelligence">
-				<div class="swordfish-panel-t">
-					企业情报<span>竞争对手情报，公司大事件，行业风险预警等......</span>
-				</div>
-				<div class="swordfish-panel-c">开发中，敬请期待！</div>
+		</div>
+		<div class="swordfish-panel swordfish-intelligence">
+			<div class="swordfish-panel-t">
+				企业情报<span>竞争对手情报，公司大事件，行业风险预警等......</span>
 			</div>
+			<div class="swordfish-panel-c">开发中，敬请期待！</div>
 		</div>
 	</div>
-	<div class="swordfish-right col-xs-3 swordfish-qrcode text-center">
+	<div class="swordfish-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">
 		<br>关注微信公众号：企明星
 	</div>
@@ -353,7 +351,7 @@ function autoChecked(type,flag){
 function appendKeyWord(type,value){
 	this.getHtml = function(index,value){
 		return '<div class="swordfish-keyword">'
-					+'<b>关键词<font>'+index+'</font>：</b>'
+					+'<lable>关键词<font>'+index+'</font>：</lable>'
 					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100">'
 					+'<img src="/images/swordfish/delete.png">'
 				+'</div>';

core/src/web/templates/wxpush/index.html

@@ -5,10 +5,16 @@
 <script src="/js/jquery.js"></script>
 <script>
 $(function(){
-	$("body").html({{.T.data.s_content}});
 	var s_words = {{.T.data.s_words}};
 	var a_visitedindex = {{.T.data.a_visitedindex}};
+	var s_type = {{.T.data.s_type}};
 	var a_publishtime = {{.T.data.a_publishtime}};
+	$("body").html({{.T.data.s_content}});
+	if(typeof(s_words) != "undefined" && s_words.length > 0){
+		$("body>div:first").html('根据你设置的'+(s_type=="tender"?"招标公告":s_type=="bid"?"中标公告":"")+'关键词（<font class="keyword">'+s_words.join(" ; ").replace(/\+/gm," ")+'</font>）为你推送以下信息：');
+	}else{
+		$("body>div:first").remove();
+	}
 	$(".tslist").each(function(i){
 		$(this).children(".xh").text(function(i,v){
 			return v.replace(".","")
@@ -52,17 +58,15 @@ $(function(){
 					var leave2=leave1%(3600*1000);//计算小时数后剩余的毫秒数
 					var minutes=Math.floor(leave2/(60*1000));
 					//计算相差秒数
-					var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
-					var seconds=Math.round(leave3/1000);
-					var timeDiff = null;
+					/*var leave3=leave2%(60*1000);//计算分钟数后剩余的毫秒数
+					var seconds=Math.round(leave3/1000);*/
+					var timeDiff = "1分钟";
 					if(days > 0){
 						timeDiff = days+"天";
 					}else if(hours > 0){
 						timeDiff = hours+"小时";
 					}else if(minutes > 0){
 						timeDiff = minutes+"分钟";
-					}else{
-						timeDiff = seconds+"秒";
 					}
 					return '<div class="time-diff">'+timeDiff+'前</div>';
 				}
@@ -119,16 +123,15 @@ body{
 body>div:first-child{
 	background-color: #F8F8F8;
 	padding: 10px;
-	color: #999;
+	color: #a0a0a0;
 	font-size: 14px;
 }
 .xh{
 	color: #24C0D7;
-	padding-right: 10px;
-	display: table-cell;
+	position: absolute;
 }
 .tslist>div{
-	display: table-cell;
+	padding-left: 20px;
 }
 a{
 	text-decoration: none;
@@ -140,12 +143,13 @@ a{
 .tslist{
 	padding: 10px;
 	border-bottom: 1px solid #ddd;
+	position: relative;
 }
 .visited{
-	color: #999;
+	color: #a0a0a0;
 }
 .time-diff{
-	color: #999;
+	color: #a0a0a0;
 	font-size: 14px;
 	margin-top: 5px;
 }