merger time.task

core/src/qfw/front/index.go

@@ -64,7 +64,7 @@ func (i *Index) LoadIndex() error {
 			"query":       i.GetString("query")}
 		data, pagination := searhWebContent(querymap)
 		content, _ := i.Render4Cache("/index.html", &xweb.T{"data": data, "pagination": pagination})
-		//redis.Put("other", "/", string(content), 0) //设置首页缓存
+		redis.Put("other", "/", string(content), 0) //设置首页缓存
 		return i.SetBody(content)
 	}
 }

core/src/timetask.json

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

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

@@ -926,6 +926,7 @@ a{
 	font-size: 16px;
 	margin-bottom: 5px;
 	display: block;
+	padding-left:10px;
 }
 .a-index-hd>img{
 	width: 295px;
@@ -936,7 +937,7 @@ a{
 	height: 32px;
 	overflow: hidden;
 	position: absolute;
-	top: 101px;
+	top: 75px;
 	width: 100%;
 }
 .a-index-hd .smshb span{

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

@@ -41,7 +41,7 @@ a:focus, a:hover{
     display: inline-block;
 	width:38px;
 	height:38px;
-	border:1px solid #ccc;
+	border:1px solid #FF5A5F;
 	background-color:#FF5A5F;
 }
 .index-new-nva .a-h-search .input-group {
@@ -94,6 +94,8 @@ a:focus, a:hover{
 
 .a-index-head .a-i-h-right .a-index-want {
 	border:1px solid #E5E6E9;
+	margin-bottom: 10px;
+	background-color:#fff;
 }
 .index-new-row{
 	margin-top:20px;
@@ -150,7 +152,7 @@ a:focus, a:hover{
 	border:1px solid #E5E6E9;
 }
 .index-new-rmxq-list{
-	height:390px;
+	height:420px;
 }
 .index-new-fbfw-a{
 	padding:10;
@@ -163,7 +165,7 @@ a:focus, a:hover{
 .index-new-rmfw-remark a{
     font-size: 16px;
     color: #FFFFFF;
-}
+} 
 .index-new-rmfw-fgx{
 	border:1px solid #FF5A5F; 
 	margin-top:-70px;
@@ -292,7 +294,7 @@ a:focus, a:hover{
 }
 
 .index-new-head .a-i-h-right .a-index-hd img{
-	width:285px;
+	width:292px;
 }
 .a-index .a-index-want .a-com-two {
     margin: 20px 0px 40px;
@@ -314,6 +316,7 @@ a:focus, a:hover{
 .a-index-head .a-i-h-right .a-com-title {
 	background-color:#F7F8FA;
 	padding-left:10px;
+	border:1px solid rgb(240, 240, 240);
 }
 .index-new-body {
 	background-color:#f0f0f0;
@@ -331,11 +334,11 @@ a:focus, a:hover{
 	margin-top:-3px;
 }
 .a-index-head .a-i-h-right ul {
-	height:280px;
+	height:298px;
 	margin-bottom:20px;
 }
 .a-index .a-index-want .a-com-two {
-	margin:20px 5px 40px;
+	margin:30px 5px 40px;
 }
 .a-index .a-qysq-con{
 	width:100%;
@@ -375,10 +378,6 @@ a:focus, a:hover{
 .a-index-head .a-i-h-middle,.a-index-head .a-i-h-right{
 	height:438px;
 }
-.a-index-head .a-i-h-right ul {
-    height: 260px;
-    margin-bottom: 20px;
-}
 .a-index .index-new-head{
 	margin-bottom:-10px;
 }
@@ -390,6 +389,7 @@ a:focus, a:hover{
 .a-index .a-index-head .a-i-h-right {
 	padding-left:0px;
 	margin-left:10px;
+	background-color: #f0f0f0;
 }
 .a-index-head .a-i-h-middle .a-parent {
     margin-bottom: 5px;
@@ -399,7 +399,7 @@ a:focus, a:hover{
 	line-height:35px;
 }
 .index-new-rmxq-listcon{
-	height:390px;
+	height:420px;
     width:25%; 
     float:left;
 }
@@ -508,4 +508,11 @@ a:focus, a:hover{
 }
 .a-com-ul-block .index-new-xwzx-date,.a-com-ul-block .index-new-xwzx-content{
 	margin-top: 5px;
+}
+.index-new-rmxq-listimg img{
+	width:250px;
+	height:230px;
+}
+.b-round-dot{
+	background-color: rgb(255, 90, 95);
 }

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

@@ -452,8 +452,6 @@ function advertAjaxRqe(position){
 	});
 	if(data != ""){
 		$.post("/front/advertAjaxRqe",data,function(r){
-								console.info(r)
-
 			if(r.service){
 				var service = r.service;
 				for(var i in service){
@@ -477,7 +475,6 @@ function advertAjaxRqe(position){
 					}else if(status == 4){
 						html = '<span class="a-bg-gray">已撤销</span>';
 					}
-					console.info(html)
 					if(html != null){
 						$('#hotDemand [data-id="'+demand[i].id+'"] .a-com-last').html(html);
 					}
@@ -557,12 +554,12 @@ function b_loadTop(){
 				.mouseover(function(){
 					$("#head-hideMenu").show();
 				}).mouseleave(function(){
-					$("#head-hideMenu").hide();
+					//$("#head-hideMenu").hide();
 				});
 				$("#head-hideMenu").mouseover(function(){
 					$(this).show();
 				}).mouseleave(function(){
-					$(this).hide();
+					//$(this).hide();
 				});
 				//处理公用底部扫码登录按钮
 				$("#bottom-bar>li:first").addClass("invisible");

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

@@ -21,6 +21,11 @@
 <script>
 var _hmt = _hmt || [];
 (function() {
+	var bottomBarRight = (document.body.clientWidth - 1200) / 2 - 42;
+	if(bottomBarRight > 0){
+		$("#bottom-bar").css({right: bottomBarRight});
+	}
+	//
   	$("#backTop").click(function(){
 		$(window).scrollTop(0);
 	});

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

@@ -76,8 +76,8 @@
 	margin:0 0px 0 12px;	
 }
 .login-logo{
-	width: 161px;
-	height: 68px;
+	width: 156px;
+	height: 55px;
 	margin-left:150px;
 	margin-top:20px;
 }
@@ -290,7 +290,11 @@ function afterLoginSkip(){
 				window.location.href = window.location.href;
 			}else{
 				$('#loginModal').modal('hide');
-				reLoadTop();
+				try{
+					reLoadTop();
+				}catch(e){
+					b_loadTop();
+				}
 			}
 	}
 }

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

@@ -1,3 +1,4 @@
+{{include "/common/login.html"}}
 <link href="/css/swordfish.css" rel="stylesheet">
 <div class="b-head">
 	{{include "/common/top.html"}}

core/src/web/templates/index.html

@@ -32,8 +32,10 @@
 					{{$s:=(Ad "index-center-01" 4)}}
 					{{range $k,$v := $s}}
 					 <div class="item{{if eq $k 0}} active{{end}}">
+					{{if $v.s_link}}<a href="{{$v.s_link}}">{{end}}
 				         <img{{if $v.s_picalt}} alt="{{$v.s_picalt}}"{{end}} class="img-responsive" src="{{if $v.s_pic}}{{$v.s_pic}}{{else}}null{{end}}" onerror="this.src='/images/u166.png'">
-				    </div>
+					{{if $v.s_link}}</a>{{end}}
+					</div>
 					{{end}}
 			    </div>
 			</div>
@@ -53,7 +55,6 @@
 		<div class="a-i-h-right">
 			<ul class="a-index-want">
 				<li class="a-com-title hidden-xs"><b>我要</b></li>
-				<li class="a-com-title-line hidden-xs"></li>
 				<li class="font-size-12 a-com-last" id="iWant">
 					<div>
 						<img src="/images/zcgs.png">
@@ -82,7 +83,6 @@
 				</li>
 			</ul>
 			<div class="a-index-hd">
-				<b>活动</b>
 			</div>
 		</div>
 	</div>
@@ -101,7 +101,7 @@
 			{{range $k,$v := $s}}
 			<div style="{{if gt $k 0}} border-left:1px solid #E5E6E9; {{end}}" class="index-new-rmfw-listcon"  data-id="{{$v.s_id}}">
 			<div class="index-new-rmxq-listimg text-center">
-			<span class="index-new-spanqmfw" style="background-image:url({{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}});background-repeat:no-repeat;background-position:0px 0px;">
+			<span class="index-new-spanqmfw" style="background-image:url({{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}});background-repeat:no-repeat;background-position:0px 0px;background-size: 250px 230px;">
 			<div class="text-center index-new-rmfw-remarktitle"><span><a target="_blank" href="{{$v.s_link}}">{{$v.s_remark}}</a></span></div>
 			<div class="index-new-rmfw-nameent text-center"><span><a target="_blank" href="{{$v.s_link}}">{{$v.o_extend.entName}}</a></span></div>
 			<div class="index-new-rmfw-bg1 text-center"><span></span></div>
@@ -113,7 +113,7 @@
 	</div>
 	
 	<div class="a-panel a-rmxq">
-		<div class="a-com-title index-new-rmxq-title" style="margin-bottom:0px;border-top:0px;"><font><a id="indexHotDemand">热门需求</a></font><span class="hidden-xs">成为服务商，立刻抢单</span><span style="float:right;margin-top:10px;"><a href="/market/demand/add.html" class="index-new-fbfw-a">发布需求</a>|<a  href="/market/0/list.html" class="index-new-fbfw-a">更多>></a></span></div>
+		<div class="a-com-title index-new-rmxq-title" style="margin-bottom:0px;border-top:0px;"><font><a id="indexHotDemand">热门需求</a></font><span class="hidden-xs">成为服务商，马上参与投标</span><span style="float:right;margin-top:10px;"><a href="/market/demand/add.html" class="index-new-fbfw-a">发布需求</a>|<a  href="/market/0/list.html" class="index-new-fbfw-a">更多>></a></span></div>
 		<div class="row index-new-rmxq-list" id="hotDemand">
 			{{$s:=(Ad "index-center-05" 4)}}
 			{{range $k,$v := $s}}
@@ -169,7 +169,7 @@
 			<div class="index-new-wgw-listcon" >
 			<div class="index-new-wgw-listimg text-center">
 			<a target="_blank"  href="{{$v.s_link}}"></a>
-			<span class="index-new-spanqmfw" style="background-image:url({{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}});background-repeat:no-repeat;background-position:0px 0px;">
+			<span class="index-new-spanqmfw" style="background-image:url({{if $v.s_pic}}{{$v.s_pic}}{{else}}/images/u166.png{{end}});background-repeat:no-repeat;background-position:0px 0px;background-size: 250px 230px;">
 			
 			<div class="index-new-wgw-nameent text-center"><span><a target="_blank" href="{{$v.s_link}}">{{$v.o_extend.entName}}</a></span></div>
 			<div class="index-new-wgw-bg1 text-center"><span></span></div>
@@ -292,6 +292,7 @@ $(function(){
 			if(typeof($(this).children("img")) == "undefined"){
 				return;
 			}
+			$(this).children("a").css("color","FF5A5F");
 			oldImgSrc = $(this).children("img").attr("src");
 			$(this).children("img").attr("src",oldImgSrc.split(".")[0]+"-a."+oldImgSrc.split(".")[1]);
 		}).mouseout(function(){
@@ -299,6 +300,7 @@ $(function(){
 				return;
 			}
 			$(this).children("img").attr("src",oldImgSrc);
+			$(this).children("a").css("color","000");
 		});
 	}
 	$("#iWant>div").click(function(){