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

core/src/qfw/swordfish/swordfishmanage.go

@@ -5,6 +5,7 @@ import (
 	_ "encoding/json"
 	"gopkg.in/mgo.v2/bson"
 	"net/rpc"
+	"qfw/coreconfig"
 	"qfw/util"
 	"qfw/util/mongodb"
 	"qfw/util/redis"
@@ -96,7 +97,7 @@ func (s *SwordFish) Wxsearchlist() error {
 	s.T["success"] = false
 	s.T["s_type"] = s.GetString("s_type")
 	if len(s_name) > 0 {
-		clent, errs := rpc.DialHTTP("tcp", "127.0.0.1:8766")
+		clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
 		defer clent.Close()
 		rpcData := qrpc.PushData{
 			//Mopenid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8",
@@ -122,12 +123,9 @@ func (s *SwordFish) Wxsearchlist() error {
 
 //跳转到用户中心查询剑鱼信息列表
 func (s *SwordFish) Searchinfolist() error {
-	//moborpc := s.GetString("moborpc")
 	s_type := s.GetString("s_type")
 	s_name := s.GetString("s_name")
 	keywords := s.GetString("searchname")
-	//	if moborpc == "pc" {
-	//	}
 	if s_type == "1" {
 		s_type = "tender"
 	} else if s_type == "2" {
@@ -139,7 +137,7 @@ func (s *SwordFish) Searchinfolist() error {
 	s.T["success"] = false
 	s.T["s_type"] = s.GetString("s_type")
 	if len(s_name) > 0 {
-		clent, errs := rpc.DialHTTP("tcp", "127.0.0.1:8766")
+		clent, errs := rpc.DialHTTP("tcp", coreconfig.SysConfig.PushRpc)
 		defer clent.Close()
 		rpcData := qrpc.PushData{
 			//Mopenid: "oJULtwzXo6EFV1Ah-XeyRBimXGM8",

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-22 09:38:08"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-22 09:38:08"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-22 11:15:00"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-22 11:15:00"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/js/entportrait.js

@@ -66,7 +66,7 @@ $(function(){
 					}
 				}
 				verticalFlag = true;
-				hm+='<div><img src="/images/entcommunity/mainperson'+index+'.png">'
+				hm+='<div><img src="'+cdn+'/images/entcommunity/mainperson'+index+'.png">'
 					+'<span><font class="b-com-name">'+obj[i].Name+'</font><font class="ent-positionName">'+positionName+'</font></span></div>';
 				//竖线
 				if(tmp == maxCout && i != obj.length-1){
@@ -96,7 +96,7 @@ $(function(){
 	}
 	//联系地址
 	if($address){
-		loadJS("/js/jquery.cxselect.js",function(){
+		loadJS(cdn+"/js/jquery.cxselect.js",function(){
 			$('#city_china').cxSelect({
 				selects: ['province', 'city', 'area'],
 				required:0
@@ -158,7 +158,7 @@ $(function(){
 function initMap(){
 	//获取地图的经纬度
 	loadJS("http://api.map.baidu.com/getscript?v=2&ak=AFd8b176f363f23e6a23d516f4cfb742&services=&t=20150522093217",function(){
-		loadJS("/js/geocoder.js",function(){
+		loadJS(cdn+"/js/geocoder.js",function(){
 			doOptions();
 		});
 	});
@@ -208,10 +208,10 @@ function initRelation(){
 			}else{
 				$("#entrelation-limit,#entrelation-nologin").addClass("hide");
 				$(".entrelation").height($(".ent-tab-content").height());
-				loadJS("/js/d3.v3.min.js",function(){
-					loadJS("/js/geometry.js",function(){
-						loadJS("/js/provinceData.min.js",function(){
-							loadJS("/js/relation.js",function(){
+				loadJS(cdn+"/js/d3.v3.min.js",function(){
+					loadJS(cdn+"/js/geometry.js",function(){
+						loadJS(cdn+"/js/provinceData.min.js",function(){
+							loadJS(cdn+"/js/relation.js",function(){
 								relationEntity = new Relation(legcerNo,regNo,regCapCurName,relation);
 								relationEntity.init();
 							});
@@ -261,7 +261,7 @@ function initRelation(){
 function CopyrightEntity(){
 	//著作权
 	if(typeof(copyright) != "undefined" && copyright != null){
-		loadJS("/js/frontpaging.js",function(){
+		loadJS(cdn+"/js/frontpaging.js",function(){
 			var workCopyRight = copyright.WorkCopyRight;
 			if(typeof(workCopyRight) != "undefined" && workCopyRight != null){
 				workCopyRight.sort(function(a,b){
@@ -373,7 +373,7 @@ function ServicePaging(){
 				}
 				var flag = typeof(r[i].s_isshow) != "undefined" && r[i].s_isshow != null && r[i].s_isshow.indexOf("3")>-1;
 				html += '<tr>'
-						+'<td rowspan="2" width="130"><img src="'+(r[i].s_images==""?"null":r[i].s_images)+'" onerror="this.src=\'/images/services/default.png\'"></td>'
+						+'<td rowspan="2" width="130"><img src="'+(r[i].s_images==""?"null":(cdn+r[i].s_images))+'" onerror="this.src=\''+cdn+'/images/services/default.png\'"></td>'
 						+'<td class="b-com-name">';
 				if(flag){
 					html += '<a href="/market/detail/'+r[i]._id+'.html">';
@@ -409,7 +409,7 @@ function ServicePaging(){
 		this.initServiceList();
 	}else{
 		var thisClass = this;
-		loadJS("/js/paging.js",function(){
+		loadJS(cdn+"/js/paging.js",function(){
 			hasLoadPagingJs = true;
 			thisClass.initServiceList();
 		});
@@ -445,7 +445,7 @@ function DishonestyPaging(){
 		this.initDishonesty();
 	}else{
 		var thisClass = this;
-		loadJS("/js/paging.js",function(){
+		loadJS(cdn+"/js/paging.js",function(){
 			hasLoadPagingJs = true;
 			thisClass.initDishonesty();
 		});

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

@@ -204,7 +204,7 @@ $(function(){
 
 function makeData(d,_this,b){
 	var nodeId = "immediately";
-	if(_this.attr("name") == "entIndexSearch"){
+	if(_this.attr("id") == "entIndexSearch"){
 		nodeId += "_main";
 	}
 	var s=$("#"+nodeId);

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

@@ -131,11 +131,12 @@ img{
 	float: right;
 }
 .operation .child-node li>div:first-child{
-	color: #999;
+	
 }
 .operation .child-node .com-last{
 	font-size: 14px;
 	padding-top: 10px;
+	color: #999;
 }
 /*弹出框*/
 .dialog{
@@ -613,4 +614,47 @@ img{
 .no-result{
 	text-align:center;
 	color:#999;
+}
+.toolbar-list{
+	position: relative;
+}
+.toolbar-popover{
+	position: absolute;
+	width: 90px;
+	height: 100px;
+	border: 1px solid #CCCCCC;
+	background-color: #F8F8F8;
+	bottom: 65px;
+	left: 50%;
+	margin-left: -45px;
+	z-index: 1;
+	display: none;
+}
+.popover-ul li{
+	line-height: 30px;
+}
+.toolbar-popover .popover-arrow{
+	bottom: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-width: 11px;
+	border-bottom-width: 0;
+	position: absolute;
+	border-color: transparent;
+	border-style: solid;
+	border-top-color: #CCCCCC;
+}
+.toolbar-popover .popover-arrow:after{
+	position: absolute;
+	bottom: -9px;
+	margin-left: -10px;
+	content: " ";
+	border-color: transparent;
+	border-top-color: #F8F8F8;
+	border-bottom-width: 0;
+	border-width: 10px;
+	border-style: solid;
+}
+.popover-ul li.active{
+	background-color: #EAEAEA;
 }

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

@@ -48,7 +48,7 @@ $(function (){
 	$("form#searchForm").submit(function(){
 		var input_val = $(this).children("[type='text']").val().replace(/^\s+|\s+$/g,"");
 		if (keyCode==13){
-	 		$("input[name='words']").val(input_val);
+	 		$(this).find("input[name='words']").val(input_val);
 			keyCode=0;
 			return true;
 		}
@@ -98,7 +98,7 @@ function scrollUp(id){
 function immediatelyInitCallBack(obj){
 	if(obj.attr("id") == "header-searchInput"){
 		$("#immediately").css({width:$("#immediately").width()-30,"left":"15px","top":"38px"});
-	}else if(obj.attr("name") == "entIndexSearch"){
+	}else if(obj.attr("id") == "entIndexSearch"){
 		$("#immediately_main").css("top","45");
 	}
 }

core/src/web/templates/index.html

@@ -7,38 +7,41 @@
 <meta name="Description" content="{{Msg "seo" "qfw.homepage.description"}}"/>
 <link href="{{Msg "seo" "cdn"}}/css/index-new.css" rel="stylesheet">
 <script src="{{Msg "seo" "cdn"}}/js/jquery.lazyload.min.js"></script>
-<script type="text/javascript">
-$(function(){
-	var kd = document.body.clientWidth;
-	if(kd < 760){
-		window.location.href="/front/webindexcontent/56efb9ba61fd0010d0000001.html"
-	}
-});
-</script>
+
 </head>
 <body>
 
 <!---->
 <div class="index-new-head b-head visible-xs">
-	<div style="height:25px;width:100%;background-color:#000;"></div>
-	<div class="b-nav index-new-nva">
-		<ul style="margin-left:15px;">
-			<li class="b-nav-logo index-new-nva-l"><a href="/"><img src="/images/logo.png" class="logo"></a></li>
-			
-		</ul>
+	
+	<div class="b-nav index-new-nva text-center" style="height:69px;">
+		<a href="/"><img src="/images/logo.png" class="logo"></a>
 	</div>
 </div>
-<div class="text-center visible-xs" style="margin:40px 20px 20px 20px">
-	<div>
-	 	<p>企明星为了用户有更好的使用体验，</p>
-		<p>已成功把各项功能移植到</p>
-		<p>关注企明星公众号：</p>
-		<p>qmx-cn</p>
-		<p>或扫描二维码</p>
+{{$s:=(Ad "index-center-mob" 1)}}
+	{{range $k,$v := $s}}
+<div class="text-center visible-xs" style="margin-top:10px;">
+	<div style="background-color:#fff;padding:20px;">
+	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
+	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
+	<div style="color:#FF5A5F;float:left;margin-left:15px;">网站介绍</div>
+	<div style="clear:both;"></div>
+	</div>
+	<div style="margin-top:20px;">
+	{{if $v.s_remark}}{{$v.s_remark}} {{end}}
+	</div>
+	</div>
+	<div  style="background-color:#fff; margin-top:10px;padding:20px;">
+	<div style="height:35px; border-bottom:1px solid #e5e6e9;padding-bottom:15px;">
+	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
+	<div style="color:#FF5A5F;float:left;margin-left:15px;">手机体验</div>
+	<div style="clear:both;"></div>
+	</div>
+	<div style="margin-top:20px;"><img src="{{if $v.s_pic}} {{$v.s_pic}} {{else}}/images/u109.png{{end}}"></div>
+	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>	
 	</div>
-	<div><img src="/images/u109.png"></div>
 </div>
-
+	{{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/manage/webmobindex.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>移动端首页</title>
+<title>企明星_移动端首页</title>
 {{include "/common/inc.html"}}
 <script src="{{Msg "seo" "cdn"}}/js/validform-min.js"></script>
 <style type="text/css">
@@ -27,18 +27,18 @@ body{
 	 margin-right: 0; 
      position: relative; 
      width: auto; 
-    border-top-left-radius: 8px;
+    border-radius: 4px;
 }
 </style>
 </head>
 <body>
 <div class="index-new-head b-head">
 	<div class="b-nav index-new-nva text-center">
-		<a href="/"><img src="/images/logo.png" class="logo"></a>
+		<a href="/"><img src="{{Msg "seo" "cdn"}}/images/logo.png" class="logo"></a>
 	</div>
 </div>
 <!-- 中间 -->
-<div class="row" style="padding:10px; margin:0 auto;">
+<div class="row" style="padding:10px 0px; margin:0 auto;">
 		<div id="contentindex">
 			
 			<div class="container-fluid">
@@ -51,7 +51,7 @@ body{
 	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
 	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
 	<div style="color:#FF5A5F;float:left;margin-left:15px;">网站介绍</div>
-	<div style="both:clear;"></div>
+	<div style="clear:both;"></div>
 	</div>
 	<div  style="margin-top: 20px;">{{.T.s_content}}</div>							
 		                        </div>
@@ -66,9 +66,8 @@ body{
 
 
 </div>
-<div class="row" style="padding:0px 10px; margin:0 auto;">
+<div class="row" style="padding:0px; margin-left:auto; margin-right:auto;margin-bottom:20px;">
 		<div id="contentindex">
-			
 			<div class="container-fluid">
 				<div style="margin-top:0px;" class="row-fluid">
 					<div class="span12">		
@@ -79,7 +78,7 @@ body{
 	<div style="margin-top: 40px;height:35px; border-bottom:1px solid #e5e6e9;">
 	<div style="height:20px;width:10px;background-color:#FF5A5F;float:left;"></div>
 	<div style="color:#FF5A5F;float:left;margin-left:15px;">手机体验</div>
-	<div style="both:clear;"></div>
+	<div style="clear:both;"></div>
 	</div>
 	<div style="width:100%;    margin-top: 20px;" class="text-center"><img src="{{if .T.s_pic }}{{.T.s_pic}}{{else}}{{Msg "seo" "cdn"}}/images/u109.png{{end}}"/></div>	
 	<div style="width:100%;margin-top: 20px;" class="text-center">微信关注企明星公众号qmx-cn，体验企明星的强大功能。</div>						

core/src/web/templates/search/entcommunity.html

@@ -11,17 +11,17 @@
 {{include "/common/enthead.html"}}
 <div class="b-content container-fluid">
 	<div class="b-left">
-		<div class="ent-index-search">
+		<form class="ent-index-search" id="entIndexSearchForm" method="post" action="/search/enterprise/ent.html">
 			<div class="b-com-first">一个企业社区，就够了</div>
 			<div class="b-com-second">查企业，查企业失信信息，查企业变更，查你所想，无所不能...</div>
 			<div class="b-com-third input-group">
-				<input type="text" name="entIndexSearch" class="form-control" aria-describedby="search-btn">
+				<input type="text" name="words" id="entIndexSearch" class="form-control" aria-describedby="search-btn">
 				<span class="input-group-addon" id="search-btn"><span class="glyphicon sousuo"></span>查询</span>
 			</div>
 			<div class="b-com-fourth" id="hotsearchwords">
 				热搜词：{{$s:=(Ad "ent-hotsearchwords" 15)}}{{range $k,$v := $s}}<a href="/enterprise/{{$v.s_id}}.html">{{$v.s_remark}}</a>{{end}}
 			</div>
-		</div>
+		</form>
 		<div class="ent-index-recommend">
 			<div class="b-com-title">
 				<span class="glyphicon jianzhu"></span>推荐企业
@@ -54,7 +54,7 @@
 <script>
 $(function(){
 	//设置即时下拉
-	$("input[name='entIndexSearch']").attr("autocomplete","off").keyup(function(){
+	$("input[id='entIndexSearch']").attr("autocomplete","off").keyup(function(){
 		imFind(this)
 	}).focus(function(){
 		imFind(this)
@@ -64,8 +64,7 @@ $(function(){
 		},500);
 	});
 	$("#search-btn").click(function(){
-		$("input[name='words']").val($("input[name='entIndexSearch']").val());
-		$("form#searchForm").submit();
+		$("form#entIndexSearchForm").submit();
 	});
 	var ents = {{Ad "ent-recommend" 48}};
 	if(typeof(ents) != "undefined" &&　ents != null && ents.length > 0){

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

@@ -321,7 +321,7 @@ $(function(){
 <!-- 模态框（Modal） -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
    aria-labelledby="myModalLabel" aria-hidden="true">
-   <div class="modal-dialog">
+	<div class="modal-dialog">
       <div class="modal-content" style="height:500px;">
          <div class="modal-header">
             <button type="button" class="close" 
@@ -337,7 +337,7 @@ $(function(){
          </div>
          
       </div><!-- /.modal-content -->
-</div><!-- /.modal -->
+	</div><!-- /.modal -->
 </div>
 <!-- 底部 -->
 {{include "/common/bottom.html"}}

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

@@ -102,42 +102,87 @@
 </head>
 <body>
 
-<div class="wxhead"><span class="tubiao"><img src="/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
-<span class="xiaochu"><img class="qcimg" src="/images/wxqc.png"/></span>
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchnameshow" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
+<span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 </div>
 <div class="searchshow">
+		<!--招标 start-->
 	<form action="/member/wxswordfish/searchlist" name="searchone" method="post">
 		<div onClick="searchbiao(1)" style="height:45px;line-height:45px;cursor:hand;">
-		<div class="searchzhao1"><img src="/images/wxjs.png"/></div>
+		<div class="searchzhao1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 		<div class="searchzhao2">查询招标公告：</div>
 		<div class="searchzhao3">
 		<span>{{.T.keywords}}</span>
 		</div>
-		<div style="both:clear;"></div>
+		<div style="clear:both"></div>
 		<input name="searchname" id="searchname1" value="" style="display:none;"/>
 		<input name="s_type" id="sea_type" value="1" style="display:none;"/>
 		<input name="s_name" id="sea_name1" value="" style="display:none;"/>
 		</div>
 	</form>
+		<!--招标 end-->
 		<div  style="border-top:1px solid #e5e6e9; width:100%;"></div>
+		<!--中标 start-->
 	<form action="/member/wxswordfish/searchlist" name="searchtwo" method="post">
 		<div onClick="searchbiao(2)" style="height:45px;line-height:45px;cursor:hand;">
-		<div class="searchzhong1"><img src="/images/wxjs.png"/></div>
+		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
 		<div class="searchzhong2">查询中标公告：</div>
 		<div class="searchzhong3">
 		<span>{{.T.keywords}}</span>
 		</div>
-		<div style="both:clear;"></div>
+		<div style="clear:both"></div>
 		<input name="searchname" id="searchname2" value="" style="display:none;"/>
 		<input name="s_type" id="sea_type" value="2" style="display:none;"/>
 		<input name="s_name" id="sea_name2" value="" style="display:none;"/>
 		</div>
 	</form>
+		<!--中标 end-->
+		<div  style="border-top:1px solid #e5e6e9; width:100%;"></div>
+		<!--企业情报 start-->
+	<form action="/member/wxswordfish/searchlist" name="searchone" method="post">
+		<div onClick="searchbiao(3)" style="height:45px;line-height:45px;cursor:hand;">
+		<div class="searchzhong1"><img src="{{Msg "seo" "cdn"}}/images/wxjs.png"/></div>
+		<div class="searchzhong2">查询企业情报：</div>
+		<div class="searchzhong3">
+		<span>{{.T.keywords}}</span>
+		</div>
+		<div style="clear:both"></div>
+		
+		</div>
+	</form>
+		<!--企业情报 end-->
 		<div style="border-top:1px solid #e5e6e9; width:100%;"></div>
 		<div id="myorder" class="text-center">
 		<div class="rsssetbtn" onClick="window.location.href='/swordfish/page';">进入我的信息订阅</div>
 		</div>
 </div>
+
+<!-- 按钮触发模态框 -->
+<button class="btn hidden kfing" data-toggle="modal" 
+   data-target="#myModal">
+</button>
+
+<!-- 模态框（Modal） -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" 
+   aria-labelledby="myModalLabel" aria-hidden="true">
+	<div class="modal-dialog">
+      <div class="modal-content" style="height:180px;">
+         <div class="modal-header">
+            <button type="button" class="close" 
+               data-dismiss="modal" aria-hidden="true">
+                  &times;
+            </button>
+            <h4 class="modal-title" id="myModalLabel">
+               企业情报
+            </h4>
+         </div>
+         <div class="modal-body text-center" style="margin-top:30px;">
+            开发中，敬请期待！
+         </div>
+         
+      </div><!-- /.modal-content -->
+	</div><!-- /.modal -->
+</div>
 {{include "/swordfish/wxtoolbar.html"}}
 <script type="text/javascript">
 	$(".searchname").keyup(function(){
@@ -151,14 +196,18 @@
 		$(".searchzhong3 span").html("");
 	});
 	function searchbiao(i){
-		var searchname = $(".searchname").val();
-		document.getElementById("searchname"+i).value = searchname;
-		searchname = searchname.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
-		document.getElementById("sea_name"+i).value = searchname;
+		if(i!=3){
+			var searchname = $(".searchname").val();
+			document.getElementById("searchname"+i).value = searchname;
+			searchname = searchname.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+");
+			document.getElementById("sea_name"+i).value = searchname;
+		}
 		if (i==1){
 			document.forms['searchone'].submit();
-		}else{
+		}else if (i==2){
 			document.forms['searchtwo'].submit();
+		}else if (i==3){
+			$(".kfing").click();
 		}
 		
 	}

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

@@ -271,8 +271,8 @@ body{
 </head>
 <body>
 <div style="background-color:#fff;">
-<div class="wxhead"><span class="tubiao"><img src="/images/wxjss.png"/></span><input class="form-control searchname" name="searchname" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
-<span class="xiaochu"><img class="qcimg" src="/images/wxqc.png"/></span>
+<div class="wxhead"><span class="tubiao"><img src="{{Msg "seo" "cdn"}}/images/wxjss.png"/></span><input class="form-control searchname" name="searchname" value="{{.T.keywords}}" placeholder="输入关键词查询"/>
+<span class="xiaochu"><img class="qcimg" src="{{Msg "seo" "cdn"}}/images/wxqc.png"/></span>
 </div>
 <div class="rescontent">
 	
@@ -286,12 +286,12 @@ body{
 直接订阅
 </div>
 
-<div style="both:clear;"></div>
+<div style="clear:both"></div>
 </div>
 
 <div class="nullcontent text-center  hidden">
 <div >
-<img style="width:137px;margin-top:160px;" src="/images/findnull.png">
+<img style="width:137px;margin-top:160px;" src="{{Msg "seo" "cdn"}}/images/findnull.png">
 </div>
 <div>没有找到和该关键词匹配的信息</div>
 </div>

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

@@ -1,15 +1,24 @@
 <ul class="bottom-toolbar">
-	<li class="parent-node" id="goToGuide">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/demo.png">
-		查看演示
+	<li class="parent-node">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/sousuo.png">
+		搜索
 	</li>
-	<li class="parent-node" id="feedback">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/fankui.png">
-		意见反馈
+	<li class="parent-node">
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/dingyue.png">
+		我得订阅
 	</li>
-	<li class="parent-node" id="goToShare">
-		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/share.png">
-		分享
+	<li class="parent-node toolbar-list" id="toolbar-list">
+		<div class="toolbar-popover">
+			<ul class="popover-ul" style="padding-left: 10px;
+    text-align: left;">
+				<li>查看演示</li>
+				<li>分享</li>
+				<li>意见反馈</li>
+			</ul>
+			<div class="popover-arrow"></div>
+		</div>
+		<img src="{{Msg "seo" "cdn"}}/wxswordfish/images/liebiao.png">
+		列表
 	</li>
 </ul>
 <div class="dialog share-dialog">
@@ -75,15 +84,34 @@
 //意见反馈
 var feedback = null;
 $(function(){
-	$("#goToGuide").click(function(){
-		window.location.href = "/swordfish/guide/other";
-	});
-	$("#feedback").click(function(){
-		if(feedback == null){
-			feedback = new Feedback();
+	$(".bottom-toolbar>li").click(function(){
+		if($(this).index() == 0){
+			alert("搜索");
+		}else if($(this).index() == 1){
+			alert("我得订阅");
+		}else if($(this).index() == 2){
+			$(this).children(".toolbar-popover").show();
 		}
-		feedback.show();
-		$("#feedback-textarea").focus().parent().removeClass("red-border");
+	});
+	$(".popover-ul>li").click(function(event){
+		event.stopPropagation(); 
+		var obj = $(this);
+		obj.addClass("active");
+		setTimeout(function(){
+			if(obj.index() == 0){
+				window.location.href = "/swordfish/guide/other";
+			}else if(obj.index() == 1){
+				window.location.href = "/swordfish/guide/share";
+			}else if(obj.index() == 2){
+				if(feedback == null){
+					feedback = new Feedback();
+				}
+				feedback.show();
+				$("#feedback-textarea").focus().parent().removeClass("red-border");
+			}
+			obj.parents(".toolbar-popover").hide();
+			obj.removeClass("active");
+		},100);
 	});
 	$("[id='goToShare']").click(function(){
 		window.location.href = "/swordfish/guide/share";

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

@@ -13,7 +13,7 @@
 <div class="b-content container-fluid">
 	<!--企业名片-->
 	<div class="b-com-head">
-		<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+		<img src="{{if .T.res.s_avatar}}{{Msg "seo" "cdn"}}{{.T.res.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'">
 		<div class="entinfo-cart">
 			<div class="b-com-first">
 				<font class="b-com-title">{{if .T.res.EntName}}{{.T.res.EntName}}{{end}}</font>
@@ -320,33 +320,6 @@
 		</div>
 		<div class="hide ent-mainperson">
 			<div class="ent-findnull hide">
-				<img src="/images/findnull.png" class="b-findnull">
-			</div>
-		</div>
-		<div class="hide">
-		{{if or .T.res.OpScope .T.res.s_synopsis}}
-			<div class="ent-layout-up">
-				<div class="b-com-title">
-					<span class="glyphicon jianzhu"></span>公司简介
-				</div>
-				<div class="b-com-content margin-0"></div>
-			</div>
-			<div class="ent-layout-down">
-				{{if .T.res.OpScope}}
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>经营范围
-				</div>
-				<div class="b-com-content">{{.T.res.OpScope}}</div>
-				{{end}}
-				{{if .T.res.s_synopsis}}
-				<div class="b-com-title">
-					<span><span class="bootstrap-glyphicon glyphicon-menu-right"></span></span>公司介绍
-				</div>
-				<div class="b-com-content">{{.T.res.s_synopsis}}</div>
-				{{end}}
-			</div>
-			{{else}}
-			<div class="ent-findnull">
 				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
@@ -392,7 +365,7 @@
 			</div>
 			{{end}}
 			<div class="ent-findnull hide">
-				<img src="/images/findnull.png" class="b-findnull">
+				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
@@ -459,7 +432,7 @@
 				</div>
 			</div>
 			<div class="ent-findnull hide">
-				<img src="/images/findnull.png" class="b-findnull">
+				<img src="{{Msg "seo" "cdn"}}/images/findnull.png" class="b-findnull">
 				<h4>抱歉，未找到相关数据！</h4>
 			</div>
 		</div>
@@ -490,6 +463,7 @@
 			</div>
 		</div>
 	</div>
+	{{if or .T.relevantEnts .T.relevantNews}}
 	<div class="b-right">
 		{{if .T.relevantEnts}}
 		<div class="b-adver b-scroll-list">
@@ -499,7 +473,7 @@
 				{{range $k,$v := .T.relevantEnts}}
 					<li class="cursor-pointer{{if eq $k 0}} margin-0 border-t-0{{end}}" onclick="window.location.href='/enterprise/{{$v._id}}.html'">
 						<div>
-							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='/images/ent-logo.png'">
+							<img src="{{if $v.s_avatar}}{{$v.s_avatar}}{{else}}null{{end}}" onerror="this.src='{{Msg "seo" "cdn"}}/images/ent-logo.png'">
 							<a href="/enterprise/{{$v._id}}.html">{{$v.EntName}}</a>
 						</div>
 					</li>
@@ -523,7 +497,7 @@
 							if(!s_link.startWith("http://") && !s_link.startWith("https://")){
 								s_link = "http://"+s_link;
 							}
-							document.write('<span><img src="/images/swordfish/circle.png">'+l_comeintime+'</span><br><a href="'+s_link+'" target="_bank">{{$v.s_title}}</a></li>');
+							document.write('<span><img src="{{Msg "seo" "cdn"}}/images/swordfish/circle.png">'+l_comeintime+'</span><br><a href="'+s_link+'" target="_bank">{{$v.s_title}}</a></li>');
 						</script>
 					</li>
 				{{end}}
@@ -533,6 +507,7 @@
 		</div>
 		{{end}}
 	</div>
+	{{end}}
 </div>
 <!--显示地图信息-->
 <div id="mapshowdiv" class="white_content"></div>
@@ -541,6 +516,7 @@
 {{include "/common/bottom.html"}}
 </body>
 <script type="text/javascript">
+var cdn = {{Msg "seo" "cdn"}};
 var entId = {{.T.res._id}};
 var regNo = {{.T.res.RegNo}};
 var regCapCurName = {{.T.res.RegCapCurName}};

credit/src/config.json

@@ -44,12 +44,12 @@
         "A2": -1000
     },
     "message": {
-        "swordfish_dueTitle": "剑鱼服务提醒",
-        "swordfish_due": "您的剑鱼服务%d天后到期，请及时续费。",
-        "swordfish_closeTitle": "剑鱼服务暂停提醒",
-        "swordfish_close": "您的剑鱼服务已经到期,已经暂停，请及时续费。",
-        "swordfish_payTitle": "剑鱼服务订单提醒",
-        "swordfish_pay": "您已成功订阅剑鱼，扣除%d积分，剩余%d积分，剑鱼服务时长到:%s",
+        "swordfish_dueTitle": "剑鱼%s信息服务提醒",
+        "swordfish_due": "您的剑鱼%s信息服务将于%d天后到期。您的积分余额为%d，如果继续使用，到期后系统将会自动扣除1000积分，如果积分余额不足服务将会中止。电脑登录qmx.top查看用户中心-积分，了解如何通过做任务赚取积分。",
+        "swordfish_closeTitle": "剑鱼%s信息服务暂停提醒",
+        "swordfish_close": "您的剑鱼%s信息服务已到期，由于积分余额不足，系统已停止推送。电脑登录qmx.top查看用户中心-积分，了解如何通过做任务赚取积分。",
+        "swordfish_payTitle": "剑鱼%s信息服务订单提醒",
+        "swordfish_pay": "您已成功订阅剑鱼%s信息服务，扣除%d积分，剩余%d积分，服务时间至:%s",
         "give": "转赠提醒",
         "give_pay": "转赠扣除提醒",
         "recharge": "充值成功提醒",
@@ -81,8 +81,8 @@
         "txt_c3": "邀请用户",
         "txt_d1": "微信充值",
         "txt_e1": "二维码转入",
-        "txt_A1": "剑鱼招标",
-        "txt_A2": "剑鱼中标",
+        "txt_A1": "招标",
+        "txt_A2": "中标",
         "txt_B1": "转赠"
     },
     "smtp": {

credit/src/main.go

@@ -235,7 +235,7 @@ func TimerSwordFishFromUser() {
 									//提示
 									for _, v := range swordfish_tipBeforeDays {
 										if v == sub64 {
-											creditrpc.SendMsgWebAndWx(swordfish_dueTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_due, v), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
+											creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_dueTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_due, creditrpc.Message["txt_"+code], v, tmp["i_credit"]), util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string))
 										}
 									}
 								}
@@ -283,7 +283,7 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 			}
 			if creditlog.Save(creditDoc) {
 				//发送微信通知扣积分成功
-				creditrpc.SendMsgWebAndWx(swordfish_payTitle+"["+creditrpc.Message["txt_"+code]+"]", fmt.Sprintf(swordfish_pay, -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
+				creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_payTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_pay, creditrpc.Message["txt_"+code], -codeNum, restNum, util.FormatDate(&newDate, util.Date_Full_Layout)), userId, umid)
 			}
 		} else { //暂停操作
 			//更新操作
@@ -294,7 +294,7 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 				},
 			}, false, false) {
 				//暂停通知,因积分不够
-				creditrpc.SendMsgWebAndWx(swordfish_closeTitle+"["+creditrpc.Message["txt_"+code]+"]", swordfish_close, userId, umid)
+				creditrpc.SendMsgWebAndWx(fmt.Sprintf(swordfish_closeTitle, creditrpc.Message["txt_"+code]), fmt.Sprintf(swordfish_close, creditrpc.Message["txt_"+code]), userId, umid)
 			}
 		}
 	}, func(e interface{}) {

credit/src/qfw/creditrpc/creditrpc.go

@@ -305,7 +305,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 			*replay = creditDoc["i_score"].(int)
 			//发送微信通知扣积分成功
 			if first == "A" {
-				go SendMsgWebAndWx(Message["swordfish_payTitle"]+"["+txt+"]", fmt.Sprintf(Message["swordfish_pay"], creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
+				go SendMsgWebAndWx(fmt.Sprintf(Message["swordfish_payTitle"], txt), fmt.Sprintf(Message["swordfish_pay"], txt, creditDoc["i_score"], creditDoc["i_scorenow"], util.FormatDate(&newDate, util.Date_Full_Layout)), param.Uid, param.Umid)
 			}
 		}
 	}