Página Principal Explorar Ajuda
Iniciar Sessão
qmx
/
qfw
7
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

服务市场 & 微信

李广朋 há 9 anos atrás
pai
07d020df29
commit
9d93efcd89
4 ficheiros alterados com 75 adições e 21 exclusões
Visão Unificada Mostrar Estatísticas Diff
  1. 45 4
      core/src/web/templates/service/list.html
  2. 21 15
      core/src/web/templates/service/viewsingledemand.html
  3. 4 0
      weixin/src/qfw/weixin/clickhandler.go
  4. 5 2
      weixin/src/qfw/weixin/menu.go

+ 45 - 4
core/src/web/templates/service/list.html
Ver Ficheiro 

@@ -1,4 +1,4 @@
 
-<html>
 
+<html>
 
 <head>
 
 <head>
 
 <title>{{Msg "seo" "qfw.market.title"}}</title>
 
 <title>{{Msg "seo" "qfw.market.title"}}</title>
 
 {{include "/common/inc.html"}}
 
 {{include "/common/inc.html"}}
 
@@ -54,6 +54,30 @@
 
 	.text-primary{
 
 	.text-primary{
 
 		color:#FF5A5F !important;
 
 		color:#FF5A5F !important;
 
 	}
 
 	}
 
+	.d-bg-green{
 
+		background-image:url(/images/tbn8.png);
 
+	}
 
+	.d-bg-gray{
 
+		background-image:url(/images/tbn9.png);
 
+	}
 
+	.d-bg-blue{
 
+		background-image:url(/images/tbn7.png);
 
+	}
 
+	.d-bg-green, .d-bg-gray,.d-bg-blue{
 
+		width:81px;
 
+		height:21px;
 
+		padding-left:8px;
 
+		color:#FFF;
 
+		padding-left:-10px;;
 
+		position: static !important;
 
+		left: 0px;
 
+		right: 0px;
 
+		bottom: 0px;
 
+		text-overflow: none;
 
+		overflow: none;
 
+		white-space: nowrap;
 
+		line-height:21px !important;
 
+	}
 
 </style>
 
 </style>
 
 <link href="/css/index-new.css" rel="stylesheet">
 
 <link href="/css/index-new.css" rel="stylesheet">
 
 </head>
 
 </head>
 
@@ -203,14 +227,16 @@
 
 				{{if eq "demand" $.T.querymap.c_searchtype}}
 
 				{{if eq "demand" $.T.querymap.c_searchtype}}
 
 					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
 
 					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
 
 					{{if eq $v.i_status 1.0 }}
 
 					{{if eq $v.i_status 1.0 }}
 
-						<img src="/images/u288.png" />
 
+						<div class="d-bg-blue">投标中&nbsp;&nbsp;</div>
 
 					{{else}}
 
 					{{else}}
 
 						{{if eq $v.i_status 2.0}}
 
 						{{if eq $v.i_status 2.0}}
 
-						<img src="/images/u252.png" />
 
+							<div class="d-bg-green">圆满结束&nbsp;&nbsp;</div>
 
+						{{else}}
 
+							<div class="d-bg-green">任务超时&nbsp;&nbsp;</div>
 
 						{{end}}
 
 						{{end}}
 
 					{{end}}
 
 					{{end}}
 
 					
 					
-					<div style="position: absolute;width: 180px;height: 20px;overflow: hidden;color:#A0A0A0;">投标截止时间：{{$v.l_enddate}}</div>
 
+					<div style="position: absolute;width: 180px;height: 20px;overflow: hidden;color:#A0A0A0;">投标截止时间：<span>{{$v.l_enddate}}</span></div>
 
 					</div>
 
 					</div>
 
 				{{end}}
 
 				{{end}}
 
 				{{if eq "service" $.T.querymap.c_searchtype}}
 
 				{{if eq "service" $.T.querymap.c_searchtype}}
 
@@ -347,6 +373,21 @@
 
 			}
 
 			}
 
 		}
 
 		}
 
 	}
 
 	}
 
+	$(function(){
 
+		$(".d-bg-blue").each(function(n,b){
 
+			var node=$(b).next();
 
+			var datestr=node.find("span").text()
 
+			var date=new Date(datestr)
 
+			var datenow=new Date();
 
+			date.setHours(23);
 
+			date.setMinutes(59);
 
+			date.setSeconds(59);
 
+			if(datenow.getTime()>date.getTime()){
 
+				$(b).attr("class","d-bg-gray");
 
+				$(b).text("任务超时");
 
+			}
 
+		});
 
+	})
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 21 - 15
core/src/web/templates/service/viewsingledemand.html
Ver Ficheiro 

@@ -1,4 +1,4 @@
 
-<html>
 
+<html>
 
   <head>
 
   <head>
 
     <title>{{.T.demandInfo.s_name}}_{{Msg "seo" "qfw.market.title"}}</title>
 
     <title>{{.T.demandInfo.s_name}}_{{Msg "seo" "qfw.market.title"}}</title>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
