wangshan 9 vuotta sitten
vanhempi
commit
86ccdb07ea
2 muutettua tiedostoa jossa 12 lisäystä ja 9 poistoa
  1. 1 1
      core/src/timetask.json
  2. 11 8
      core/src/web/templates/service/viewsingledemand.html

+ 1 - 1
core/src/timetask.json

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

+ 11 - 8
core/src/web/templates/service/viewsingledemand.html

@@ -55,12 +55,7 @@
 			.xq-introduction{
 				height:38px;overflow: hidden;text-overflow: ellipsis;margin-top: 10px;
 			}
-			.xq-introduction p{
-				font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif  !important;
-				line-height:20px !important;
-				color:#999 !important; 
-			}
-			.xq-introduction span{
+			.xq-introduction p,.xq-introduction span,.xq-introduction{
 				font-family: tahoma, arial, 'Hiragino Sans GB', 'Microsoft YaHei', 宋体, sans-serif  !important;
 				line-height:20px !important;
 				color:#999 !important; 
@@ -85,6 +80,10 @@
 				border-bottom: 1px solid #f0f0f0;
 				margin: 20px 0px;
 			}
+			.xq-endtime{
+				padding-top: 4px;
+				color:#999;
+			}
 		</style>
 		    {{include "/common/inc.html"}}
     <!-- extra CSS -->
@@ -303,20 +302,24 @@
 	$(function(){
 		 paging = new Paging("demandPaging","/market/demand/list",{id:{{.T.demandInfo.s_enterpriseid}}},5,function(r){
 			var html = '';
+			var regS = new RegExp("\\/","g");
 			for(var i=0; i< r.length;i++){
 				var status = "";
+				var enttime = ""
 				if (r[i].i_status == 1){
 					status = "<img src='/images/u288.png'/>"
+					enttime = '<div class="xq-endtime"><span>投标截止时间:</span>'+new Date(r[i].l_enddate*1000).toLocaleString().substr(0,10).replace(regS,'-')+'</div>' 
 				}else if(r[i].i_status == 2){
 					status = "<img src='/images/u252.png'/>"
 				}else{
 					status = "<span class='a-bg-gray-new'>任务超时</span>"
-				}
+				} 
 				html +='<div  data-id="'+r[i]._id+'" class="xq-list">'
 						+'<div class="xq-img"><img src="'+r[i].s_image+'"></div>'
 						+'<div class="xq-intro"><div>'
 						+'<div class="xq-title"><a href="/market/demandview/'+r[i]._id+'.html">'+r[i].s_name+'</a></div>'
-						+'<div class="xq-state">'+status+'</div>'
+						+'<div class="xq-state"><div>'+status+'</div>'
+						+enttime+'</div>'
 						+'<div style="clear:both;"></div></div>'
 						+'<div class="xq-introduction">'+r[i].s_introduction+'</div></div>'
 						+'<div style="clear:both;"></div></div>';