抽奖活动页面修改

core/src/qfw/active/activemanage.go

@@ -26,6 +26,7 @@ func (a *Activemanage) Luckdraw(activecode, id string) error {
 	if activecode == "topcj" {
 		se := SimpleEncrypt{Key: "topnet2015topnet2015"}
 		openid := se.DecodeString(id)
+		a.T["signature"] = mob.GetSignature(a.Url())
 		u := FindOne("winningrecord", "{'s_openid':'"+openid+"'}")
 		if *u != nil {
 			//a.T = *u
@@ -34,7 +35,6 @@ func (a *Activemanage) Luckdraw(activecode, id string) error {
 		}
 		a.SetSession("openid", openid)
 		a.SetSession("s_actcode", activecode)
-		a.T["signature"] = mob.GetSignature(a.Url())
 		return a.Render("/active/luckdraw.html", &a.T)
 	} else {
 		return nil

core/src/timetask.json

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

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

@@ -1,5 +1,5 @@
 //是否有新活动
-var hasNewActive = false;
+var hasNewActive = new Date() >= Date.parse(new Date("2015/12/14 00:00:00")) && new Date() < Date.parse(new Date("2016/2/1 00:00:00"));
 //网站初始化状态
 var webSiteInitFlag = true;
 //登录状态 false--未登录，true--已登录

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

@@ -96,8 +96,6 @@ function setTimes(num,n){
 							}
 						//登陆成功
 						clearInterval(t);
-						compulsoryreRresh = true;
-						$("img.login-logo").css("marginLeft",180);
 						$("div.modal-content").animate({
 						    width:'550px'
 						});

core/src/web/templates/index.html

@@ -263,6 +263,7 @@ $(function(){
 	}else{
 		//活动处理
 		if(hasNewActive){
+			$(".a-index-hd").append('<img src="/images/activeimages/chjhd.png" onclick="window.open(\'/front/webactivitycontent/5697403b7e1eac37d5000001.html\')" class="cursor-pointer"><div class="smshb"><ul id="hd-smshb" class="text-center"></ul></div>');
 			/*扫码送红包活动
 			$(".a-index-hd").append('<img src="/images/smshb.png" onclick="window.open(\'/p\')" class="cursor-pointer"><div class="smshb"><ul id="hd-smshb" class="text-center"></ul></div>');
 			$.post("/front/showAmount",null,function(r){

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

@@ -243,6 +243,7 @@ margin-top:-8px;
 		<option value="zh"> 展会 </option>
 		<option value="qtlm"> 其他栏目 </option>
 		<option value="wxlm"> 微信栏目 </option>
+		<option value="zhsk"> 知识库 </option>
 		</select>
 		</div>
 		</div>

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

@@ -53,7 +53,7 @@ $(function(){
   ,classname:"table-hover"
   ,css:{"height":"430px"}
   //,post:{"contenttype":""}
-  ,buttons: ['<div style="margin:5px 20px 0px 30px;" class="controls pull-right"><span><a href="/manage/addarticle"><button class="btn btn-info" onclick="" type="button">添加文章</button></a></span></div><div style="width:50%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="请输入检索条件..."><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button">检索</button></span></div><div style="margin:5px;" class="controls pull-right"><select class="form-control" id="select" ><option value=""> 请选择栏目 </option><option value="qykb"> 企业网快报 </option><option value="mtpj">媒体评价 </option><option value="hyzx">行业资讯 </option><option value="zcfg"> 政策法规 </option><option  value="zthd"> 专题活动 </option><option value="zh" > 展会 </option><option value="qtlm"> 其他栏目 </option><option value="wxlm"> 微信栏目 </option></select></div>']
+  ,buttons: ['<div style="margin:5px 20px 0px 30px;" class="controls pull-right"><span><a href="/manage/addarticle"><button class="btn btn-info" onclick="" type="button">添加文章</button></a></span></div><div style="width:50%;margin:5px" class="input-group pull-right" id="search"><input type="text" id="searchtext" value=""  data-original-title="Search" class="form-control" placeholder="请输入检索条件..."><span class="input-group-btn"><button class="btn btn-success" onclick="SearchContent()" data-original-title="Search" id="searchtip" type="button">检索</button></span></div><div style="margin:5px;" class="controls pull-right"><select class="form-control" id="select" ><option value=""> 请选择栏目 </option><option value="qykb"> 企业网快报 </option><option value="mtpj">媒体评价 </option><option value="hyzx">行业资讯 </option><option value="zcfg"> 政策法规 </option><option  value="zthd"> 专题活动 </option><option value="zh" > 展会 </option><option value="qtlm"> 其他栏目 </option><option value="wxlm"> 微信栏目 </option><option value="zhsk"> 知识库 </option></select></div>']
   , url: '/manage/articlelist/list'
   , columns: [
         {
@@ -93,6 +93,8 @@ $(function(){
 			v = "政策法规"
 			} else if(v == "wxlm") {
 			v = "微信栏目"
+			}else if(v == "zhsk") {
+			v = "知识库"
 			}
 			return v
 		}

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

@@ -77,6 +77,9 @@ margin-top:-8px;
 	background-color:#00ffff;
 	cursor:pointer;
 }
+.index-new-image img{
+	    max-width: 850px;
+}
 </style>
 </head>
 <body>
@@ -99,7 +102,7 @@ margin-top:-8px;
 							<h4><p style="font-weight:bold; border-bottom:1px dashed #98D6DC; padding-bottom:20px;" class="text-center">{{.T.s_title}}</p></h4>
 							<div>
 							<p style="font-size:12px; margin-bottom:30px;" class="text-center">{{if eq .T.s_author ""}}发布人：{{.T.s_editorname}}{{else}}作者：{{.T.s_author}}{{end}}　　  发布日期： {{if not .T.releasetime}}{{.T.l_createdate}} {{else}}　{{.T.releasetime}}{{end}}　　 （文章来源：<a style="font-size:14px; color:#0000FF;" target="_blank"  href="{{.T.s_url}}">{{.T.s_source}}</a>）</p>                 </div>
-							<div  style="font-size:14px; line-height:25px; width:90%; margin:auto;">
+							<div class="index-new-image" style="font-size:14px; line-height:25px; width:90%; margin:auto;">
 							    {{.T.s_content}}
 								<span style="display:none;">{{.T._id}}</span>
 								</div>
@@ -255,6 +258,7 @@ margin-top:-8px;
 		<option value="zh" {{if  eq .T.s_contenttype "zh"}} selected="selected" {{end}}> 展会 </option>
 		<option value="qtlm" {{if  eq .T.s_contenttype "qtlm"}} selected="selected" {{end}}> 其他栏目 </option>
 		<option value="wxlm" {{if  eq .T.s_contenttype "wxlm"}} selected="selected" {{end}}> 微信栏目 </option>
+		<option value="zhsk" {{if  eq .T.s_contenttype "zhsk"}} selected="selected" {{end}}> 知识库 </option>
 		</select>
 		</div>
 		</div>

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

@@ -7,7 +7,14 @@
 <style>
 
 .index-new-nva{  
-   box-shadow: #aaa 0px 0px 10px;  
+   	box-shadow: #aaa 0px 0px 10px; 
+}
+.index-new-chjhd{
+   	width:1200px;
+	margin:auto; 
+	margin-top:10px;
+	margin-bottom:10px;
+	
 }
 </style>
 </head>
@@ -24,12 +31,13 @@
 		</ul>
 	</div>
 </div>
-<div style="width:90%; margin:auto;">
+<div class="index-new-chjhd">{{.T.s_content}}</div>
+<div style="width:90%; margin:auto;" class="hidden">
 <!-- {{include "/common/head.html"}}-->
 <!-- 中间 -->
-<div class="row" style="width:96%; margin:0 auto;margin-top:10px;">
-		<div id="content" style="margin-left:0px;">
-			<div>{{.T.s_content}}</div>
+<div class="row " style="width:96%; margin:0 auto;margin-top:10px;">
+		<div id="content" style="margin-left:0px;background-color: rgb(240, 240, 240);">
+			
 			<!-- <div class="container-fluid">
 				<div style="margin-top:0px;" class="row-fluid">
 					<div class="span12">