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

core/src/qfw/swordfish/swordfishmanage.go

@@ -75,6 +75,8 @@ func (s *SwordFish) RssSet() error {
 	list := getNewest()
 	s.T["list"] = list
 	s.T["msgset"] = msgset
+	s.T["searchtype"] = s.GetString("searchtype")
+	s.T["searchvalue"] = s.GetString("searchvalue")
 	return s.Render("/swordfish/rssset.html", &s.T)
 }
 

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

@@ -2884,4 +2884,18 @@ style="color:#D03102;margin-right:5px;"
 }
 /*图标*/
 .jhtb{color:#FF5A5F; font-size:18px;top:4px;}
-.jhtbtype{color:#FF5A5F; font-size:18px; top:7px;}
+.jhtbtype{color:#FF5A5F; font-size:18px; top:7px;}
+
+.notetips{
+	z-index: 99999;
+	display:none;
+	top: 100px;
+	position: fixed;
+	border: 1px solid #ccc;
+	margin-left: 36%;
+	width: 230px;
+	height: 75px;
+	line-height: 75px;
+	text-align: center;
+	background: #FFF;
+}

core/src/web/staticres/wxswordfish/main.js

@@ -118,7 +118,7 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 	var getHtml = function(index,value){
 		return '<div class="keyWordGroup">'
 					+'<lable style="white-space:nowrap;">关键词<font>'+index+'</font></lable>'
-					+'<div><input type="text" onfocus="setFocus(this)" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100"></div>'
+					+'<div><input type="text" onfocus="setFocus(this)" value="'+(value?value:"")+'" placeholder="示例：税务局 软件" maxlength="100"></div>'
 					+'<div>'+(index==1?'':'<img src="/wxswordfish/images/delete.png" class="delete">')+'</div>'
 				+'</div>';
 	}
@@ -499,26 +499,33 @@ $(function(){
 	$("body").append($("#tender-keyword").clone().removeAttr("id").attr("id","bid-keyword"))
 			.append($("#tender-scope").clone().removeAttr("id").attr("id","bid-scope"));
 	var searchnameIsExsit = false;
-	if (typeof(searchname) != "undefined" && searchname.length > 0 ){
-		if(typeof(msgset[s_type]) != "undefined"){
-			var keywordes = msgset[s_type].a_key;
-			if(typeof(keywordes) != "undefined" && keywordes.length > 0){
-				for(var i=0;i<keywordes.length;i++){
-					var keywordesArr = keywordes[i].split("+");
-					for(var k=0;k<keywordesArr.length;k++){
-						if(keywordesArr[k] == searchname){
-							searchnameIsExsit = true;
+	if(msgset == ""){
+		if(typeof(searchname) != "undefined" && searchname.length > 0 ){
+			msgset = {};
+			msgset[s_type] = {"a_key":[searchname],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchname) != "undefined" && searchname.length > 0 ){
+			if(typeof(msgset[s_type]) != "undefined"){
+				var keywordes = msgset[s_type].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchname){
+								searchnameIsExsit = true;
+							}
 						}
 					}
-				}
-				if(!searchnameIsExsit){
-					keywordes.push(searchname);
+					if(!searchnameIsExsit){
+						keywordes.push(searchname);
+					}
+				}else{
+					msgset[s_type]["a_key"] = [searchname];
 				}
 			}else{
-				msgset[s_type]["a_key"] = [searchname];
+				msgset[s_type] = {"a_key":[searchname]};
 			}
-		}else{
-			msgset[s_type] = {"a_key":[searchname]};
 		}
 	}
 	if(typeof(msgset.tender) != "undefined"){

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

@@ -69,6 +69,7 @@ img{
 	border-bottom: 1px solid #CCCCCC;
 	position: relative;
 	font-size: 16px;
+	padding-left: 5px;
 }
 .parent-node-view{
 	width: 100%;
@@ -122,14 +123,15 @@ img{
 	display: none;
 }
 .operation .child-node li{
-	border-bottom: 1px solid #ccc;
+	border-bottom: 1px solid #ddd;
 	padding: 15px 0px;
 }
 
 .operation .child-node img{
-	width: 10px;
-	height: 17px;
+	width: 8px;
+	height: 15px;
 	float: right;
+	margin-right: 15px;
 }
 .operation .child-node li>div:first-child{
 	
@@ -508,12 +510,13 @@ img{
 	width: 100%;
 	border-top: 1px solid #CCCCCC;
 	background-color: #F8F8F8;
+	z-index: 1;
 }
 .bottom-toolbar>li{
 	display: table-cell;
 	width: 33%;
-	height: 40px;
-	line-height: 40px;
+	height: 45px;
+	line-height: 45px;
 	text-align: center;
 }
 .bottom-toolbar>li:first-child img{
@@ -544,6 +547,7 @@ img{
 	padding:5px;
 	background-color:#FAF5DF;
 	border:1px solid #F5DC9A;
+	opacity: 0.8;
 }
 .tip-button{
 	float: right;
@@ -551,15 +555,18 @@ img{
 	margin-top:5px;
 }
 .tip-button span{
-	border-radius:4px;
+	border-radius:2px;
 	display:inline-block;
-	padding:4px 20px;
+	padding:5px 35px;
 	margin-right:10px;
-	border:1px solid #689AFF;
+	border:1px solid #24C0D7;
 	cursor:pointer;
+	color: #24C0D7;
+	background-color: #ffffff;
 }
 .tip-button span:nth-child(2){
 	background-color:#24C0D7;
+	color: #ffffff;
 }
 .visible{
 	display:none;
@@ -641,11 +648,13 @@ img{
 	bottom: 65px;
 	left: 50%;
 	margin-left: -45px;
-	z-index: 1;
 	display: none;
 }
 .popover-ul li{
 	line-height: 38px;
+	padding-left: 10px;
+	width: 100%;
+	text-align: left;
 }
 .toolbar-popover .popover-arrow{
 	bottom: -11px;
@@ -673,7 +682,15 @@ img{
 	background-color: #EAEAEA;
 }
 .popover-ul >li:nth-child(2){
-	width: 85%;
 	border-top:1px solid #e5e6e9;
 	border-bottom:1px solid #e5e6e9;
+}
+.toolbar-popover-mask{
+	background-color: transparent;
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	top: 0px;
+	bottom: 0px;
+	display: none;
 }

core/src/web/templates/index.html

@@ -18,39 +18,6 @@ $(function(){
 </script>
 </head>
 <body>
-
-<!--手机版首页 start-->
-<div class="index-new-head b-head visible-xs">
-	
-	<div class="b-nav index-new-nva text-center" style="height:69px;">
-		<a href="/"><img src="/images/logo.png" class="logo"></a>
-	</div>
-</div>
-{{$s:=(Ad "index-center-mob" 1)}}
-	{{range $k,$v := $s}}
-<div class="text-center visible-xs" style="margin-top:10px;">
-	<div class="index-mob-wzjs" >
-	<div class="index-mobwz-title" >
-	<div class="indexmob-tleft" ></div>
-	<div class="indexmob-tright" >网站介绍</div>
-	<div style="clear:both;"></div>
-	</div>
-	<div class="indexmob-cont" >
-	{{if $v.s_remark}}{{$v.s_remark}} {{end}}
-	</div>
-	</div>
-	<div class="indexmob-sjty" >
-	<div class="index-mobwz-title" >
-	<div class="indexmob-tleft" ></div>
-	<div class="indexmob-tright" >手机体验</div>
-	<div style="clear:both;"></div>
-	</div>
-	<div class="indexmob-cont" ><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
-	<div  class="indexmob-cont" style="width:100%;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
-	</div>
-</div>
-	{{end}}
-<!--手机版首页 end-->
 {{include "/common/indexhead.html"}}
 <div class="a-content a-index hidden-xs">	
 	<div class="a-index-head index-new-head">

core/src/web/templates/member/incmobile/baseinfo.html

@@ -6,28 +6,28 @@
 	<ul>
 		<li>
 			<div class="col-xs-5">
-					<img src="/images/entcommunity/zhucehao.png"   width=23 />
+					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhucehao.png"   width=23 />
 					<span class="ent {{if not .T.res.RegNo}}entnull{{end}}">注册号</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.RegNo}}{{.T.res.RegNo}}{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/hangye.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/hangye.png"  width=23 />
 				<span class="ent {{if not .T.res.IndustryPhyName}}entnull{{end}}">行业</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.IndustryPhyName}}{{.T.res.IndustryPhyName}}{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/chenglirizi.png"  width=23/>
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/chenglirizi.png"  width=23/>
 				<span class="ent {{if not .T.res.EstDate}}entnull{{end}}">成立日期</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.EstDate}}{{.T.res.EstDate}}{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/shijian.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/shijian.png"  width=23 />
 				<span class="ent {{if and (not .T.res.OpFrom) (not .T.res.OpTo)}} entnull{{end}}">营业期限</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.OpFrom}}{{.T.res.OpFrom}}{{end}}{{if .T.res.OpTo}}&nbsp;-&nbsp;{{.T.res.OpTo}}{{else}}&nbsp;-&nbsp;长期{{end}}</span>
@@ -36,7 +36,7 @@
 		{{if and .T.res.RegCap .T.res.EntType}}
 			{{if and (ne .T.res.EntType "9600") (ne .T.res.EntType "5810") (ne .T.res.EntType "4540") (ne .T.res.EntType "4533")}}
 				<div class="col-xs-5">
-					<img src="/images/entcommunity/zhuceziben.png"  width=23 />
+					<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
 					<span class="ent">注册资本</span>
 				</div>
 				<span class="col-xs-7 entvar">
@@ -44,7 +44,7 @@
 				</span>
 				{{else}}
 					<div class="col-xs-5">
-						<img src="/images/entcommunity/zhuceziben.png"  width=23 />
+						<img src="{{Msg "seo" "cdn"}}/images/entcommunity/zhuceziben.png"  width=23 />
 						<span class="ent entnull">注册资本</span>
 					</div>
 					<span class="col-xs-7 entvar">
@@ -64,21 +64,21 @@
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/dizhi.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/dizhi.png"  width=23 />
 				<span class="ent {{if not .T.res.Dom}}entnull{{end}}">地址</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.Dom}}{{.T.res.Dom}}{{else}}空{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/gongsileixing.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/gongsileixing.png"  width=23 />
 				<span class="ent {{if not .T.res.EntTypeName}} entnull{{end}}">企业类型</span>
 			</div>
 			<span class="col-xs-7 entvar">{{if .T.res.EntTypeName}}{{.T.res.EntTypeName}}{{else}}空{{end}}</span>
 		</li>
 		<li>
 			<div class="col-xs-5">
-				<img src="/images/entcommunity/dengjijiguan.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/dengjijiguan.png"  width=23 />
 				<span class="ent {{if not .T.res.RegOrgName}}entnull{{end}}">登记机关</span>
 			</div>
 			<span class="col-xs-7 entvar ">{{if .T.res.RegOrgName}}{{.T.res.RegOrgName}}{{else}}空{{end}}</span>
@@ -92,7 +92,7 @@
 		</li>-->
 		<li>
 			<div class="col-xs-6" style="max-width:145px;">
-				<img src="/images/entcommunity/ren.png"  width=23 />
+				<img src="{{Msg "seo" "cdn"}}/images/entcommunity/ren.png"  width=23 />
 				<span class="ent {{if not .T.res.LeRep}} entnull {{end}}">法定代表人</span>
 			</div>
 			<div class="col-xs-6">

core/src/web/templates/member/incmobile/detailindex.html

@@ -4,10 +4,10 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet" />
-	<link href="/css/qfw.css" rel="stylesheet" />
-	<link href="/css/entcommunity.css" rel="stylesheet" />
- 	<link href="/css/mobile/incmobile.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/qfw.css" rel="stylesheet" />
+	<link href="{{Msg "seo" "cdn"}}/css/entcommunity.css" rel="stylesheet" />
+ 	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet" />
 	<style>
 		body{
 			background:#FFF;
@@ -185,9 +185,9 @@
 	</div>
 <body>
 
-<script src="/js/fastclick.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/entcommunity.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/fastclick.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/entcommunity.js"></script>
 <script>
 	$(function(){		   
 			resize();

core/src/web/templates/member/incmobile/index.html

@@ -5,8 +5,8 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 		<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="yes" />
-		<link href="/css/bootstrap.min.css" rel="stylesheet">
-		<link href="/css/mobile/incmobile.css" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+		<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 		<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script>
 var signature = {{.T.signature}};
@@ -75,11 +75,11 @@ if(typeof(signature) != "undefined" && signature != null && signature.length ==
 		</div>
 		<footer class="footer">
 	      <div class="container">
-						<img src="/images/mobile/mobilebottom.png" width=110 />	
+						<img src="{{Msg "seo" "cdn"}}/images/mobile/mobilebottom.png" width=110 />	
 	      </div>
 		</footer>
-<script src="/js/jquery.js"></script>
-<script src="/js/qfw.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+<script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
 <script>
 $("#camera").click(function(){
 	wx.chooseImage({

core/src/web/templates/member/incmobile/list.html

@@ -5,8 +5,8 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
 	<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
-	<link href="/css/bootstrap.min.css" rel="stylesheet">
- 	<link href="/css/mobile/incmobile.css" rel="stylesheet">
+	<link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
+ 	<link href="{{Msg "seo" "cdn"}}/css/mobile/incmobile.css" rel="stylesheet">
 	<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
  </head>
  <body>
@@ -62,7 +62,7 @@
 		<ul class="inclist">
 				
 		</ul>
-	<div class="text-center hides" style="margin:20% auto;" id="finderror"><img src="//cdn.qmx.top:9000/images/findnull.png" width=150 style="margin-left:18px;">
+	<div class="text-center hides" style="margin:20% auto;" id="finderror"><img src="{{Msg "seo" "cdn"}}/images/findnull.png" width=150 style="margin-left:18px;">
 		<h6 id="case1" style="display:none;"><strong class="text-muted">没有找到相关内容，换个关键词试试</strong></h6>
 		<h6 id="case2" style="display:none;margin-top: -12px;"><strong class="text-muted">
 		
@@ -72,12 +72,12 @@
 	<center style="clear:both;"><a class="loadmore btn btn-link hides"  onclick="loadData();">加载更多</a></center>
 	<center class="nomore hides"><div style="margin:20px;">没有搜索到？尝试更精确的搜索条件!</div></center>
 	</div>
-	<script src="/js/jquery.js"></script>
-	<script src="/js/qfw.js"></script>
-	<script src="/js/fastclick.js"></script>
-	<script src="/js/bootstrap.min.js"></script>
-	<script src="/js/jquery.cxselect.js"></script>
-	<script src="/js/entcommunity.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/jquery.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/qfw.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/fastclick.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/jquery.cxselect.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/js/entcommunity.js"></script>
 	<script>
 		$(function(){
 			mCommunity().initIndex();

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

@@ -140,6 +140,9 @@
 		</div>
 	</div>
 </div>
+<div class="notetips">
+	<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>预约服务成功
+</div>
 <script type="text/javascript">
 //未注册用户提交
 function appointment(){		
@@ -175,9 +178,11 @@ $(document).ready(function(){
 			    $('#appointmentModal').modal('hide');
 				alert("您不能预约自己公司发布的服务！");
 		  	}else if(status == "y"){
-			    $('#appointmentModal').modal('hide');
-				alert("预约成功！");
-		        window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	
+				$(".notetips").show();
+				$('#appointmentModal').modal('hide');
+				setTimeout(function(){
+					window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	
+				},2000)
 		  	}else{
 				alert("预约失败！"); 
 		        window.location.href = "/market/detail/{{.T.sinfo._id}}.html";	

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

@@ -79,6 +79,9 @@
 		</div>
 	</div>
 </div>
+<div class="notetips">
+	<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>竞标成功
+</div>
 <script src="/js/validform-min.js"></script>
 <script type="text/javascript">
 function reLoadCaptcha(){
@@ -116,12 +119,14 @@ $(function(){
 			}
 			var msg = null;
 			if(flag == "y"){
-				msg = "投标成功！";
+				$(".notetips").show();
 			}else{
 				msg = "投标失败！";
+				alert(msg);
 			}
-			alert(msg);
-			window.location.href = window.location.href;
+			 setTimeout(function(){
+					window.location.href = window.location.href;
+				},2000)
 		}
 	},"m-tbform");
 });

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

@@ -194,6 +194,9 @@
 		</div>
 	</div>
 </div>
+	<div class="notetips">
+		<img src="{{Msg "seo" "cdn"}}/images/u28.png"/>发布成功
+	</div>
 	{{include "/common/bottom.html"}}
 	<!-- inner Js-->
 <script>
@@ -259,8 +262,11 @@ $(function(){
 			isPic=1;
 			var status=data.responseText;
 			if(status.indexOf("y,")>-1){
-				alert("发布成功");
-				window.location.href="/market/demandview/"+status.split(",")[1]+".html";
+				$(".notetips").show();
+				setTimeout(function(){
+							window.location.href="/market/demandview/"+status.split(",")[1]+".html";
+				},2000)
+				
 			}else if(status.indexOf("ident,")>-1){
 				$("#myModal").modal();
 			  setTimeout(function(){

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

@@ -302,6 +302,15 @@
 <!-- 底部 -->
 {{include "/common/bottom.html"}}
 <script type="text/javascript">
+var searchtype = {{.T.searchtype}};
+if(searchtype == "1"){
+	searchtype = "tender";
+}else if(searchtype == "2"){
+	searchtype = "bid";
+}else{
+	searchtype = "";
+}
+var searchvalue = {{.T.searchvalue}};
 //Array.prototype.indexOf = function (val) {for (var i = 0; i < this.length; i++) {if (this[i] == val) {return i;}} return -1;};  
 //Array.prototype.removevalue = function (val){var index=this.indexOf(val);if(index > -1){this.splice(index, 1);}}; 
 var oprarr = new Array();
@@ -337,6 +346,36 @@ $(function(){
 		}
 	}
 	var msgset = {{.T.msgset}};
+	var searchvalueIsExsit = false;
+	if(msgset == ""){
+		if(typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			msgset = {};
+			msgset[searchtype] = {"a_key":[searchvalue],"s_scope":"A"};
+		}
+	}else{
+		if (typeof(searchvalue) != "undefined" && searchvalue.length > 0 ){
+			if(typeof(msgset[searchtype]) != "undefined"){
+				var keywordes = msgset[searchtype].a_key;
+				if(typeof(keywordes) != "undefined" && keywordes.length > 0){
+					for(var i=0;i<keywordes.length;i++){
+						var keywordesArr = keywordes[i].split("+");
+						for(var k=0;k<keywordesArr.length;k++){
+							if(keywordesArr[k] == searchvalue){
+								searchvalueIsExsit = true;
+							}
+						}
+					}
+					if(!searchvalueIsExsit){
+						keywordes.push(searchvalue);
+					}
+				}else{
+					msgset[searchtype]["a_key"] = [searchvalue];
+				}
+			}else{
+				msgset[searchtype] = {"a_key":[searchvalue]};
+			}
+		}
+	}
 	if(msgset != ""){
 		if(typeof(msgset.tender) != "undefined"){
 			selectScope("tender",msgset.tender.s_scope);
@@ -418,6 +457,16 @@ $(function(){
 		$(this).hide();
 		ajaxReq();
 	});
+	//直接订阅带过来的关键字不存在
+	
+	if(typeof(searchvalue) != "undefined" && searchvalue.length > 0){
+		//自动打开
+		if($("#"+searchtype+" .swordfish-checked").is(":hidden")){
+			$("#"+searchtype+" .swordfish-uncheck").click();
+		}else if(!searchvalueIsExsit){//修改关键词
+			ajaxReq();
+		}
+	}
 	//针对页面异常关闭
 	if(typeof(msgset.tender) != "undefined"&&typeof(msgset.tender.i_switchstatus) != "undefined"&&msgset.tender.i_switchstatus==1){
 		if(tender_i_status==0){
@@ -482,13 +531,13 @@ function appendKeyWord(type,value,isFocus){
 	this.getHtml = function(index,value){
 		var html='<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>：</lable>'
-					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100">'
+					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：税务局 软件" maxlength="100">'
 					+'<img src="{{Msg "seo" "cdn"}}/images/swordfish/delete.png">'
 				+'</div>';
 		if (index==1){
 			html='<div class="swordfish-keyword">'
 					+'<lable>关键词<font>'+index+'</font>：</lable>'
-					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：综合布线 电话线 网线" maxlength="100">'
+					+'<input type="text" class="form-control" value="'+(value?value:"")+'" placeholder="示例：税务局 软件" maxlength="100">'
 				+'</div>';
 		}
 		return html;
@@ -616,7 +665,7 @@ function swordfishpay(oprtype){
 			alert("请稍后再试"+st)
 		}
 	})
-	window.location.reload()
+	window.location.href="/member/swordfish/rssset";
 }
 //弹窗关闭，取消
 $('#tishiModal').on('hidden.bs.modal', function () {

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

@@ -282,7 +282,7 @@ $(function(){
 		<form action="/member/swordfish/searchinfolist" name="searchsword" method="post">
 		<div class="form-group">
 		<div class="col-sm-7">
-        <input class="form-control" id="searchname" name="searchname" value="{{.T.keywords}}" style="background-color:#FFFFFF; border:1px solid #e5e6e9;" placeholder="输入关键词查询"/>
+        <input class="form-control" id="searchname" name="searchname" value="{{.T.keywords}}" style="background-color:#FFFFFF; border:1px solid #e5e6e9;" placeholder="示例：税务局 软件"/>
 	    </div>
 		<div class="col-sm-2">
 		<input name="s_type" id="sea_type" value="1" style="display:none;"/>
@@ -309,10 +309,14 @@ $(function(){
 				</div>
 			</div>
 		</div>
+		<form action="/member/swordfish/rssset" method="post" id="goToRsssetForm">
+		<input type="hidden" name="searchtype" value="{{.T.s_type}}"/>
+		<input type="hidden" name="searchvalue" value="{{.T.keywords}}"/>
 		<div id="searchts" class="text-center hidden">
-		<div class="dybtn"  onClick="window.location.href='/member/swordfish/rssset';">订阅</div>
+		<div class="dybtn" onclick="document.getElementById('goToRsssetForm').submit()">订阅</div>
 		<div>确认该关键词查询结果无误</div>
-		</div>	
+		</div>
+		</form>	
 	</div>
 	<div class="b-right swordfish-qrcode text-center">
 		<img src="/images/swordfish/qrcode.png">

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

@@ -29,7 +29,7 @@ body{
 	height:45px;
 	width:100%;
     border-radius: 10px;
-	padding:2px 10px 2px 60px;
+	padding:2px 10px 2px 42px;
 	font-size:16px;
 	position:relative;
 }
@@ -40,10 +40,10 @@ body{
 .tubiao img{
     position: absolute;
     z-index: 10;
-    margin-top: 12px;
+    margin-top: 15px;
     color: #000;
-	margin-left:20px;
-	height:25px;
+	margin-left:15px;
+	height:18px;
 }
 .xiaochu{
 	float:right;
@@ -51,9 +51,9 @@ body{
 .xiaochu img{
     position: absolute;
     z-index: 10;
-    top: 20px;
+    top: 22px;
 	right: 30px;
-	height:25px;
+	height:20px;
 }
 .searchzhao1,.searchzhong1{
 	margin-top: 10px;
@@ -124,7 +124,7 @@ body{
 </head>
 <body>
 
-<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="" placeholder="输入关键词查询"/>
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="" placeholder="示例：税务局 软件"/>
 <span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 </div>
 <div class="kongbai"></div>
@@ -208,17 +208,21 @@ body{
 </div>
 {{include "/swordfish/wxtoolbar.html"}}
 <script type="text/javascript">
-	$(".searchname").keyup(function(){
-        var restr = $(".searchname").val();
-		if (restr.length > 0){
-			$(".kongbai").addClass("hidden");
-			$(".searchshow").removeClass("hidden");
-		}else{
-			$(".searchshow").addClass("hidden");
-			$(".kongbai").removeClass("hidden");
-		}
-		$(".searchzhao3 span").html(restr);
-		$(".searchzhong3 span").html(restr);
+	var appendHtml = function(){
+		var restr = $(".searchname").val();
+			if (restr.length > 0){
+				$(".kongbai").addClass("hidden");
+				$(".searchshow").removeClass("hidden");
+			}else{
+				$(".searchshow").addClass("hidden");
+				$(".kongbai").removeClass("hidden");
+			}
+			$(".searchzhao3 span").html(restr);
+			$(".searchzhong3 span").html(restr);
+	}
+	appendHtml();
+	$(".searchname").on("input propertychange",function(){
+        appendHtml();
     });
 	$(".qcimg").click(function(){
 		$(".searchname").val("");

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

@@ -147,7 +147,7 @@ body{
 	height:45px;
 	width:78%;
     border-radius: 10px;
-	padding:2px 10px 2px 60px;
+	padding: 2px 10px 2px 42px;
 	font-size:16px;
 	position:absolute;
 }
@@ -160,10 +160,10 @@ body{
 .tubiao img{
     position: absolute;
     z-index: 10;
-    margin-top: 12px;
+    margin-top: 15px;
     color: #000;
-	margin-left:20px;
-	height:25px;
+	margin-left:15px;
+	height:18px;
 }
 .xiaochu{
 	float:right;
@@ -171,9 +171,9 @@ body{
 .xiaochu img{
     position: absolute;
     z-index: 10;
-    top: 20px;
+    top: 22px;
 	right: 22%;
-	height:25px;
+	height:20px;
 }
 .rsssetbtn{
 	border:1px solid #37c6da; 
@@ -194,7 +194,7 @@ body{
 .reslist{
 	width:100%;
 	height:90px;
-	border-bottom:1px solid #e5e6e9;
+	border-bottom:1px solid #ddd;
 	padding-top:5px;
 }
 .resnumb .one{
@@ -219,14 +219,14 @@ body{
 .restime{
 	float:right; 
 	color:#999;
-	margin-top:5px;
+	margin-top:10px;
 }
 .resbm {
     display: table;
     position: fixed;
     left: 0px;
     right: 0px;
-    bottom: 41px;
+    bottom: 46px;
     height: 50px;
     width: 100%;
     background-color: #37c6da;
@@ -255,17 +255,22 @@ body{
 	width:60%;
 }
 .rescontent,.nullcontent{
-	padding:10px 20px;
+	padding:0px 20px;
 	background-color:#fff;
-	width:100%;
+	position: absolute;
+    top: 65px;
+}
+.rescontent{
+	bottom: 98px;
+	overflow-y: auto;
 }
 .nullcontent{
-	height: 100%;
+	bottom: 46px;
+	padding-top: 30%;
 }
 .tslist{
-	height:80px;
-	border-bottom: 1px solid #ccc;
-	padding: 5px;
+	border-bottom: 1px solid #e5e6e9;
+	padding: 15px 5px 40px 5px;
 }
 .keyword{
 	color: #FF5A5F;
@@ -285,7 +290,7 @@ body{
 	margin: 2px 0px;
 	float:right;
 	width:13%;
-	height:41px;
+	height:40px;
 	border:1px solid #35C5DA;
 	background-color:#35C5DA;
 	border-radius: 5px;

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

@@ -9,8 +9,7 @@
 	</li>
 	<li class="parent-node toolbar-list" id="toolbar-list">
 		<div class="toolbar-popover">
-			<ul class="popover-ul" style="padding-left: 10px;
-    text-align: left;">
+			<ul class="popover-ul">
 				<li>查看演示</li>
 				<li>分享</li>
 				<li>意见反馈</li>
@@ -80,6 +79,7 @@
 		</div>
 	</div>
 </div>
+<div class="toolbar-popover-mask"></div>
 <script type="text/javascript">
 //意见反馈
 var feedback = null;
@@ -91,6 +91,13 @@ $(function(){
 			window.location.href = "/swordfish/page";
 		}else if($(this).index() == 2){
 			$(this).children(".toolbar-popover").toggle();
+			if($(this).children(".toolbar-popover").is(":hidden")){
+				$(".toolbar-popover-mask").hide();
+				//$("html,body").removeClass("overflow-hidden");
+			}else{
+				$(".toolbar-popover-mask").show();
+				//$("html,body").addClass("overflow-hidden");
+			}
 		}
 	});
 	$(".popover-ul>li").click(function(event){
@@ -111,11 +118,21 @@ $(function(){
 			}
 			obj.parents(".toolbar-popover").hide();
 			obj.removeClass("active");
+			$(".toolbar-popover-mask").hide();
+			//$("html,body").removeClass("overflow-hidden");
 		},100);
 	});
-	$("body").on("touchstart",function(e){
+	$(".toolbar-popover-mask").click(function(e){
+		$(".toolbar-popover").hide();
+		//$("html,body").removeClass("overflow-hidden");
+	});
+	$(window).scroll(function(){
+		$(".toolbar-popover-mask").height($("body").height());
+	});
+	$("body").click(function(e){
 		if(e.target.id != "toolbar-list"){
 			$(".toolbar-popover").hide();
+			$(".toolbar-popover-mask").hide();
 		}
 	});
 	$("[id='goToShare']").click(function(){