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

core/src/qfw/front/webcentent.go

@@ -180,7 +180,7 @@ func (e *Newscont) GetJsonList(list string) error {
 
 //前台新闻资讯内容
 func (n *Newscont) Webcontent(_id string) error {
-	return n.viewContent4Front(_id, "/manage/webexpresscontent.html")
+	return n.viewContent4Front(_id, "/manage/webexpresscontent-new.html")
 }
 
 //前台微信新闻资讯内容
@@ -352,7 +352,7 @@ func (n *Newscont) Webregulationscontent(_id string) error {
 			data_7 := (*r)["l_fetchdate"]
 			(*r)["l_fetchdate"] = util.FormatDateWithObj(&data_7, util.Date_Full_Layout)
 			(*r)["s_content"] = template.HTML((*r)["s_content"].(string))
-			content, _ := n.Render4Cache("/manage/webcontent.html", &n.T)
+			content, _ := n.Render4Cache("/manage/webcontent-new.html", &n.T)
 			redis.Put("other", n.Url(), string(content), -1)
 			return n.SetBody(content)
 		} else {

core/src/qfw/manage/article.go

@@ -139,6 +139,7 @@ func (a *Article) Updatearticle() error {
 			msg = "修改成功！"
 			elastic.UpdateNewDoc("content", "content", FindById("content", _id, ""))
 			redis.Del("other", "/front/webcontent/"+_id+".html")
+			redis.Del("other", "/front/webhelpcontent/"+_id+".html")
 			redis.Del("other", "/front/weixincontent/"+_id)
 			redis.Del("other", "/")
 			redis.Del("other", "latestNews") //最新消息

core/src/qfw/manage/feedback.go

@@ -62,7 +62,7 @@ func (s *SystemManage) Getfeedback() error {
 				query = query + `,`
 			}
 			if len(search) > 0 {
-				query = query + `"s_title":{"$regex":"` + search + `"}`
+				query = query + `"s_title_no":{"$regex":"` + search + `"}`
 			}
 			query = query + "}"
 			res["totalRows"] = Count("interaction", query)

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-03 16:15:34"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-03 16:15:34"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-03-08 17:41:06"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-03-08 17:41:06"}},"marketisstart":true,"marketrate":300}

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

@@ -53,7 +53,7 @@ var _hmt = _hmt || [];
 				loginModalShow(-1);
 				break;
 			case 2:
-				$("body").append('<form id="feedbackForm" action="/front/web_feedbacklist.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
+				$("body").append('<form id="feedbackForm" action="/front/web_O_help.html" method="post" class="hide"><input type="hidden" name="url" value="'+window.location.href+'"></form>');
 				$("#feedbackForm").submit();
 				break;
 			case 3:

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

@@ -64,7 +64,7 @@ $(function(){
 		,callback:function(ct,cd,val,k,m){
 			var v=ct["i_status"]==1?ct["s_title"]:cd;
 			var id = ct["_id"]
-			if(v) v="<a href='/manage/content/"+id+"'>"+v+"</a>"
+			if(v) v="<a target='_blank' href='/manage/content/"+id+"'>"+v+"</a>"
 			return v
 		}	
         },

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

@@ -77,7 +77,7 @@ background-color:#FFFFFF;
         <div class="form-group">
         <label id="col-sm-2" class="col-sm-2 control-label" for="name">问题描述：</label>
 	    <div class="col-sm-6">
-		<textarea style=" width:100%;padding:10px 8px; height:100px; background-color:#F0F0F0;" name="s_record" class="form-control" disabled="disabled">{{.T.s_remark}}</textarea>
+		<textarea style=" width:100%;padding:10px 8px; height:100px; background-color:#F0F0F0;" name="s_remark" class="form-control" disabled="disabled">{{.T.s_remark}}</textarea>
 		</div>
 		<div class="col-sm-4">
 		</div>

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

@@ -515,7 +515,7 @@ function updatearticle(){
         cache:false,    
         dataType:'json', 
         success:function(data){
-			Dialog.alert(data.msg,function(){location.href ="/manage/articlelist"}); 
+			Dialog.alert(data.msg,function(){window.close()}); 
         }    
         });   
 	clickCount++;  
@@ -530,7 +530,7 @@ function updatearticle(){
         cache:false,    
         dataType:'json', 
         success:function(data){
-			Dialog.alert(data.msg,function(){location.href ="/manage/articlelist"}); 
+			Dialog.alert(data.msg,function(){window.close()}); 
         }    
         });    
 	})

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

