样式修改

core/src/config.json

@@ -28,5 +28,5 @@
     "mailFailureTime": 3,
     "chatServer": "127.0.0.1:83",
     "chatRpc": "127.0.0.1:88",
-	"domainName":"test.qimingxing.info"
+	"domainName":"http://www.qimingxing.info"
 }

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

@@ -2052,6 +2052,183 @@ style="color:#D03102;margin-right:5px;"
 	border-color: #FF5A5F;
 	width: 82px;
 }
+/*********b版网站顶部***********/
+.logo{
+	width: 156px;
+	height: 55px;
+	margin-top: 5.5px;
+}
+.b-round-dot{
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	position: absolute;
+	display: block;
+	top: 0px;
+}
+.b-top{
+	height: 25px;
+	line-height: 25px;
+	padding-right: 50px;
+	background-color: #464645;
+	font-size: 12px;
+	font-family: "SimSun";
+}
+.b-top>div,.swordfish-content{
+	max-width: 1200px;
+	margin: auto;
+}
+.b-top li{
+	padding-left: 20px;
+}
+.b-top a{
+	color: #A0A0A0;
+}
+.b-top li>span{
+	margin-right: 5px;
+	background-color: #A0A0A0;
+	text-align: center;
+	padding: 3px 9px;
+	position: relative;
+}
+.b-top i{
+	position: absolute;
+	left: 0px;
+}
+.b-top i.fuwushichang{
+	left: 3px;
+	top: 3px;
+}
+.b-top i.qiyeshequ{
+	left: 4.5px;
+	top: 2px;
+}
+.b-top i.jianyu{
+	font-size: 16px;
+	left: 3px;
+	top: 1px;
+}
+.b-top i.weiguanwang1{
+	left: 4px;
+	top: 1px;
+	font-size: 14px
+}
+.b-top i.zhengcefagui{
+	left: 4.5px;
+	top: 2px;
+}
+.b-nav{
+	background-color: #FFFFFF;
+	border-top: 3px solid;
+}
+.b-nav>ul{
+	height: 66px;
+	line-height: 66px;
+	max-width: 1200px;
+	margin: auto;
+}
+.b-nav-logo{
+	padding-right: 40px;
+}
+.b-nav-link{
+	width: 120px;
+	text-align: center;
+}
+.b-nav-main a{
+	font-size: 18px;
+	color: #FFFFFF !important;
+	font-weight: bold;
+}
+.b-nav-s{
+	width: 1px;
+	height: 20px;
+	margin-top: 25px;
+	border-left: 1px solid #e5e6e9;
+	border-right: 1px solid #ffffff;
+	float: right;
+}
+.b-nav-other a:hover{
+	font-weight: bold;
+}
+.b-head .headimg{
+	width: 40px;
+	height: 40px;
+	margin-right: 5px;
+}
+.b-head .b-loginStatus{
+	padding: 0px 15px;
+	position: relative;
+}
+.b-head .b-loginStatus:hover{
+	background-color: #F7F9FB;
+}
+.b-head .b-loginStatus:hover>a{
+	color: inherit !important;
+}
+.b-head .b-loginStatus>span{
+	position: relative;
+	display: inline-block;
+}
+.b-head .b-loginStatus>span .b-round-dot{
+	right: 5px;
+	width: 8px;
+	height: 8px;
+}
+.b-head .b-loginStatus>a{
+	display: inline-block;
+	position: relative;
+}
+.b-head .head-hideMenu{
+	display: none;
+	position: absolute;
+	width: 120px;
+	left: 50%;
+	margin-left: -60px;
+}
+.b-head .head-hideMenu ul{
+	background-color: #F7F9FB;
+	box-shadow: 0 5px 10px rgba(0,0,0,.2);
+	margin-top: 1px;
+	float: left;
+}
+.b-head .head-hideMenu li{
+	width: 100%;
+	border-bottom: 1px solid #EDEEEF;
+	line-height: 40px;
+	padding-left: 20px;
+	cursor: pointer;
+}
+.b-head .head-hideMenu li .b-round-dot{
+	right: -6px;
+}
+.b-head .head-hideMenu li>span{
+	position: relative;
+}
+.b-head .head-hideMenu i{
+	margin-right: 5px;
+}
+.b-head .head-hideMenu i.youjian{
+	font-size: 12px;
+}
+.b-head .head-hideMenu i.ren1{
+	margin-left: 2px;
+}
+.b-head .head-hideMenu i.ren1,.b-head .head-hideMenu i.tuichu{
+	font-size: 16px;
+	margin-right: 15px !important;
+}
+.b-head .head-hideMenu li:hover{
+	color: #fff;
+}
+.b-head .head-hideMenu li:hover>i{
+	color: #fff;
+}
+.b-head .head-hideMenu li:hover .b-round-dot{
+	background-color: #FFFFFF;
+}
+.b-head a{
+	text-decoration: none;
+}
 /*认证完第一次登录 end*/
 /*分辨率小于1200的时候调整布局，算上滚动条1217*/
 @media (max-width: 1217px) {

core/src/web/staticres/css/index-new.css

@@ -1,19 +1,11 @@
 /****indexhead*****/
-.index-new-nva{
-	border-bottom:1px solid #ccc;
-    border-top: 5px solid #FF5A5F;
-    background-color: rgb(255, 255, 255);
-	margin-bottom:10px;
+.b-nav{
+    border-top-color: #FF5A5F;
 }
 .index-new-head .loginStatus li a:hover {
 	background-color: #FF5A5F;
 	color: #fff !important;
 }
-.a-com-active>a{
-	font-size:18px;
-	color:#fff;
-	font-weight:bold;
-}
 .a-com-active{
 	background-color:#FF5A5F;
 }
@@ -34,12 +26,6 @@
     padding-top: 5px;
     padding-right: 5px;
 }
-.index-new-top li:hover>a , .index-new-nva-c a:hover,#loginStatus a:hover{
-	color: #FF5A5F !important;
-}
-.a-com-active a:hover{
-	color: #ccc !important;
-}
 .index-new-top li:hover>i{
 	background-color: #FF5A5F !important;
 }
