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

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:27:05"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 16:27:05"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-09 16:43:16"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 16:43:16"}},"marketisstart":true,"marketrate":300}

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

@@ -150,7 +150,7 @@ a:focus, a:hover{
 	border:1px solid #E5E6E9;
 }
 .index-new-rmxq-list{
-	height:390px;
+	height:420px;
 }
 .index-new-fbfw-a{
 	padding:10;
@@ -399,7 +399,7 @@ a:focus, a:hover{
 	line-height:35px;
 }
 .index-new-rmxq-listcon{
-	height:390px;
+	height:420px;
     width:25%; 
     float:left;
 }

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);
 					}

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

@@ -290,7 +290,11 @@ function afterLoginSkip(){
 				window.location.href = window.location.href;
 			}else{
 				$('#loginModal').modal('hide');
-				reLoadTop();
+				try{
+					reLoadTop();
+				}catch(e){
+					b_loadTop();
+				}
 			}
 	}
 }