@@ -347,19 +347,19 @@
 	<div id="help-content-3" class="help-centercontent hidden">
 	<div class="help-centerarticle">
 	<p>一、新手使用指南</p>
-	<p><a href="#">1.　如何成为注册用户</a></p>
-	<p><a href="#">2.　如何发布企业信息</a></p>
-	<p><a href="#">3.　如何管理企业信息</a></p>
-	<p><a href="#">4.　如何查找企业</a></p>
-	<p><a href="#">5.　企明星信息审核规范</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">1.　如何成为注册用户</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">2.　如何发布企业信息</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">3.　如何管理企业信息</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">4.　如何查找企业</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">5.　企明星信息审核规范</a></p>
 	<div class="help-center">如果您通过局域网上网时，由于局域网通往外部的出口宽带限制，连接网站时发生超时错误都会发生连接不上的问题。如果遇到网页打不开的问题，有时只须刷新即可，有时需要您换个时间再登录。</div>
 	<div class="help-hx"></div>
 	<p>二、用户注册与登录</p>
-	<p><a href="#">1.　用户名修改</a></p>
-	<p><a href="#">2.　无法登录</a></p>
-	<p><a href="#">3.　手机号被占用</a></p>
-	<p><a href="#">4.　账户丢失或被盗</a></p>
-	<p><a href="#">5.　帐号注销</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">1.　用户名修改</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">2.　无法登录</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">3.　手机号被占用</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">4.　账户丢失或被盗</a></p>
+	<p><a target="_blank" href="/front/webhelpcontent/5594d3f3af5374369d000a31.html">5.　帐号注销</a></p>
 	</div>
 	</div>
 	<div id="help-content-4" class="help-linkcontent hidden">

core/src/web/templates/manage/webexpresscontent-new.html