@@ -56,68 +42,21 @@
 .index-new-top a {
     color: rgb(160, 160, 160);
 }
-.index-new-head a {
-    text-decoration: none;
-}
 .index-new-top i.jianyu {
     padding-left: 2px;
 }
 .index-new-top i.zhengcefagui {
     padding-top: 5px;
 }
-.index-new-nva > ul {
-    height: 70px;
-    line-height: 70px;
-    max-width: 1200px;
-    margin: auto;
-}
-.index-new-nva-l {
-    padding-right: 20px;
-}
-.logo {
-    width: 161px;
-    height: 68px;
-}
-.index-new-nva-c {
-    width: 100px;
-    text-align: center;
-    font-size: 16px;
-}
 .index-new-head .loginstatus {
     padding-right: 15px;
 }
-.loginstatus > a {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 5px;
-}
 
 a:focus, a:hover{
-	color: #FF5A5F !important;
-}
-.setserver,#setdemand{
-    font-family: '宋体 Regular', '宋体';
-    font-size: 14px;
-}
-.index-new-nva-s {
-    width: 1px;
-    height: 20px;
-    margin-top: 25px;
-    border-right: 1px solid #999;
-    float: right;
-    margin-right: -2px;
-}
-.index-new-nva .fwsc{
-	width:120px;
-	margin-left:24px;
-	margin-right:20px;
+	color: #FF5A5F;
 }
 .index-new-nva .a-h-search{
     width: 25%;
-    padding-right: 15px;
 	float:right;
 	padding-top:18px;
 }
@@ -151,48 +90,14 @@ a:focus, a:hover{
 .index-new-nva #header-searchInput{
 	border-radius: 50px;
 }
-.index-new-head .loginStatus>span {
-    position: relative;
-    display: inline-block;
-}
-.index-new-head .head-hideMenu {
-    display: none;
-    position: absolute;
-    width: 120px;
-    left: 50%;
-    margin-left: -60px;
-}
-.index-new-head .head-hideMenu ul {
-    background-color: #F7F9FB;
-    box-shadow: 0 5px 10px rgba(0,0,0,.2);
-    margin-top: 1px;
-    float: left;
-}
 .index-new-head .head-hideMenu li:hover {
     background-color: #FF5A5F;
-    color: #fff;
-}
-.index-new-head .head-hideMenu li {
-    width: 100%;
-    border-bottom: 1px solid #EDEEEF;
-    line-height: 40px;
-    padding-left: 20px;
-    cursor: pointer;
-}
-.index-new-head .headimg {
-    width: 40px;
-    height: 40px;
-    margin-right: 5px;
 }
 .index-new-head .head-hideMenu li:hover>i {
     color: #fff;
 }
