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 15:41:08"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-09 15:41:08"}},"marketisstart":true,"marketrate":300}
+{"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}

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;

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

@@ -508,4 +508,8 @@ 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;
 }

core/src/web/templates/index.html

@@ -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>
@@ -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>