Quellcode durchsuchen

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

zhanghongbo vor 9 Jahren
Ursprung
Commit
16c2a40837

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

@@ -1,4 +1,4 @@
-<html>
+<html>
 <head>
 <title>{{Msg "seo" "qfw.market.title"}}</title>
 {{include "/common/inc.html"}}
@@ -54,6 +54,30 @@
 	.text-primary{
 		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>
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
@@ -203,14 +227,16 @@
 				{{if eq "demand" $.T.querymap.c_searchtype}}
 					<div class="col-sm-2 col-xs-4" style="margin-left:10px;">
 					{{if eq $v.i_status 1.0 }}
-						<img src="/images/u288.png" />
+						<div class="d-bg-blue">投标中&nbsp;&nbsp;</div>
 					{{else}}
 						{{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}}
 					
-					<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>
 				{{end}}
 				{{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>
 </body>
 </html>

+ 4 - 4
core/src/web/templates/service/viewsingledemand.html

@@ -1,4 +1,4 @@
-<html>
+<html>
   <head>
     <title>{{.T.demandInfo.s_name}}_{{Msg "seo" "qfw.market.title"}}</title>
     <meta charset="utf-8" />
@@ -87,9 +87,9 @@
 							{{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 a-bg-gray-new">任务超时</span>
+							<span class="a-bg-gray-new">任务超时</span>
 							{{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}}
 							<small class="text-primary ">{{.T.demandInfo.servicetypename}}</small>
 				 			{{if .T.edit}}
@@ -226,7 +226,7 @@
 							<td width="10%" align="center">操作</td>
 							{{else}}
 							<td width="85%">服务商名称</td>
-							<td	width="15%" align="center">状态</td>
+							<td	width="15%" align="left" style="padding-left:30px;">状态</td>
 							{{end}}
 						</tr>
 						<tr>

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

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

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

@@ -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[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].Type = MenuButtonTypeUrl
 	menu.Buttons[2].SubButtons[2].Url = fmt.Sprintf(urlstr, "lawsearchaction")