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

core/src/web/templates/service/viewsingledemand.html

@@ -25,6 +25,7 @@
     {{include "/common/login.html"}}
 	{{include "/common/indexhead.html"}}
     <div class="container-fluid a-content">
+		
       <div class="a-c-left" style="background:#FFF;margin-top:10px;width:940px;">
         <div class="container" style="padding:30px 30px 30px 60px;width:100%;">
 					<div class="hidden-xs col-sm-4" >
@@ -47,13 +48,14 @@
 							{{else if eq .T.demandInfo.i_status 2}}
 							<img src="/images/u252.png"/>
 							{{else if eq .T.demandInfo.i_status 3}}
-							<span class="a-bg-gray">任务超时</span>
+							<span class="a-bg-gray a-bg-gray-new">任务超时</span>
 							{{else if eq .T.demandInfo.i_status 4}}
 							<span class="a-bg-gray">已撤销</span>
 							{{end}}
 				 			{{if .T.edit}}
 							<span>
-								<a style="font-size:14px;color:#3a87ad;font-weight:400;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
+								<!-- <a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;" onclick="remove1('{{.T.demandInfo._id}}');">删除</a> -->
+								<a class="btn btn-primary" style="font-size:14px;font-weight:400;float:right;margin-right:5px;" href="/market/demand/{{.T.demandInfo._id}}.html">编辑</a>
 							</span>
 				 			{{end}}
 						</div>
@@ -251,21 +253,21 @@
 					}
 					html += '<td class="a-table-status" align="center">';
 					if("{{.T.demandInfo.i_status}}" == 3){
-						html += '<span class="a-bg-gray">任务超时</span>';
+						html += '<div class="d-bg-gray">任务超时</div>';
 					}else{
 						var i_status = r[i].i_status;
 						switch(i_status){
 							case 1:
-								html += '<span class="a-bg-blue">等待选标</span>';
+								html += '<div class="d-bg-blue">等待选标</div>';
 								break;
 							case 2:
-								html += '<span class="a-bg-gray">已拒绝</span>';
+								html += '<div class="d-bg-gray">已拒绝</div>';
 								break;
 							case 3:
-								html += '<span class="a-bg-green">已接受</span>';
+								html += '<div class="d-bg-green">已接受</div>';
 								break;
 							case 4:
-								html += '<span class="a-bg-gray">未采纳</span>';
+								html += '<div class="d-bg-gray">未采纳</div>';
 								break;
 							case 5:
 								html += '<span class="a-bg-red">已评价</span>';
@@ -274,10 +276,10 @@
 								html += '<span class="a-bg-red">已追评</span>';
 								break;
 							case 7:
-								html+= '<span class="a-bg-gray">已撤销</span>';
+								html+= '<div class="d-bg-gray">已撤销</div>';
 								break;
 							case 8:
-								html+= '<span class="a-bg-gray">已撤销</span>';
+								html+= '<div class="d-bg-gray">已</div>';
 								break;
 							default:
 								html += '&nbsp';
@@ -465,6 +467,24 @@
 		})
 }
 {{end}}
+function remove1(id){
+	var data={
+		"id":id
+	}
+	$.ajax({
+		url:"/member/bidManage/revoke",
+		method:"post",
+		data:data,
+		success:function(n){
+			if (n.result=="y"){
+				alert("删除成功");
+				window.location.href="/";
+			}else{
+				alert("删除失败");
+			}
+		}
+	});
+}
 	</script>
 	{{include "/common/bottom.html"}}
   </body>