@@ -37,8 +37,9 @@
 
 			.d-bg-green, .d-bg-gray,.d-bg-blue{
 
 			.d-bg-green, .d-bg-gray,.d-bg-blue{
 
 				width:81px;
 
 				width:81px;
 
 				height:21px;
 
 				height:21px;
 
+				padding-left:8px;
 
 				color:#FFF;
 
 				color:#FFF;
 
-				padding-left:0px;;
 
+				padding-left:-10px;;
 
 				position: static !important;
 
 				position: static !important;
 
 				left: 0px;
 
 				left: 0px;
 
 				right: 0px;
 
 				right: 0px;
 
@@ -86,9 +87,9 @@
 
 							{{else if eq .T.demandInfo.i_status 2}}
 
 							{{else if eq .T.demandInfo.i_status 2}}
 
 							<img src="/images/u252.png"/>
 
 							<img src="/images/u252.png"/>
 
 							{{else if eq .T.demandInfo.i_status 3}}
 
 							{{else if eq .T.demandInfo.i_status 3}}
 
-							<span class="a-bg-gray a-bg-gray-new">任务超时</span>
 
+							<span class="a-bg-gray-new">任务超时</span>
 
 							{{else if eq .T.demandInfo.i_status 4}}
 
 							{{else if eq .T.demandInfo.i_status 4}}
 
-							<span class="a-bg-gray  a-bg-gray-new">已撤销</span>
 
+							<span class=" a-bg-gray-new">已撤销</span>
 
 							{{end}}
 
 							{{end}}
 
 							<small class="text-primary ">{{.T.demandInfo.servicetypename}}</small>
 
 							<small class="text-primary ">{{.T.demandInfo.servicetypename}}</small>
 
 				 			{{if .T.edit}}
 
 				 			{{if .T.edit}}
 
@@ -225,7 +226,7 @@
 
 							<td width="10%" align="center">操作</td>
 
 							<td width="10%" align="center">操作</td>
 
 							{{else}}
 
 							{{else}}
 
 							<td width="85%">服务商名称</td>
 
 							<td width="85%">服务商名称</td>
 
-							<td	width="15%" align="center">状态</td>
 
+							<td	width="15%" align="left" style="padding-left:30px;">状态</td>
 
 							{{end}}
 
 							{{end}}
 
 						</tr>
 
 						</tr>
 
 						<tr>
 
 						<tr>
 
@@ -288,37 +289,37 @@
 
 						}
 
 						}
 
 						html += '<td align="center"><div><span  class="price" title="'+r[i].f_price+'">'+price+'</span></div></td>'
 
 						html += '<td align="center"><div><span  class="price" title="'+r[i].f_price+'">'+price+'</span></div></td>'
 
 								+'<td align="center"><div><span title="'+r[i].s_person+'/'+r[i].s_phone+'">'+r[i].s_person+'/'+r[i].s_phone+'</span></div></td>'
 
 								+'<td align="center"><div><span title="'+r[i].s_person+'/'+r[i].s_phone+'">'+r[i].s_person+'/'+r[i].s_phone+'</span></div></td>'
 
-						  		+'<td align="center"><div><span title="'+r[i].s_remarks+'">'+r[i].s_remarks+'</span></div></td>';
 
+						  		+'<td align="center"><div><span title="'+r[i].s_remarks+'" class="s_remarks" style="cursor:pointer;">'+r[i].s_remarks+'</span></div></td>';
 
 					}
 
 					}
 
-					html += '<td class="a-table-status" align="center">';
 