-.index-new-head .head-hideMenu i.youjian {
-    font-size: 12px;
-}
 .index-new-head .head-hideMenu i {
     color: #FF5A5F;
-    margin-right: 5px;
 }
 .index-new-head .head-hideMenu i.ren1, .index-new-head .head-hideMenu i.tuichu {
     font-size: 16px;
@@ -282,7 +187,6 @@ a:focus, a:hover{
 }
 .index-new-fbfw-a{
 	padding:10;
-    font-family: '宋体 Regular', '宋体';
     font-size: 14px;
     color: #666666;	
 }
@@ -347,7 +251,6 @@ a:focus, a:hover{
 	padding:20px 150px;
 }
 .a-index .index-new-wgw-remark a{
-    font-family: '微软雅黑 Regular', '微软雅黑';
     font-size: 14px;
     color: #FFFFFF;
 }
@@ -382,7 +285,6 @@ a:focus, a:hover{
 }
 .a-index  .index-new-xwzx-con .index-new-xwzx-title{
 	width:230px;
-    font-family: '微软雅黑 Bold', '微软雅黑';
     font-weight: 700;
     font-size: 16px;
 	padding-bottom:5px;
@@ -418,11 +320,9 @@ a:focus, a:hover{
 	color:#FF5A5F;
 	border-bottom:1px solid #ccc;
 	font-size:18px;
-    font-family: '宋体 Regular', '宋体';
 	padding-left:0px;
 }
 .a-index-head .index-new-left > ul > li {
-    font-family: '宋体 Regular', '宋体';
     font-size: 14px;
     color: #4E5051;	
 }
@@ -446,10 +346,6 @@ body {
 .a-index-head .a-i-h-right, .a-rmfw,.a-rmxq,.a-qysq,.a-xwzx,.index-new-wgw{
 	background-color:#fff;
 }
-.index-new-top,.index-new-nva{
-	max-width:1349px;
-	margin:auto;
-}
 .index-new-rmxq-list .a-com-ul-block .a-com-last{
 	padding-left:0px;
 }

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

@@ -2,203 +2,33 @@
 body{
 	background-color: #F0F0F0;
 }
-.logo{
-	width: 187px;
-	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 .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 .head-hideMenu ul{
-	background-color: #F7F9FB;
-	box-shadow: 0 5px 10px rgba(0,0,0,.2);
-	margin-top: 1px;
-	float: left;
-}
-.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{
+.b-round-dot{
 	background-color: #37C6DA;
-	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: 25px;
-	line-height: 25px;
-	padding-right: 50px;
-	background-color: #464645;
-	font-size: 12px;
-	font-family: "SimSun";
-}
-.swordfish-top>div,.swordfish-content{
-	max-width: 1200px;
-	margin: auto;
-}
-.swordfish-top li{
-	padding-left: 20px;
-}
-.swordfish-top li:hover>a{
-	color: #37C6DA !important;
-}
-.swordfish-top li:hover>i{
+/********剑鱼********/
+.b-head .b-top li:hover>i{
 	background-color: #37C6DA !important;
 }
-.swordfish-top a{
-	color: #A0A0A0;
-}
-.swordfish-top li>span{
-	margin-right: 5px;
-	background-color: #A0A0A0;
-	text-align: center;
-	padding: 3px 9px;
-	position: relative;
-}
-.swordfish-top i{
-	position: absolute;
-	left: 0px;
-}
-.swordfish-top i.fuwushichang{
-	left: 3px;
-	top: 3px;
-}
-.swordfish-top i.qiyeshequ{
-	left: 4.5px;
-	top: 2px;
-}
-.swordfish-top i.jianyu{
-	font-size: 16px;
-	left: 3px;
-	top: 1px;
-}
-.swordfish-top i.weiguanwang1{
-	left: 4px;
-	top: 1px;
-	font-size: 14px
-}
-.swordfish-top i.zhengcefagui{
-	left: 4.5px;
-	top: 2px;
-}
-.swordfish-i-a{
+.b-head .b-com-second{
 	background-color: #35C5DA !important;
 }
-.swordfish-nva{
-	border-top: 3px solid #37C6DA;
-	background-color: #FFFFFF;
-}
-.swordfish-nva>ul{
-	height: 66px;
-	line-height: 66px;
-	max-width: 1200px;
-	margin: auto;
+.b-nav{
+	border-top-color: #37C6DA;
 }
-.swordfish-nva-l{
-	padding-right: 40px;
-}
-.swordfish-nva-c{
-	width: 100px;
-	text-align: center;
-}
-.swordfish-nva-s{
-	width: 1px;
-	height: 20px;
-	margin-top: 25px;
-	border-left: 1px solid #e5e6e9;
-	border-right: 1px solid #ffffff;
-	float: right;
-}
-.swordfish-nva-main{
+.b-nav-main{
 	background-color: #37C6DA;
 }
-.swordfish-nva-main a{
-	font-size: 18px;
-	color: #FFFFFF !important;
-	font-weight: bold;
-}
-.swordfish-nva-rssset a:hover,.swordfish-nva-infolist a:hover,.swordfish-nva-active a{
-	font-weight: bold;
+.b-nav-other a:hover{
 	color: #37C6DA !important;
 }
-.swordfish-head .headimg{
-	width: 40px;
-	height: 40px;
-	margin-right: 5px;
+.b-head .head-hideMenu i{
+	color: #37C6DA;
+}
+.b-head .head-hideMenu li:hover{
+	background-color: #37C6DA;
 }
 .swordfish-content{
 	padding: 15px 0px 15px 0px;
@@ -314,7 +144,6 @@ a:focus, a:hover{
 }
 .swordfish-panel-c-t>div{
 	display: inline-block;
-	cursor: pointer;
 }
 .swordfish-panel-c-t>div>span{
 	font-family: "SimSun";

core/src/web/staticres/js/qfw.js

@@ -517,4 +517,70 @@ function afterAutheFirstLogin(result){
 	}
 	$("#fristAutheLoginModal .com-releaseService a").attr("href","/member/yellowpage/show/showService/"+entId);
 	$("#fristAutheLoginModal").modal('show');
+}
+//
+function b_loadTop(){
+	$.ajax({
+	  	type: "POST",
+	  	url: "/front/getWebSiteTop",
+	 	dataType: "json",
+		async: false,
+	  	success: function(result){
+			topLoadOver = true;
+			if(result.status == "y"){
+				isLogined = true;
+				var msgCount = result.msgCount;
+				var hasMsgCount = msgCount > 0;
+				msgCount = msgCount>999?'...':msgCount;
+				var avatar = null;
+				if(avatar != ""){
+					avatar = result.avatar;
+				}
+				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
+				if(hasMsgCount){
+					html += '<a class="b-round-dot"></a>';
+				}
+				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){
+					html += '<a class="b-round-dot"></a>';
+				}
+				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>';
+				$("#b-loginStatus").html(html)
+				.mouseover(function(){
+					$("#head-hideMenu").show();
+				}).mouseleave(function(){
+					$("#head-hideMenu").hide();
+				});
+				$("#head-hideMenu").mouseover(function(){
+					$(this).show();
+				}).mouseleave(function(){
+					$(this).hide();
+				});
+				//处理公用底部扫码登录按钮
+				$("#bottom-bar>li:first").addClass("invisible");
+				//处理认证完之后第一次登录弹出提示框
+				if(result.auditType == "y"){
+					afterAutheFirstLogin(result);
+				}
+			}else{
+				isLogined = false;
+				var html = '<a onclick="loginModalShow();">登录/注册</a>';
+				$("#b-loginStatus").html(html);
+				$("#bottom-bar>li").removeClass("invisible");
+				//登录
+				$("body").append('{{include "/common/login.html"}}');
+			}
+			try{
+				b_loadTopCallBack(result);
+			}catch(e){}
+		},
+		error: function(e){
+			topLoadOver = true;
+		}
+	});
 }

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

@@ -6,7 +6,6 @@
 <link href="/css/bootswatch.min.css" rel="stylesheet">
 <link href="/css/qfw.css" rel="stylesheet">
 <link href="/css/dev-qfw.css" rel="stylesheet">
-<link href="/css/index-new.css" rel="stylesheet">
 <link rel="stylesheet" href="/css/unicorn.main.css" />
 <link rel="stylesheet" href="/css/unicorn.grey.css" />
 <script src="/js/jquery.js"></script>

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

@@ -1,26 +1,16 @@
 <!---->
 <style>
 </style>
-<div class="index-new-head">
-	<div class="index-new-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"></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>
-			</ul>
-		</div>
-	</div>
-	<div class="index-new-nva">
+<div class="index-new-head b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav index-new-nva">
 		<ul>
-			<li class="index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			<li class="index-new-nva-c a-com-active fwsc"><a href="/front/swordfish">服务市场</a></li>
-			<li class="index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="index-new-nva-s"></a></li>
-			<li class="index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
+			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
+			<li class="b-nav-link b-nav-main index-new-nva-c a-com-active fwsc"><a href="/front/swordfish">服务市场</a></li>
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a class="setserver"  id="releaseService">发服务</a><a class="b-nav-s"></a></li>
+			<li class="b-nav-link b-nav-other index-new-nva-c"><a id="setdemand"  href="/market/demand/add.html">发需求</a></li>
 			
-			<li class="pull-right loginStatus" id="loginStatus"></li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 			<li class="a-h-search">
 					<div class="input-group">
 				        <div class="input-group-btn hide">
@@ -63,8 +53,8 @@ document.onkeydown=function(event){
     }
 };
 $(function (){
-	isMobile = !$("#loginStatus").is(":visible");
-	reLoadTop();
+	isMobile = !$("#b-loginStatus").is(":visible");
+	b_loadTop();
 	$("#searchFormBtn").click(function(){
 		keyCode = 13;
 		$("form#searchForm").submit();
@@ -113,88 +103,6 @@ $(function (){
 		}
 	});
 });
-function reLoadTop(){
-	$.ajax({
-	  	type: "POST",
-	  	url: "/front/getWebSiteTop",
-	 	dataType: "json",
-		async: false,
-	  	success: function(result){
-			topLoadOver = true;
-			if(result.status == "y"){
-				isLogined = true;
-				var msgCount = result.msgCount;
-				var hasMsgCount = msgCount > 0;
-				msgCount = msgCount>999?'...':msgCount;
-				var avatar = null;
-				if(avatar != ""){
-					avatar = result.avatar;
-				}
-				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
-				if(hasMsgCount){
-					html += '<a class="round-dot"></a>';
-				}
-				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){
-					html += '<a class="round-dot"></a>';
-				}
-				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>';
-				$("#loginStatus").html(html)
-				.mouseover(function(){
-					$("#head-hideMenu").show();
-				}).mouseleave(function(){
-					$("#head-hideMenu").hide();
-				});
-				$("#head-hideMenu").mouseover(function(){
-					$(this).show();
-				}).mouseleave(function(){
-					$(this).hide();
-				});
-				//立即体验
-				$("#experience").click(function(){
-					window.location.href = "/member/swordfish/rssset";
-				});
-				$("#goToRssset").click(function(){
-					window.location.href = "/member/swordfish/rssset";
-				});
-				$("#goToInfolist").click(function(){
-					window.location.href = "/member/swordfish/infolist";
-				});
-				//处理公用底部扫码登录按钮
-				$("#bottom-bar>li:first").addClass("invisible");
-				//处理认证完之后第一次登录弹出提示框
-				if(result.auditType == "y"){
-					afterAutheFirstLogin(result);
-				}
-			}else{
-				isLogined = false;
-				var html = '<a onclick="loginModalShow();">登录/注册</a>';
-				$("#loginStatus").html(html);
-				//立即体验
-				$("#experience").click(function(){
-					loginModalShow();
-				});
-				$("#goToRssset").click(function(){
-					loginModalShow(10);
-				});
-				$("#goToInfolist").click(function(){
-					loginModalShow(11);
-				});
-				$("#bottom-bar>li").removeClass("invisible");
-				//登录
-				$("body").append('{{include "/common/login.html"}}');
-			}
-		},
-		error: function(e){
-			topLoadOver = true;
-		}
-	});
-}
 function setNavbarActive(index,type){
 	var searchBtnText = null;
 	var action = null;
@@ -290,7 +198,4 @@ function setNavbarActive(index,type){
 	$("#head-navbar-ul li:first").removeClass("a-com-active");
 	$("#head-navbar-ul li:eq("+index+")").addClass("a-com-active");
 }
-$(function(){
-	reLoadTop();
-});
 </script>

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

@@ -1,23 +1,13 @@
 <link href="/css/swordfish.css" rel="stylesheet">
-<div class="swordfish-head">
-	<div class="swordfish-top">
-		<div>
-			<ul class="pull-right">
-				<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">
+<div class="b-head">
+	{{include "/common/top.html"}}
+	<div class="b-nav">
 		<ul>
-			<li class="swordfish-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></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>
+			<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/swordfish">剑鱼</a></li>
+			<li class="b-nav-link b-nav-other"><a id="goToRssset">订阅设置</a><a class="b-nav-s"></a></li>
+			<li class="b-nav-link b-nav-other"><a id="goToInfolist">推送记录</a></li>
+			<li class="pull-right b-loginStatus" id="b-loginStatus"></li>
 		</ul>
 	</div>
 </div>
@@ -28,87 +18,30 @@ function open_window(link){
 	}
 	window.open("/visit/redirect?url="+escape(link));
 }
-function reLoadTop(){
-	$.ajax({
-	  	type: "POST",
-	  	url: "/front/getWebSiteTop",
-	 	dataType: "json",
-		async: false,
-	  	success: function(result){
-			topLoadOver = true;
-			if(result.status == "y"){
-				isLogined = true;
-				var msgCount = result.msgCount;
-				var hasMsgCount = msgCount > 0;
-				msgCount = msgCount>999?'...':msgCount;
-				var avatar = null;
-				if(avatar != ""){
-					avatar = result.avatar;
-				}
-				var html = '<span><img class="img-circle headimg" src="'+avatar+'" onerror="this.src=\'/images/swordfish/headimg.png\'">';
-				if(hasMsgCount){
-					html += '<a class="round-dot"></a>';
-				}
-				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){
-					html += '<a class="round-dot"></a>';
-				}
-				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();
-				});
-				$("#head-hideMenu").mouseover(function(){
-					$(this).show();
-				}).mouseleave(function(){
-					$(this).hide();
-				});
-				//立即体验
-				$("#experience").click(function(){
-					window.location.href = "/member/swordfish/rssset";
-				});
-				$("#goToRssset").click(function(){
-					window.location.href = "/member/swordfish/rssset";
-				});
-				$("#goToInfolist").click(function(){
-					window.location.href = "/member/swordfish/infolist";
-				});
-				//处理公用底部扫码登录按钮
-				$("#bottom-bar>li:first").addClass("invisible");
-				//处理认证完之后第一次登录弹出提示框
-				if(result.auditType == "y"){
-					afterAutheFirstLogin(result);
-				}
-			}else{
-				isLogined = false;
-				var html = '<a onclick="loginModalShow();">登录/注册</a>';
-				$("#swordfish-loginStatus").html(html);
-				//立即体验
-				$("#experience").click(function(){
-					loginModalShow();
-				});
-				$("#goToRssset").click(function(){
-					loginModalShow(10);
-				});
-				$("#goToInfolist").click(function(){
-					loginModalShow(11);
-				});
-				$("#bottom-bar>li").removeClass("invisible");
-				//登录
-				$("body").append('{{include "/common/login.html"}}');
-			}
-		},
-		error: function(e){
-			topLoadOver = true;
-		}
-	});
+function b_loadTopCallBack(result){
+	if(isLogined){
+		//立即体验
+		$("#experience").click(function(){
+			window.location.href = "/member/swordfish/rssset";
+		});
+		$("#goToRssset").click(function(){
+			window.location.href = "/member/swordfish/rssset";
+		});
+		$("#goToInfolist").click(function(){
+			window.location.href = "/member/swordfish/infolist";
+		});
+	}else{
+		//立即体验
+		$("#experience").click(function(){
+			loginModalShow();
+		});
+		$("#goToRssset").click(function(){
+			loginModalShow(10);
+		});
+		$("#goToInfolist").click(function(){
+			loginModalShow(11);
+		});
+	}
 }
 function swordfishLayoutInit(){
 	if(document.body.scrollHeight <= document.body.clientHeight){
@@ -117,6 +50,6 @@ function swordfishLayoutInit(){
 	}
 }
 $(function(){
-	reLoadTop();
+	b_loadTop();
 });
 </script>

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

@@ -0,0 +1,11 @@
+<div class="b-top">
+	<div>
+		<ul class="pull-right">
+			<li><span class="img-circle b-com-first"><i class="glyphicon fuwushichang"></i></span><a href="/market/0/list.html">服务市场</a></li>
+			<li><span class="img-circle b-com-second"><i class="glyphicon jianyu"></i></span><a href="/front/swordfish">剑鱼</a></li>
+			<li><span class="img-circle b-com-third"><i class="glyphicon qiyeshequ"></i></span><a href="/search/enterprise/ent.html">企业社区</a></li>
+			<li><span class="img-circle b-com-four"><i class="glyphicon weiguanwang1"></i></span><a href="/front/wsite.html">微官网</a></li>
+			<li><span class="img-circle b-com-five"><i class="glyphicon zhengcefagui"></i></span><a href="/front/content_zcfg_list.html">政策法规</a></li>
+		</ul>
+	</div>
+</div>

core/src/web/templates/index.html

@@ -3,6 +3,7 @@
 <title>{{Msg "seo" "qfw.homepage.title"}}</title>
 <meta name="msvalidate.01" content="D5F3ADC7EB4E65FFB8BF943AD56DD1F7" />
 {{include "/common/inc.html"}}
+<link href="/css/index-new.css" rel="stylesheet">
 <meta name="Keywords" content="{{Msg "seo" "qfw.homepage.key"}}"/>
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 

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

@@ -7,7 +7,7 @@
 <script type="text/javascript">
 	var lasttime=1,s_words,a_visitedindex,a_publishtime,le,f_id,a_interest;
 $(function(){
-	$(".swordfish-nva>ul>li:eq(3)").addClass("swordfish-nva-active");
+	$(".swordfish-nav>ul>li:eq(3)").addClass("swordfish-nav-active");
 	//
 	$.ajax({    
 		type:'post',        

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

@@ -36,7 +36,7 @@
 					</div>
 				</div>
 				<div class="border-b-0">
-					<div class="swordfish-panel-c-t">
+					<div class="swordfish-panel-c-t cursor-pointer">
 						<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">
@@ -61,7 +61,7 @@
 					</div>
 				</div>
 				<div class="border-b-0">
-					<div class="swordfish-panel-c-t">
+					<div class="swordfish-panel-c-t cursor-pointer">
 						<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">
@@ -272,7 +272,7 @@ $(function(){
 			selectKeyword("bid",msgset.bid.a_key);
 		}
 	}
-	$(".swordfish-nva>ul>li:eq(2)").addClass("swordfish-nva-active");
+	$(".swordfish-nav>ul>li:eq(2)").addClass("swordfish-nav-active");
 	$("#yjfk").click(function(){
 		$("body").append('<form id="feedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
 		$("#feedbackForm").submit();

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

@@ -41,6 +41,7 @@
 {{include "/swordfish/wxtoolbar.html"}}
 <script type="text/javascript">
 $(function(){
+	$(".bottom-toolbar,.feedback-dialog").remove();
 	var currentIndex = 0;
 	var mySwiper = new Swiper('.swiper-container', {
         pagination: '.swiper-pagination',

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

@@ -54,7 +54,7 @@ $(function(){
 		feedback.show();
 		$("#feedback-textarea").focus().parent().removeClass("red-border");
 	});
-	$("#goToShare").click(function(){
+	$("[id='goToShare']").click(function(){
 		$(".share-dialog").show();
 		$("html,body").addClass("overflow-hidden");
 	});