@@ -16,12 +16,15 @@ background-color:#F0F0F0;
 .active{background-color:#6CC3FF}
 .widget-box { background-color:#FFFFFF; border:0px;}
 .widget-content { border:0px;}
-#share a#bds_weixin{ background:url(/images/u78.png);background-position: -13px -6px; width:34; height:34;}
-#share a#bds_tsina{ background:url(/images/u78.png); background-position: -55px -6px; width:34; height:34;}
-#share a#bds_tqq{ background:url(/images/u78.png); background-position: -97px -6px; width:34; height:34;}
-#share a#bds_qzone{ background:url(/images/u78.png); background-position: -137px -6px; width:34; height:34;}
-#share a#bds_douban{ background:url(/images/u78.png); background-position: 144px -6px; width:34; height:34;}
-#share a.bds_dz{ background:url(/images/u78.png); background-position: 62px -6px; width:65; height:34;}
+#share a{
+	margin-right:15px;
+}
+#share a#bds_weixin{ background:url(/images/u78.png) no-repeat;background-position: 0px 0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_tsina{ background:url(/images/u78.png) no-repeat; background-position: -50px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_tqq{ background:url(/images/u78.png) no-repeat; background-position: -97px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_qzone{ background:url(/images/u78.png) no-repeat; background-position: -148px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a#bds_douban{ background:url(/images/u78.png) no-repeat; background-position: -198px -0px; width:34; height:34;background-size: 328px 30px;}
+#share a.bds_dz{ background:url(/images/u78.png) no-repeat; background-position: -248px -0px; width:90; height:34;background-size: 328px 30px;}
 #share a#bds_more{ background:url(); margin-top:13px;}
 .ftnt:hover{ text-decoration: none;}
 .firstimg{ width:100%;}
@@ -231,21 +234,21 @@ $(document).ready(function(){
 			                          </div>
 									<div style="clear:both;"></div>
 									  
-									  <div style="float:left; margin-left:20px;"  id="share">
+									  <div style="float:left; margin-left:60px;"  id="share">
 										<div class="bdsharebuttonbox" style="display:block;">
-										<a href="#" class="bds_more" id="bds_more" data-cmd="more" style="font-size:14px;">分享到：</a>
+										<a href="#" class="bds_more" id="bds_more" data-cmd="more" style="font-size:14px;display:none;">分享到：</a>
 										<a href="#" class="bds_weixin" id="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
 										<a href="#" class="bds_tsina" id="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
 										<a href="#" class="bds_tqq" id="bds_tqq" data-cmd="tqq" title="分享到腾讯微博"></a>
 										<a href="#" class="bds_qzone" id="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
 										<a href="#" class="bds_douban" id="bds_douban" data-cmd="douban" title="分享到豆瓣网"></a>
-										<a onClick="up({{.T._id}})" class="bds_dz" title="赞一个"><span style="font-size:10px; margin-top:10px; position:absolute; text-align:center; width:45px; color:#FFD101;margin-left:3px;" >{{.T.praise}}</span></a>
+										<a onClick="up({{.T._id}})" class="bds_dz" title="赞一个"><span style="font-size:10px; margin-top:7px; position:absolute; text-align:center; width:45px; color:#FF5A5F;margin-left:15px;" >{{.T.praise}}</span></a>
 										</div>			
 										<script>window._bd_share_config={"common":{"bdSnsKey":{},"bdText":"","bdMini":"2","bdPic":"","bdStyle":"0","bdSize":"16"},"share":{}};with(document)0[(getElementsByTagName('head')[0]||body).appendChild(createElement('script')).src='http://bdimg.share.baidu.com/static/api/js/share.js?v=89860593.js?cdnversion='+~(-new Date()/36e5)];</script>	
 										</div>
 									<div style="clear:both;"></div>
-									<div style="padding:20px 33px; margin-top:15px;">{{if .T.firstid }}<span style="font-size:14px;">上一篇：　<a href="/front/webcontent/{{.T.firstid}}.html" class="ftnt">{{.T.firsttitle}}</a></span>{{else}}{{end}}</div>
-									<div style="padding:10px 33px;">{{if .T.nextid }}<span>下一篇：　<a href="/front/webcontent/{{.T.nextid}}.html" class="ftnt">{{.T.nexttitle}}</a></span>{{else}}{{end}}</div>
+									<div style="padding:20px 60px; margin-top:15px;">{{if .T.firstid }}<span style="font-size:14px;">上一篇：　<a href="/front/webcontent/{{.T.firstid}}.html" class="ftnt">{{.T.firsttitle}}</a></span>{{else}}{{end}}</div>
+									<div style="padding:10px 60px;">{{if .T.nextid }}<span>下一篇：　<a href="/front/webcontent/{{.T.nextid}}.html" class="ftnt">{{.T.nexttitle}}</a></span>{{else}}{{end}}</div>
 									<div style="clear:both;"></div>
 									</div>
 								</div>

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

@@ -1,18 +1,32 @@
 <html>
 <head>
-<title>文章内容</title>
+<title>帮助中心</title>
 {{include "/common/inc.html"}}
 <script src="/js/validform-min.js"></script>
 <style type="text/css">
-#content { margin-left:0px;}
+body{
+	background-color:#f0f0f0;
+	}
+.b-nav {
+    border-top-color: rgb(255, 90, 95);
+}
+#content { 
+	margin-left:0px;
+	}
+.widget-box {
+	border:0px;
+	}
+.widget-content {
+	border-bottom:0px;
+	}
 </style>
 </head>
 <body>
+{{include "/common/helphead.html"}}
 <div class="container-fluid">
-{{include "/common/head.html"}}
 </div>
 <!-- 中间 -->
-<div class="row" style="width:96%; margin:0 auto; margin-top:10px;">
+<div class="row" style="padding:10px 50px; margin:0 auto;">
 		<div id="content">
 			
 			<div class="container-fluid">
@@ -21,7 +35,7 @@
 						<div class="widget-box">
 							<div class="widget-content nopadding">
 							<div style="width:90%; margin:auto; margin-bottom:80px;">
-							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding-bottom:20px;" class="text-center">{{.T.s_title}}</p></h4>
+							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding:20px;" class="text-center">{{.T.s_title}}</p></h4>
 							<div  style="font-size:14px; line-height:25px;">
 							    {{.T.s_content}}
 								</div>