+					html += '<td class="a-table-status" align="left">';
 
 					if("{{.T.demandInfo.i_status}}" == 3){
 
 					if("{{.T.demandInfo.i_status}}" == 3){
 
 						html += '<div class="d-bg-gray">任务超时</div>';
 
 						html += '<div class="d-bg-gray">任务超时</div>';
 
 					}else{
 
 					}else{
 
 						var i_status = r[i].i_status;
 
 						var i_status = r[i].i_status;
 
 						switch(i_status){
 
 						switch(i_status){
 
 							case 1:
 
 							case 1:
 
-								html += '<div class="d-bg-blue">等待选标</div>';
 
+								html += '<div class="d-bg-blue">等待选标&nbsp;&nbsp;</div>';
 
 								break;
 
 								break;
 
 							case 2:
 
 							case 2:
 
-								html += '<div class="d-bg-gray">已拒绝</div>';
 
+								html += '<div class="d-bg-gray">已拒绝&nbsp;&nbsp;</div>';
 
 								break;
 
 								break;
 
 							case 3:
 
 							case 3:
 
-								html += '<div class="d-bg-green">已接受</div>';
 
+								html += '<div class="d-bg-green">已接受&nbsp;&nbsp;</div>';
 
 								break;
 
 								break;
 
 							case 4:
 
 							case 4:
 
-								html += '<div class="d-bg-gray">未采纳</div>';
 
+								html += '<div class="d-bg-gray">未采纳&nbsp;&nbsp;</div>';
 
 								break;
 
 								break;
 
 							case 5:
 
 							case 5:
 
-								html += '<span class="a-bg-red">已评价</span>';
 
+								html += '<span class="a-bg-red">已评价&nbsp;&nbsp;</span>';
 
 								break;
 
 								break;
 
 							case 6:
 
 							case 6:
 
-								html += '<span class="a-bg-red">已追评</span>';
 
+								html += '<span class="a-bg-red">已追评&nbsp;&nbsp;</span>';
 
 								break;
 
 								break;
 
 							case 7:
 
 							case 7:
 
-								html+= '<div class="d-bg-gray">已撤销</div>';
 
+								html+= '<div class="d-bg-gray">已撤销&nbsp;&nbsp;</div>';
 
 								break;
 
 								break;
 
 							case 8:
 
 							case 8:
 
-								html+= '<div class="d-bg-gray">已</div>';
 
+								html+= '<div class="d-bg-gray">已删除</div>';
 
 								break;
 
 								break;
 
 							default:
 
 							default:
 
 								html += '&nbsp';
 
 								html += '&nbsp';
 
@@ -355,6 +356,10 @@
 
 				}
 
 				}
 
 				$("#quote #tableTitle").nextAll("[data-id]").remove();
 
 				$("#quote #tableTitle").nextAll("[data-id]").remove();
 
 				$("#quote #tableTitle").after(html);
 
 				$("#quote #tableTitle").after(html);
 
+				if($(".s_remarks").text().length>15){
 
+					$(".s_remarks").attr("title",$(".s_remarks").text());
 
+					 $(".s_remarks").text($(".s_remarks").text().substr(0,15)+"...");
 
+				}
 
 				$('[data-toggle="tooltip"]').tooltip();
 
 				$('[data-toggle="tooltip"]').tooltip();
 
 				var changeStatus = function(id,demandId,status){
 
 				var changeStatus = function(id,demandId,status){
 
 					$.post("/member/bidManage/changeStatus",{id:id,demandId:demandId,status:status},function(r){
 
 					$.post("/member/bidManage/changeStatus",{id:id,demandId:demandId,status:status},function(r){
 
@@ -392,6 +397,7 @@
 
 					changeStatus(dataObj.attr("data-id"),dataObj.attr("data-demandid"),2);
 
 					changeStatus(dataObj.attr("data-id"),dataObj.attr("data-demandid"),2);
 
 				});
 
 				});
 
 			});
 
 			});
 
+			
 		});
 
 		});
 
 		function sreply(n,t){
 
 		function sreply(n,t){
 
 			//添加回复框
 
 			//添加回复框

+ 4 - 0
weixin/src/qfw/weixin/clickhandler.go
Ver Ficheiro 

@@ -103,6 +103,10 @@ func ClickHandler(w ResponseWriter, r *Request) {
 
 					Url:         "http://" + wf.SysConfig.Domain + "/swordfish/msgpushsetting/" + r.FromUserName}})
 
 					Url:         "http://" + wf.SysConfig.Domain + "/swordfish/msgpushsetting/" + r.FromUserName}})
 
 			}
 
 			}
 
 		**/
 
 		**/
 
+		case "entsearch":
 
+			{
 
+				w.ReplyText("抱歉!系统后台维护中，我们将尽快恢复。")
 
+			}
 
 		default:
 
 		default:
 
 			{
 
 			{
 
 				w.ReplyOK()
 
 				w.ReplyOK()

+ 5 - 2
weixin/src/qfw/weixin/menu.go
Ver Ficheiro 

@@ -38,8 +38,11 @@ func CreateMenu(rw http.ResponseWriter, r *http.Request) {
 
 	menu.Buttons[2].SubButtons[0].Key = "msite" //"http://" + wf.SysConfig.Domain + "/weixin/site/edit" //微官网编辑
 
 	menu.Buttons[2].SubButtons[0].Key = "msite" //"http://" + wf.SysConfig.Domain + "/weixin/site/edit" //微官网编辑
 
 
 
 	menu.Buttons[2].SubButtons[1].Name = "企业查询"
 
 	menu.Buttons[2].SubButtons[1].Name = "企业查询"
 
-	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeUrl ///search/enterprise/m_ent.html
 
-	menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "entsearchaction")
 
+	//menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeUrl ///search/enterprise/m_ent.html
 
+	//menu.Buttons[2].SubButtons[1].Url = fmt.Sprintf(urlstr, "entsearchaction")
 
+	menu.Buttons[2].SubButtons[1].Type = MenuButtonTypeKey
 
+	menu.Buttons[2].SubButtons[1].Key = "entsearch"
 
+
 
 	menu.Buttons[2].SubButtons[2].Name = "法规查询"
 
 	menu.Buttons[2].SubButtons[2].Name = "法规查询"
 
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
 
 	menu.Buttons[2].SubButtons[2].Type = MenuButtonTypeUrl
 
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")
 
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")