瀏覽代碼

supersearch add power

[wangkaiyue] 8 年之前
父節點
當前提交
1e7ef035e1

+ 2 - 1
.gitignore

@@ -5,4 +5,5 @@ bin
 *.log
 */src/src
 *.data
-*/bin
+*/bin
+.idea

+ 7 - 3
src/jfw/front/search.go

@@ -23,9 +23,6 @@ func init() {
 	xweb.AddAction(&Search{})
 }
 func (s *Search) MainSearch() error {
-	if s.Session().Get("s_m_openid") == nil {
-		return s.Redirect("/swordfish/about")
-	}
 	if userid := s.GetSession("userId"); userid != nil {
 		history := redis.GetStr("other", "s_"+userid.(string))
 		arrs := strings.Split(history, ",")
@@ -55,6 +52,8 @@ func (s *Search) MainSearch() error {
 		myopenid := s.Session().Get("s_m_openid")
 		s.T["open_supersearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_supersearch")
 		s.T["open_entsesearch"] = jylabutil.IsAuthorized(myopenid.(string), "i_entsesearch")
+	}else{
+		return s.Redirect("/swordfish/about")
 	}
 	return s.Render("/weixin/search/mainSearch.html", &s.T)
 }
@@ -126,6 +125,11 @@ func (m *Search) SuperSearch() error {
 		industry, sortArray := getindustrys()
 		m.T["industry"] = industry
 		m.T["sortArray"] = sortArray
+		//判断是否开启超级搜索or中标搜索
+		m.T["open_supersearch"] = jylabutil.IsAuthorized(myopenid, "i_supersearch")
+		//m.T["open_entsesearch"] = jylabutil.IsAuthorized(myopenid, "i_entsesearch")
+	}else{
+		return m.Redirect("/swordfish/about")
 	}
 	return m.Render("/weixin/search/superSearch.html", &m.T)
 }

+ 2 - 0
src/web/staticres/css/search/superSearch.css

@@ -1316,6 +1316,7 @@
 	width: 45%;
 	line-height: 30px;
 	padding: 0px 0px 0px 5px;
+	text-align: center;
 }
 .jypt-dialog .jypt-timeinputs{
 	margin-top: 10px;
@@ -1413,6 +1414,7 @@
 	left:55%;
 }
 .money-inp .min-price span,.money-inp .max-price span{
+	color: black;
 	position:absolute;
 	top: 0%;
 	left:71%;

+ 0 - 1711
src/web/staticres/wxswordfish/superSearch.css

@@ -1,1711 +0,0 @@
-@import url(/css/common.css);
-/**************/
-.operation{
-	margin-bottom: 20px;
-}
-.operation>.parent-node{
-	background-color: #F8F8F8;
-	width: 100%;
-	height: 45px;
-	line-height: 45px;
-	border-bottom: 1px solid #CCCCCC;
-	position: relative;
-	font-size: 16px;
-}
-.parent-node-view{
-	width: 100%;
-	height: 50px;
-	line-height: 50px;
-	font-size: 16px;
-	text-align:center;
-}
-.operation>.parent-node>img{
-	margin-left: 15px;
-	margin-right: 10px;
-	width: 18px;
-	height: 18px;
-}
-.operation>.parent-node>span img{
-	position: absolute;
-	top: 40%;
-	left: 50%;
-}
-.operation>.parent-node>span{
-	display: block;
-	width: 60px;
-	height: 40px;
-	margin-top: -17px;
-	right: 10px;
-	position: absolute;
-	top: 50%;
-}
-.operation>.parent-node:last-child>span{
-	margin-top: -23px;
-}
-.operation>.parent-node>.on-off{
-	background-image: url("/wxswordfish/images/off.png");
-	background-size: 100% 100%;
-}
-
-.rule-content div{
-	height:30px;
-}
-.operation .on-off.open{
-	background-image: url("/wxswordfish/images/on.png");
-	right: 3px;
-	width: 62px;
-}
-.operation .btn-right img{
-	width: 15px;
-	height: 22px;
-	margin-top: -8.5px;
-	margin-left: -5px;
-}
-.operation .child-node{
-	padding: 0px 15px;
-	display: none;
-}
-.operation .child-node li{
-	border-bottom: 1px solid #ddd;
-	padding: 15px 10px;
-}
-
-.operation .child-node img{
-	width: 8px;
-	height: 15px;
-	float: right;
-	margin-right: 20px;
-	margin-top: 4px;
-}
-.operation .child-node li>div:first-child{
-	
-}
-.operation .child-node .com-last{
-	font-size: 15px;
-    padding-top: 15px;
-	color: #999;
-	margin-left: 38px;
-	margin-right: 20px;
-	line-height: 22px;
-}
-.operation .child-node .jycom-last{
-	font-size: 15px;
-    padding-top: 18px;
-	color: #686868;
-	margin-left: 38px;
-}
-/*弹出框*/
-.dialog{
-	position: absolute;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	top: 0px;
-	background-color: rgba(0,0,1,.5);
-	display: none;
-	z-index: 99999;
-}
-.dialog-main{
-	position: absolute;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	background-color: #ffffff;
-}
-.dialog-head{
-	width: 100%;
-	display: table;
-	height: 50px;
-	line-height: 50px;
-	border-bottom: 1px solid #CCCCCC;
-	background-color: #F4F4F9;
-}
-.dialog-head>div{
-	display: table-cell;
-	padding-left: 10px;
-	padding-right: 10px;
-}
-.dialog-head>div:first-child{
-	font-size: 18px;
-	width: 80%;
-}
-.dialog-head>div:first-child>span{
-	font-size: 14px;
-	color: #999;
-	margin-left: 5px;
-}
-.dialog-head>div:last-child{
-	font-size: 16px;
-	text-align: right;
-	color: #2CB7CA;
-	width: 20%;
-}
-.dialog-head>div:last-child>span{
-	padding: 10px 0px 10px 10px;
-}
-.dialog-content{
-	padding: 0 10px 10px 10px;
-	border-bottom: 1px solid #CCCCCC;
-	overflow-y: auto;
-}
-/*关键字*/
-.keyword-dialog .dialog-content{
-	padding-left: 0px;
-	padding-right: 0px;
-}
-.keyword-dialog .dialog-content>div{
-	display: table;
-	width: 100%;
-	height: 50px;
-	line-height: 50px;
-	margin-bottom: 10px;
-}
-.keyword-dialog .dialog-content>div>*{
-	display: table-cell;
-}
-.keyword-dialog .dialog-content>div>*:first-child{
-	width: 20%;
-	text-align: right;
-}
-.keyword-dialog .dialog-content>div>*:nth-child(2){
-	width: 70%;
-	padding: 0px 10px;
-}
-.keyword-dialog .dialog-content>div>*:nth-child(2)>[type="text"]{
-	width: 100%;
-	height: 90%;
-	font-size: inherit;
-}
-.keyword-dialog .dialog-content>div>*:last-child{
-	width: 10%;
-}
-.keyword-dialog .delete{
-	width: 20px;
-	height: 20px;
-}
-.addKeyWord{
-	padding-left: 10px;
-    width: 160px;
-    height: 45px;
-    font-size: 18px;
-	background-color:#2CB7CA;
-}
-.addKeyWord>.icon{
-	font-size: 25px;
-	position: absolute;
-	left: 10px;
-	top: 0px;
-}
-/***信息范围***/
-.scope-dialog .dialog-content{
-	padding-top: 0px;
-	padding-bottom: 0px;
-}
-.scope-dialog li>div{
-	clear: both;
-}
-.scope-dialog .btn{
-	padding: 5px 10px;
-	background-color: #F0F0F0;
-	color: #333;
-	font-size: 14px;
-	margin-right: 10px;
-	margin-bottom: 10px;
-	width: 69px;
-	float: left;
-	height:34px;
-    border-radius: 3px;
-}
-.scope-dialog .btn.active{
-	background-color: #24C0D7;
-	color: #FFFFFF;
-}
-.scope-dialog li{
-	border-bottom: 1px solid #ddd;
-	padding-top: 10px;
-	float: left;
-	width: 100%;
-}
-.scope-dialog li:last-child{
-	border-bottom-width: 0px;
-}
-.scope-dialog li>div{
-	font-size: 14px;
-	margin-bottom: 10px;
-}
-/**引导页**/
-.swiper-pagination{
-	top: 80px !important;
-	transition: 0ms !important;
-	-webkit-transition: 0ms !important;
-}
-.swiper-pagination-bullet{
-	margin-bottom: 15px !important;
-}
-.swiper-slide{
-	text-align: center;
-	z-index: -1;
-	background: #ffffff;
-	position: absolute !important;
-}
-.swiper-slide-active{
-	z-index: 2;
-}
-.slide-active{
-	z-index: 0;
-}
-.slide-down{
-	z-index: 2;
-	/* Firefox: 
-	-moz-animation-name:slidedown;
-	-moz-animation-duration:0.5s;
-	-moz-animation-timing-function:ease-in;
-	-moz-animation-iteration-count:1;
-	-moz-animation-play-state:running; */
-	/* Safari and Chrome:
-	-webkit-animation-name:slidedown;
-	-webkit-animation-duration:0.5s;
-	-webkit-animation-timing-function:ease-in;
-	-webkit-animation-iteration-count:1;
-	-webkit-animation-play-state:running; */
-	/* Opera:
-	-o-animation-name:slidedown;
-	-o-animation-duration:0.5s;
-	-o-animation-timing-function:ease-in;
-	-o-animation-iteration-count:1;
-	-o-animation-play-state:running;
-	webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);*/
-}
-@-webkit-keyframes slidedown {
-	0%{
-		top: -100%;
-	}
-	100% {
-		top: 0px;
-	}
-}
-.slide-up{
-	z-index: 2;
-	/* Firefox: 
-	-moz-animation-name:slideup;
-	-moz-animation-duration:0.5s;
-	-moz-animation-timing-function:ease-in;
-	-moz-animation-iteration-count:1;
-	-moz-animation-play-state:running;*/
-	/* Safari and Chrome: 
-	-webkit-animation-name:slideup;
-	-webkit-animation-duration:0.5s;
-	-webkit-animation-timing-function:ease-in;
-	-webkit-animation-iteration-count:1;
-	-webkit-animation-play-state:running;*/
-	/* Opera: 
-	-o-animation-name:slideup;
-	-o-animation-duration:0.5s;
-	-o-animation-timing-function:ease-in;
-	-o-animation-iteration-count:1;
-	-o-animation-play-state:running;
-	webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);*/
-}
-
-@-webkit-keyframes slideup {
-	0%{
-		top: 100%;
-	}
-	100% {
-		top: 0px;
-	}
-}
-.swiper-slide img{
-	/*position: relative;
-	top: 50%;
-	margin-top: -302px;*/
-	width: 100%;
-	height: 100%;
-}
-.swiper-pagination-bullet-active{
-	background-color: #35c5da !important;
-}
-.swiper-pagination-bullet{
-	opacity: .1;
-}
-.guide-bottom{
-	position: absolute;
-	bottom: 10px;
-	text-align: center;
-	width: 100%;
-	z-index: 99999;
-}
-.guide-bottom .arrow-up{
-	width: 30px;
-	height: 20px;
-	animation-name:start;
-	animation-duration:2s;
-	animation-timing-function:ease-in-out;
-	animation-iteration-count:infinite;
-	animation-play-state:running;
-	/* Firefox: */
-	-moz-animation-name:start;
-	-moz-animation-duration:2s;
-	-moz-animation-timing-function:ease-in-out;
-	-moz-animation-iteration-count:infinite;
-	-moz-animation-play-state:running;
-	/* Safari and Chrome: */
-	-webkit-animation-name:start;
-	-webkit-animation-duration:2s;
-	-webkit-animation-timing-function:ease-in-out;
-	-webkit-animation-iteration-count:infinite;
-	-webkit-animation-play-state:running;
-	/* Opera: */
-	-o-animation-name:start;
-	-o-animation-duration:2s;
-	-o-animation-timing-function:ease-in-out;
-	-o-animation-iteration-count:infinite;
-	-o-animation-play-state:running;
-}
-
-@-webkit-keyframes start {
-	0%{
-		opacity:0;
-		margin-bottom: 0px;
-	}
-	60% {
-		opacity:1;
-	}
-	100% {
-		opacity:0;
-		margin-bottom: 40px;
-	}
-}
-@-moz-keyframes start {
-	0%{
-		opacity:0;
-		margin-bottom: 0px;
-	}
-	60% {
-		opacity:1;
-	}
-	100% {
-		opacity:0;
-		margin-bottom: 40px;
-	}
-}
-@keyframes start {
-		0% {
-		opacity:0;
-		margin-bottom: 0px;
-	}
-	60% {
-		opacity:1;
-	}
-	100% {
-		opacity:0;
-		margin-bottom: 40px;
-	}
-}
-.guide-bottom .experience{
-	padding: 4px 8px;
-	margin-bottom: 20px;
-	display: none;
-}
-.guide-bottom .jumpGuide ,.guide-bottom .goToShare{
-	color: #D7D7D7;
-	position: absolute;
-	bottom: 10px;
-	display: block;
-	width: 50px;
-	height: 50px;
-}
-.guide-bottom .jumpGuide{
-	left: 20px;
-}
-.guide-bottom .goToShare{
-	right: 20px;
-}
-.share-dialog{
-	z-index: 10;
-}
-.share-dialog .dialog-content{
-	padding-top: 20px;
-	padding-bottom: 40px;
-}
-/**底部工具**/
-.bottom-toolbar{
-	display: table;
-	position: fixed;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	height: 45px;
-	width: 100%;
-	border-top: 1px solid #CCCCCC;
-	background-color: #F8F8F8;
-	z-index: 9999;
-}
-.bottom-toolbar>li{
-	display: table-cell;
-	width: 33%;
-	height: 45px;
-	line-height: 45px;
-	text-align: center;
-}
-.bottom-toolbar>li:first-child img{
-	width: 15px;
-    height: 15px;
-    margin-bottom: 2px;
-}
-.bottom-toolbar>li:nth-child(2) img{
-	width: 16px;
-    height: 16px;
-    margin-bottom: 2px;
-	margin-right: 2px;
-}
-.bottom-toolbar>li:last-child img{
-	width: 14px;
-    height: 14px;
-    margin-bottom: 3px;
-	margin-right: 2px;
-}
-.bottom-toolbar>li:nth-child(2){
-	width: 34%;
-	border-left: 1px solid #CCCCCC;
-	border-right: 1px solid #CCCCCC;
-}
-
-.tip{
-	margin:1px;
-	padding:5px;
-	background-color:#FAF5DF;
-	border:1px solid #F5DC9A;
-	opacity: 0.8;
-}
-.tip-button{
-	float: right;
- 	margin-right: 20px;
-	margin-top:5px;
-}
-.tip-button span{
-	border-radius:2px;
-	display:inline-block;
-	padding:5px 35px;
-	margin-right:10px;
-	border:1px solid #24C0D7;
-	cursor:pointer;
-	color: #24C0D7;
-	background-color: #ffffff;
-}
-.tip-button span:nth-child(2){
-	background-color:#24C0D7;
-	color: #ffffff;
-}
-.visible{
-	display:none;
-}
-.show-days{
-	font-size:10px;
-	display:inline-block;
-	margin-left:2px;
-	color:#999;
-}
-#txt_tip{
-	text-indent:2em;
-	padding:10px;
-}
-/**********滑动css*********/
-.slide {
-	position: relative;
-	overflow: hidden;
-}
-.slide ul {
-	width: 100%;
-	height: 100%;
-	z-index: 1;
-	overflow: hidden;
-	background-size: 320px;
-}
-.slide li {
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 100%;
-	background: -webkit-radial-gradient(39% 77%,ellipse, #fff, #fff 50%, #edefff 70%);
-	background-size: 130% 120%;
-	-webkit-transition: transform .3s ease-in-out;
-	opacity: 0;
-}
-.slide img{
-	width: 100%;
-	height: 100%;
-}
-.slide-point {
-	position: absolute;
-	top: 10px;
-	right: 10px;
-	display: none;
-	width: 9px;
-	text-align: center;
-	font-size: 0;
-	z-index: 90;
-	-webkit-animation: dis-show 0s ease forwards;
-}
-.slide-point span {
-	margin: 6px auto;
-	width: 8px;
-	height: 8px;
-	border-radius: 100%;
-	background: #000;
-	opacity: .2;
-	display: block;
-	z-index: 100;
-}
-.slide-point span.current {
-	background: #007aff;
-	opacity: 1;
-}
-.no-result{
-	text-align:center;
-	color:#999;
-}
-.toolbar-list{
-	position: relative;
-}
-.toolbar-popover{
-	position: absolute;
-	width: 90px;
-	border: 1px solid #D0D0D0;
-	background-color: #F9FAFA;
-	bottom: 60px;
-	left: 50%;
-	margin-left: -50px;
-	display: none;
-	border-radius: 5px;
-	padding: 4px 2px;
-}
-.popover-ul li{
-	line-height: normal;
-	width: 90px;
-	text-align: center;
-}
-.popover-ul li div{
-	padding: 5px 0px;
-}
-.popover-ul li span{
-	display: block;
-	height: 1px;
-	width: 60px;
-	margin: 3px auto;
-	background-color: #BFBFBF;
-}
-.toolbar-popover .popover-arrow{
-	bottom: -6px;
-	left: 50%;
-	margin-left: -3px;
-	border-bottom-width: 0;
-	border-left-width: 5px;
-	border-right-width: 5px;
-	border-top-width: 6px;
-	position: absolute;
-	border-color: transparent;
-	border-style: solid;
-	border-top-color: #D0D0D0;
-}
-.toolbar-popover .popover-arrow:after{
-	position: absolute;
-	bottom: 1px;
-	margin-left: -5px;
-	content: " ";
-	border-color: transparent;
-	border-top-color: #F9FAFA;
-	border-bottom-width: 0;
-	border-left-width: 5px;
-	border-right-width: 5px;
-	border-top-width: 6px;
-	border-style: solid;
-}
-.popover-ul li.active>div{
-	background-color: #D2D2D2;
-	border-radius: 5px;
-}
-.toolbar-popover-mask{
-	background-color: transparent;
-	position: absolute;
-	left: 0px;
-	right: 0px;
-	top: 0px;
-	bottom: 0px;
-	display: none;
-}
-/*****wxsearch*****/
-
-.wxsearch .tubiao{
-	float:right;
-}
-.wxsearch .tubiao img{
-    width: 32px;
-    display: inline-block;
-    padding-left: 10px;
-/*    border-left: 3px solid #2AB9CA;*/
-	position: absolute;
-	z-index: 10;
-	top: 58px;
-	right: 100px;
-}
-.wxsearch .qc{
-	float:right;
-}
-.wxsearch .searchzhao1,.wxsearch .searchzhong1{
-	margin-top: 10px;
-	margin-bottom: 10px;
-	cursor:hand;
-	display: inline-block;
-	vertical-align: top;
-}
-
-.wxsearch .searchzhao1 img,.wxsearch .searchzhong1 img{
-	height:25px;
-	
-}
-.wxsearch .searchzhao2,.wxsearch .searchzhong2{
-	margin:0px 5px;
-	display: inline-block;
-	margin-bottom: 10px;
-	vertical-align: top;
-	margin-top: 13px;
-}
-.wxsearch .searchzhao3,.wxsearch .searchzhong3{
-	display: inline-block;
-	margin-bottom: 10px;
-	margin-top: 13px;
-	word-wrap: break-word;
-	word-break: break-all;
-	white-space: normal !important;
-	margin-left: -5px;
-	vertical-align: top;
-}
-.wxsearch .searchzhao3 span , .wxsearch .searchzhong3 span{
-	float:left;
-	
-}
-.wxsearch .rsssetbtn{
-	border:1px solid #37c6da; 
-	background-color:#37c6da;
-	height:38px; 
-	width:100%; 
-	line-height:38px;
-	vertical-align: middle;
-	border-radius: 4px;
-	font-size:15px;
-	color:#fff;
-}
-.wxsearch #myorder{
-	width:100%; 
-	margin-top:40px;
-	padding:0px 30px;
-}
-.wxsearch .searchshow{
-	border-top:1px solid #e5e6e9;
-	padding:0px 20px 10px 20px;
-}
-.wxsearch .wx-xhx{
-	border-top:1px solid #e5e6e9; 
-	width:100%;
-}
-.wxsearch .searchbs{
-	cursor:hand;
-	border-bottom:1px solid #e5e6e9; 
-}
-.wxsearch .parent-node img {
-	vertical-align: sub !important;
-}
-.wxsearch .kongbai{
-	height:149px;
-}
-.wxsearch .search-content{
-	float: left;
-	width: 100%;
-	margin-top: -20px;
-}
-.wxsearch .search-content .search-block{
-	padding-left:15px;
-	clear:both;
-}
-.wxsearch .search-content .search-block .title{
-	border-bottom:1px solid #E6E6E6;
-	height:60px;
-	line-height:60px;
-	color:#1d1d1d;
-	font-size: 17px;
-}
-.wxsearch .search-content .search-block .title img{
-	height:26px;
-	margin-right:10px;
-}
-.wxsearch .search-content .search-block div.list{
-	padding-right:15px;
-}
-.wxsearch .search-content .search-block  li{
-	word-break: break-all;
-    overflow: hidden;
-	display:block;
-	border-bottom:1px solid #E6E6E6;
-	height:52px;
-	line-height:50px;
-	width:100%;
-	clear:both;
-	color:#1d1d1d;
-}
-.wxsearch .jyshaxuan{
-	border-bottom:1px solid #e0e0e0;
-	width:100%;
-	height:40px;
-	margin:-10px 0px 0px;
-}
-.wxsearch .jyshaxuan .jyshug{
-	border-right:1px solid #ccc;
-	color:#2cb7ca;
-	line-height:30px;
-	height:30px;
-	margin-top:10px;
-}
-.wxsearch .jyshaxuan li>img{
-    width: 16px;
-    padding-bottom: 6px;
-    margin-left: 4px;
-}
-.wxsearch .shaixcl{
-	color:#2cb7ca;
-	background-image: url(/images/search/sys-jt-bottom2.png);
-}
-.wxsearch .jydq-dialog .btn,.wxsearch .jytype-dialog .btn {
-    padding: 5px 10px;
-    background-color: #F4F4F9;
-    color: #1d1d1d;
-    font-size: 14px;
-    margin-right: 10px;
-    margin-bottom: 12px;
-    width: 21%;
-    float: left;
-    border-radius: 3px;
-	height: 34px;
-}
-.wxsearch .jydq-dialog li,.wxsearch .jytype-dialog li  {
-    border-bottom: 1px solid #d9d6d6;
-    padding: 18px 0px 16px;
-    float: left;
-    width: 100%;
-}
-.wxsearch .jydq-dialog li>div ,.wxsearch .jytype-dialog li>div {
-    font-size: 14px;
-    margin-bottom: 10px;
-	clear:both;
-}
-.wxsearch .jyshxbottom{
-	border-top:1px solid #ccc;
-	width:100%;
-	height:45px;
-	display:block;
-	line-height:45px;
-    position: fixed;
-    left: 0px;
-    right: 0px;
-    bottom: 0px;
-    z-index: 999;
-}
-.wxsearch .jyshxbottom li{
-	width:50%;
-	font-size:18px;
-}
-.wxsearch .jyshxbottom .jydqsure{
-	 background: rgb(204, 204, 204);
-	 color:#fff;
-}
-.wxsearch .jyshxbottom .jydqsure.on{
-	background-color:#2cb7ca;
-	color:#fff;
-}
-.wxsearch .jyshxbottom .jydqreset{
-	background-color:#f0f9fa;
-	color:#2cb7ca;
-}
-.wxsearch .jydq-dialog .btn.active {
-    background-color: #24C0D7;
-    color: #FFFFFF;
-}
-.wxsearch .jytype-dialog .btn.active {
-    background-color: #24C0D7;
-    color: #FFFFFF;
-}
-.wxsearch .jydq-dialog #dqbtn.active {
-    background-color: #24C0D7;
-    color: #FFFFFF;
-}
-.wxsearch .jytype-dialog #dqbtn.active {
-    background-color: #24C0D7;
-    color: #FFFFFF;
-}
-.dialog-content #subdqbtn.active {
-    background-color: #24C0D7;
-    color: #FFFFFF;
-}
-#dqbtn{
-	padding: 7px 10px;
-    background-color: #F4F4F9;
-    color: #1d1d1d;
-    font-size: 15px;
-    margin-right: 10px;
-    margin-bottom: 14px;
-	height:36px;
-    border-radius: 3px;
-	font-weight: 600;
-}
-.jytype-dialog,.jydq-dialog{
-	margin-bottom: 30px;
-}
-.jy_rssetbj{
-	background-image: url("/images/wx/jysubcribe.png");
-	background-size:100% 100%;
-	height:135px;
-	width:100%;
-}
-.jy_rssetkw{
-	border-radius: 5px;
-    margin-top: -10px;
-    background-color: #fff;
-    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
-}
-.jy_rssetsc,.jy_pushmode{
-	border-radius: 5px;
-    margin-top: 10px;
-    background-color: #fff;
-    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
-}
-.jy_rssetvw{
-	border-radius: 5px;
-    margin-top: 10px;
-    background-color: #fff;
-    box-shadow: 0 0 13px rgba(85, 85, 85,0.15);
-}
-.dialog-por{
-	margin:10px;
-	padding:10px 15px;
-	background-color:#fffaf1;
-	border: 1px solid #ffba00;
-}
-/*jyabout*/
-
-.jyabout .jy-baseinfo{
-	background-color:#16DAFF;
-	width:100%;
-	padding:50px 20px 15px;
-	text-align:center;
-}
-.jyabout .jy-d{
-	color:#fff;
-	font-size:18px;
-	font-family: 微软雅黑;
-}
-.jyabout .jy-dayno{
-	float:left;
-	text-align:center;
-	color:#0069d2;
-    font-size: 75px;
-}
-.jyabout .jy-daysuf{
-	float:left;
-	text-align:left;
-	color:#0069d2;
-    font-weight: bold;
-	padding:5px;
-	line-height: 20px;
-	font-size:18px;
-	font-family: 微软雅黑;    
-	margin-top: 39px;
-}
-.jyabout .jy-daycont{
-	margin:5px auto 0px;
-	border-bottom:1px solid #0069d2;    
-	padding-bottom: 10px;
-}
-.jyabout .jy-from{
-	color:#fff;
-	font-size:18px;
-	margin:30px 0px -10px;
-	font-family: 微软雅黑;
-}
-.jyabout .jy-fromgovsuf,.jy-formentsuf{
-    float: left;
-    text-align: left;
-    color: #0069d2;
-    font-weight: bold;
-    padding:5px;
-    line-height: 20px;
-	font-size:18px;
-	font-family: 微软雅黑;    
-	margin-top: 20px;
-}
-.jyabout .jy-fromgov{
-	margin:5px auto 0px;
-	border-bottom:1px solid #0069d2;
-	padding-bottom: 30px;
-}
-.jyabout .jy-fromgovno,.jy-formentno{
-    float: left;
-    text-align: center;
-    color: #0069d2;
-    font-size: 75px;
-}
-.jyabout .jy-fromgovlist{
-	width:100%;
-	text-align:center;
-	color:#fff;
-	font-size:16px;
-	font-family: 微软雅黑;
-}
-.jyabout .jy-orin{
-	border:1px solid #fcff00;
-	padding:8px;
-	margin:30px auto;
-	color:#fcff00;
-	border-radius: 3px;
-    width: 251px;
-    font-size: 17px;
-}
-.jyabout .jy-shangx{
-	color:#fff;
-	padding: 40px 20px;
-}
-.jyabout .jy-first{
-	
-}
-.jyabout .jy-fontone{
-	font-size: 24px;
-    font-weight: bold;
-	font-family: 微软雅黑;
-}
-.jyabout .jy-fonttwo{
-	font-size: 18px;
-	font-family: 微软雅黑;
-}
-.jyabout .jy-tuxiang{
-	position: relative;
-	height:260px;
-	margin-left:10px;
-}
-.jyabout .jy-bg-line{
-	position: absolute;
-	border-right:1px solid #646467;
-	left:45px;
-}
-.jyabout .jy-bg-line li{
-	border-left:1px solid #646467;    
-	width: 45px;
-    height: 180px;
-}
-.jyabout .jy-histogram-x{
-	position: absolute;
-	top: 190px;
-    left: 40px;
-}
-.jyabout .jy-histogram-x li{
-	width: 45px;
-	color:#646467;
-}
-.jyabout .jy-histogram-y{
-	position: absolute;
-	width: 45px;
-	top: 25px;
-	text-align: center;
-}
-.jyabout .jy-histogram-y li{
-	height: 55px;
-	color:#3c3c41;
-	width: 50px;
-}
-.jyabout .jy-histogram-y li>img{
-	width: 20px;
-}
-.jyabout .jy-histogram-content{
-	position: absolute;
-	left:40px;
-	top:0px;
-	width:190px;
-	height:180px;
-}
-.jyabout .jy-histogram-content li{
-	float: left;
-    width: 100%;
-    height: 33%;
-    text-align: center;
-    position: relative;
-}
-.jyabout .jy-histogram-content li>span{
-	position: relative;
-    display: inline-block;
-    width: 100%;
-    height: 26px;
-}
-.jyabout .jy-histogram-content li>span>div{
-	position: absolute;
-    display: block;
-    height: 6px;
-	background-image:url(/images/wx/pc_8.png);
-	background-repeat:no-repeat;
-}
-.jyabout .aOne{
-    top: 33px;
-}
-.jyabout .aTwo{
-    top: 30px;
-}
-.jyabout .aThree{
-    top: 24px;
-}
-.jydiv-bidtoday,.jydiv-bidmonth,.jydiv-push{
-	position: absolute;
-    left: 99%;
-    top: -10px;
-    width: 124px;
-	text-align: left;
-	margin-left:5px;
-	color:#0bdae9;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-	height: 26px;
-}
-.jyabout .jy-tiao{
-	/*float: right;
-    margin-left: 5px;*/
-	font-size:12px;
-}
-.jyabout .jy-fengexian{
-	border:1px solid #646467; 
-	width:120px;
-	margin:15px 0px;
-}
-.jy-websearch-title{
-	margin:30px auto 20px;
-	font-size:18px;
-	font-weight:bold;
-	color:#2cb7ca;
-	letter-spacing: 2px;
-	text-align:center;
-}
-.jyabout .searchname{
-	background-color: #FFFFFF ;
-    border: 1px solid #E6E6E6;
-    height: 45px;
-    padding: 2px 35px 2px 20px;
-    border-radius: 37px;
-    font-size: 16px;
-    position: relative;
-    box-shadow: none
-}
-.jyabout .wxhead{
-	margin:10px 20px;
-}
-.jyabout .tubiao{
-	float: right;
-}
-.jyabout .tubiao img {
-    top: 85px;
-    right: 10%;
-    width: 38px;
-    display: inline-block;
-    padding-left: 10px;
-    border-left: 2px solid #ccc;
-    position: absolute;
-    z-index: 10;
-}
-.jyabout .jy-websearch-result{
-	margin:30px;
-	border-top:1px solid #ccc;
-	padding: 30px 10px;
-    color: #000;
-    font-size: 14px;
-}
-.jyabout .jy-advise{
-	width: 200px;
-    margin-right: auto;
-    margin-left: auto;
-    margin-top: 30px;
-}
-.jyabout .jy-advise img{
-	width: 200px;
-}
-.jyabout .jy-N a{
-	color:#0987ff;
-	text-decoration:underline;
-}
-.interaction{
-	text-align: center;
-    margin-bottom: 20px;    
-	padding: 0px 10px;
-}
-.inin{
-	border: 1px solid #ccc;
-    height: 40px;
-    width: 80%;
-    font-size: 15px;
-	padding: 1px 10px;
-	border-radius: 4px 0px 0px 4px;
-}
-.jysub{
-	display: inline-block;
-    height: 40px;
-    background-color: #2cb7ca;
-    color: #fff;
-    width: 18%;
-    line-height: 40px;
-	position: relative;
-	top: 0px;
-	border-radius: 0px 4px 4px 0px;
-}
-.entercom{
-	margin-top:40px;
-}
-.enterspan{
-    display: inline-block;
-    border: 1px solid #27b7ca;
-    padding: 8px 16px;
-    border-radius: 20px;
-	color:#27b7ca;
-	margin-left: 10px;
-	
-}
-.enterspan img{
-	margin-left: 7px;
-    width: 10px;
-    margin-bottom: 4px;
-}
-/*拟建*/
-.prebuilt{
-}
-.prebuilt ul li{
-	border: 1px solid #f0f0f0;
-    padding: 3px 10px;
-    background-color: #F4F4F9;
-    margin-top: 5px;
-	line-height: 24px;
-    border-radius: 4px;
-}
-.pre-title{
-	font-size: 16px;
-    color: #1d1d1d;
-    font-weight: bolder;
-    margin-top: 15px;
-    margin-bottom: 10px;
-    font-family: PingFang-SC-medium;
-}
-.pre-type{
-	color:#686868;
-	font-size:15px;
-    font-family: PingFang-SC-medium;
-}
-.pre-cont{
-	color: #1d1d1d;
-    font-size: 16px;
-    font-family: PingFang-SC-medium;
-}
-.pre-enclosure{
-	border: 1px solid #e1e1e6;
-    padding: 10px;
-    background-color: #F4F4F9;
-    margin-top: 15px;
-    color: #000;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-	border-bottom:0px;
-}
-.pre-encont{
-    padding:12px 5px;
-    border-bottom: 1px solid #e1e1e6;
-}
-.pre-encont:last-child{
-	border-bottom: 0px;
-}
-.pre-dow{
-    padding:0px 5px 0px;
-    border: 1px solid #e1e1e6;
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
-	border-top: 0px;
-}
-.pre-encont a{
-	color: #000;
-    text-decoration: none;
-}
-.pre-encont img{
-	width: 40px;
-    margin-right: 10px;
-}
-.pre-enclosure img{
-	width: 18px;
-    margin-right: 10px;
-}
-.q-mark{
-	width: 20px;
-    margin-top: 7px;
-}
-.q-marklist{
-	width: 20px;
-    margin-top: 7px;
-}
-.newest{
-	background-color: #F53532;
-    width: 10px;
-    height: 10px;
-    position: absolute;
-    right: -3px;
-    top: -3px;
-    border-radius: 10px;
-}
-.point,.pointlist{
-	position: fixed;
-    top: 120px;
-    text-align: center;
-	padding: 20px;
-}
-.point img:nth-child(1),.pointlist img:nth-child(1){
-	width:300px;
-}
-.pointclose,.pointcloselist{
-	position: relative;
-    left: 80px;
-    width: 80px;
-    top: 20px;
-}
-/***发布时间**/
-.jypt-dialog{
-	text-align: center;
-}
-.jypt-dialog .btn.jypt-active{
-	background-color: #24C0D7;
-	color: #fff !important;
-}
-.jypt-dialog [type='text']{
-	border-radius: 0px;
-	width: 45%;
-	line-height: 30px;
-	padding: 0px 0px 0px 5px;
-}
-.jypt-dialog .jypt-timeinputs{
-	margin-top: 10px;
-	background-color: #F5F4FA;
-	padding: 10px;
-	display: inline-block;
-}
-.jypt-dialog .jypt-fg{
-	display: inline-block;
-	height: 34px;
-	vertical-align: top;
-	width: 15px;
-}
-.jypt-dialog .jypt-fg>span{
-	background-color: #CECECE;
-	height: 1px;
-	width: 15px;
-	display: block;
-	position: relative;
-	top: 16px;
-}
-.jypt-dialog .jypt-timeinputs-active{
-	background-color: #2CB7CA;
-}
-.jypt-dialog .jypt-timeinputs-active .jypt-fg>span{
-	background-color: #000;
-}
-.mbsc-ios .dwbc{
-	border-color: #ddd;
-}
-.mbsc-ios .dwb-s .dwb{
-	color: #24C0D7;
-}
-.mbsc-ios .dwbw .dwb2{
-	color: #24C0D7;
-	font-weight: bold;
-}
-.mbsc-ios .title{
-	opacity: 1 !important;
-	color: inherit !important;
-	font-weight: bold !important;
-}
-.mbsc-ios .dwbw{
-	float: left !important;
-}
-.mbsc-ios .dwb-s{
-	float: right !important;
-}
-.jyshaxuan div{
-	font-size: 14px;
-	color: #888;
-	background: url(/images/search/sys-jt-bottom.png)right center no-repeat;
-	background-size: 7px 7px;
-	padding-right: 10px;
-}
-.jyshaxuan{
-	height: 40px;
-	line-height: 40px;
-	width: 100%;
-	border-bottom: 1px solid #ccc;
-	padding-left: 5px;
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-}
-.money-dialog,.jypt-dialog{
-	padding:0 10px 10px 10px;
-	margin-top: 18px;
-}
-.money-dialog ul li {
-	color: #888;
-	float: left;
-	width: 100%;
-	height: 40px;
-	line-height: 40px;
-}
-.money-inp{
-	background-color:#f5f4fa;
-	height:60px !important;
-	color:#000 !important;
-}
-.money-inp input{
-	width:100%;
-}
-.money-inp .min-price{
-	width:42%;
-	position:relative;
-	top:19%;
-	left:3%;
-}
-.money-inp .max-price{
-	width:42%;
-	position:relative;
-	top:-45%;
-	left:55%;
-}
-.money-inp .min-price span,.money-inp .max-price span{
-	position:absolute;
-	top: 0%;
-	left:71%;
-}
-.fgx{
-	background-color: #CECECE;
-	height: 1px;
-	width: 15px;
-	display: block;
-	top: 18px !important;
-	left:106% !important;
-}
-.industry-dialog{
-	display: flex;
-	justify-content: space-between;
-	width: 100%;
-	min-height: 10rem;
-	font-size: 14px;
-	color: #1d1d1d;
-	position: absolute;
-	z-index: 999;
-}
-.industry-dialog .hyHead {
-	width: 34%;
-	background-color: #FFFFFF;
-}
-.industry-dialog .hyHead li{
-	padding-left: 2rem;
-	height: 3rem;
-	line-height: 3rem;
-	border: 1px solid #e0e0e0;
-	margin-top: -1px;
-	float:none;
-}
-.industry-dialog .hyHead li.on{
-	background-color: #f4f4f9;
-	border-right: none;
-}
-.hyBody{
-	width: 66%;
-	background-color: #f4f4f9;
-
-}
-.hyBody .iner-list{
-	display: none;
-}
-.hyBody .iner-list ul li{
-	height: 3rem;
-	line-height: 3rem;
-	padding-left: 3rem;
-	border: 1px solid #e0e0e0;
-	margin-top: -1px;
-	border-left:none ;
-	float:none;
-}
-.hyBody .iner-list ul li.active{
-	background: #f4f4f9 url(../../images/search/icon-right-bg.png) 1.5rem center no-repeat;
-	background-size: 1rem 1rem;
-	color: #2cb7ca;
-}
-.jypt-dialog .btn,.money-dialog .btn{
-	padding: 5px 0px;
-	background-color: #F4F4F9;
-	color: #1d1d1d !important;
-	font-size: 14px;
-	margin-right: 10px;
-	margin-bottom: 12px;
-	width: 21%;
-	float: left;
-	border-radius: 3px;
-	height: 34px;
-}
-.money-dialog .active{
-	background-color: #24C0D7;
-	color: #fff;
-}
-<!--           原页面样式                  -->
-body{
-	font-size:16px !important;
-}
-.searchname{
-	background-color: #EEEEEE !important;
-	width:85% !important;
-	font-size:16px;
-	position:relative;
-	box-shadow:none;
-	cursor: pointer;
-	border: none !important;
-	border-radius: 5px !important;
-	webkit-transform: translateZ(0);
-	-moz-transform: translateZ(0);
-	-ms-transform: translateZ(0);
-	-o-transform: translateZ(0);
-	transform: translateZ(0);
-}
-.wxhead{
-	padding:8px 12px;
-}
-.tubiao img{
-	top: 27px;
-	right: 22%;
-	width: 35px;
-	display: inline-block;
-	padding-left: 10px;
-	border-left: 2px solid #ccc;
-	position: absolute;
-	z-index: 10;
-}
-#wrapper{
-	background-color:#fff;
-}
-#list{
-	padding:0px 20px;
-	background-color:#fff;
-}
-.nullcontent{
-	padding-top: 10%;
-	position: absolute;
-	top: 125px;
-	left: 0px;
-	right: 0px;
-	padding:0px 20px;
-	background-color:#fff;
-}
-#wrapper{
-	margin-bottom: 52px;
-}
-.parent-node img {
-	vertical-align: sub !important;
-}
-.searchform{
-	margin: 0px;
-}
-.wxsearch{
-	margin-top: 10px;
-}
-.slistbkc{
-	background-color: #F4F4F9;
-}
-.detail{
-	font-size: 14px;
-	margin-top: 5px;
-	color: #646464;
-	padding-left: 25px;
-	word-wrap: break-word;
-	word-break: break-all;
-	white-space: normal !important;
-}
-.resnumb .two{
-	max-height:45px;
-	overflow: hidden;
-}
-.screen{
-	color:#0987ff;
-	font-size: 16px;
-	float: right;
-	position: absolute;
-	z-index: 10;
-	top: 18px;
-	right: 5%;
-	height: 20px;
-}
-.query img{
-	width: 32px;
-	display: inline-block;
-	padding-left: 10px;
-	position: absolute;
-	z-index: 10;
-	top: 18px;
-	right: 20%;
-}
-.clearInpt img{
-	width: 30px;
-	display: inline-block;
-	padding-left: 10px;
-	position: absolute;
-	z-index: 10;
-	top: 18px;
-	right: 30%;
-}
-.selLable{
-	font-size:14px;
-	height:40px;
-	line-height: 40px;
-	color:#888;
-	padding: 0 10px;
-	border-bottom: 1px solid #e0e0e0;
-}
-.selLable div{
-	float: left;
-}
-.com-title{
-	width: 59%;
-}
-.com-title span{
-	float: left;
-	height: 100%;
-	display: block;
-	padding: 0 5px;
-	margin-left: 5px;
-}
-.com-title .on{
-	color: #2cb7ca;
-	border-bottom: 2px solid #2cb7ca;
-}
-.selLable .line-vertical{
-	width: 1px;
-	height: 30px;
-	margin-top: 5px;
-	border-left: 1px solid #e0e0e0;
-}
-.showType{
-	width: 40%;
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-}
-.showType div{
-	padding-left: 30px;
-}
-.showType .showlist{
-	background: url(/images/search/showList.png)10px center no-repeat;
-	background-size: 30%;
-}
-.showType .showtable{
-	background: url(/images/search/showTable.png)10px center no-repeat;
-	background-size: 30%;
-}
-.showType .showlist.on{
-	background: url(/images/search/showList_on.png)10px center no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-.showType .showtable.on{
-	background: url(/images/search/showTable_on.png)10px center no-repeat;
-	background-size: 30%;
-	color: #2cb7ca;
-}
-#table{
-	overflow-x: scroll;
-	width: 100%;
-	padding-left: 20px;
-	padding-top: 20px;
-}
-#table table{
-	width: 525px;
-}
-#table table>tr>td:nth-child(1){
-	width:30px;
-}
-#table table>tbody>tr>td:nth-child(2){
-	width:68px;
-}
-#table table>tbody>tr>td:nth-child(3){
-	width:74px;
-}
-#table table>tbody>tr>td:nth-child(4){
-	width:160px;
-}
-#table table>tbody>tr>td:nth-child(5){
-	width: 160px;
-}
-#table tr td{
-	border: 1px solid #E0E0E0;
-	text-align: center;
-	padding: 5px;
-}
-.content .keyword{
-	color: #2cb7ca;
-}
-.resbm{
-	display: table;
-	position: fixed;
-	bottom: 0px;
-	z-index: 2000;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	height: 50px;
-	width: 100%;
-	background-color: #37c6da;
-	border: 1px solid #37c6da;
-	display: flex;
-	justify-content: space-around;
-	align-content: center;
-}
-.rests {
-	height: 50px;
-	line-height: 50px;
-	padding-left: 15px;
-	color: #fff;
-	font-size: 14px;
-	float: left;
-	overflow: hidden;
-	width: 60%;
-	text-align: center;
-}
-.resdy {
-	float: left;
-	height: 35px;
-	margin: 7px 10px;
-	width: 107px;
-	border: 1px solid #fff;
-	line-height: 35px;
-	border-radius: 20px;
-	color: #fff;
-	padding-left: 20px;
-	cursor: hand;
-}
-.resdy img {
-	width: 12px;
-	margin: 2px;
-}
-.dy_close img{
-	width: 12px;
-	margin: 4px;
-}

+ 70 - 40
src/web/staticres/wxswordfish/superSearch.js

@@ -1,5 +1,4 @@
 $(function(){
-	
 	var winWidth=$(window).width();
 	var winHeight=$(window).height();
 	$(".point img:first").css("width",winWidth*0.8+"px");
@@ -24,20 +23,42 @@ $(function(){
 	$(".money-dialog .btn").click(function(){
 		$(this).addClass("active");
 		$(".money-dialog .money-inp").removeClass("active");
-	})
+	});
     $(".money-dialog .money-inp").click(function(){
-        $(this).addClass("active");
-        $(".money-dialog .btn").removeClass("active");
-	})
-
-
+    	if(open_supersearch==true){
+            $(this).addClass("active");
+            $(".money-dialog .btn").removeClass("active");
+		}else{
+            toOpenSupersearch();
+		}
+	});
+    $(".minMrice").click(function(){
+        if(open_supersearch!=true){
+            toOpenSupersearch();
+		}
+	});
+	//金额大小交换
+    $(".maxMrice").blur(function(){
+        var max=$(".maxMrice").val(),min=$(".minMrice").val();
+        if(Number(max)<Number(min)&&max!=""&&min!=""){
+            $(".maxMrice").val(min);
+            $(".minMrice").val(max);
+		}
+	});
+    $(".minMrice").blur(function(){
+        var max=$(".maxMrice").val(),min=$(".minMrice").val();
+        if(Number(max)<Number(min)&&max!=""&&min!=""){
+            $(".maxMrice").val(min);
+            $(".minMrice").val(max);
+        }
+    });
 
     $(".shaixIndustry").click(function(){
-        $(this).addClass("shaixcl");
-        $(this).siblings().removeClass("shaixcl");
-        $(".industry-dialog").removeClass("hidden");
-        $(".jydq-dialog,.jytype-dialog,.jypt-dialog,.money-dialog").addClass("hidden");
-	})
+            $(this).addClass("shaixcl");
+            $(this).siblings().removeClass("shaixcl");
+            $(".industry-dialog").removeClass("hidden");
+            $(".jydq-dialog,.jytype-dialog,.jypt-dialog,.money-dialog").addClass("hidden");
+	});
 	$(".shaixMoney").click(function(){
         $(this).addClass("shaixcl");
         $(this).siblings().removeClass("shaixcl");
@@ -166,36 +187,45 @@ $(function(){
     //行业点击事件
     var dialogObjthree = $(".contentthree");
     dialogObjthree.find(".btn").click(function(){
-        if($(this).parent().index() == 0){
-            dialogObjthree.find('div[id="dqbtn"]').removeClass("active");
-            dialogObjthree.find(".btn").removeClass("active");
-        }else{
-            dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-        };
-        $(this).toggleClass("active");
-        if ($(this).attr("class")!="active"){
-            $(this).prevAll('div[id="dqbtn"]').removeClass("active");
-        };
-        if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
-            $(this).prevAll('div[id="dqbtn"]').addClass("active");
-            dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-        };
-        if(dialogObjthree.find(".btn.active").length == 0){
-            dialogObjthree.find("ul:first li:first .btn").addClass("active");
-        };
-    });
+            if($(this).parent().index() == 0){
+                dialogObjthree.find('div[id="dqbtn"]').removeClass("active");
+                dialogObjthree.find(".btn").removeClass("active");
+            }else{
+                if(open_supersearch==true){				//判断是否开通超级搜索
+					dialogObjthree.find("ul:first li:first .btn").removeClass("active");
+                }else{
+					toOpenSupersearch();
+                    return
+                }
+            };
+        	$(this).toggleClass("active");
+			if ($(this).attr("class")!="active"){
+				$(this).prevAll('div[id="dqbtn"]').removeClass("active");
+			};
+			if($(this).parent("li").find(".btn").length == $(this).parent("li").find(".btn.active").length){
+				$(this).prevAll('div[id="dqbtn"]').addClass("active");
+				dialogObjthree.find("ul:first li:first .btn").removeClass("active");
+			};
+			if(dialogObjthree.find(".btn.active").length == 0){
+				dialogObjthree.find("ul:first li:first .btn").addClass("active");
+			};
 
+    });
     dialogObjthree.find('div[id="dqbtn"]').click(function(){
-        $(this).toggleClass("active");
-        if ($(this).attr("class") != "active"){
-            $(this).nextAll(".btn").removeClass("active");
-        }else{
-            $(this).nextAll(".btn").addClass("active");
-            dialogObjthree.find("ul:first li:first .btn").removeClass("active");
-        };
-        if(dialogObjthree.find(".btn.active").length == 0){
-            dialogObjthree.find("ul:first li:first .btn").addClass("active");
-        };
+    	if(open_supersearch==true){
+            $(this).toggleClass("active");
+            if ($(this).attr("class") != "active"){
+                $(this).nextAll(".btn").removeClass("active");
+            }else{
+                $(this).nextAll(".btn").addClass("active");
+                dialogObjthree.find("ul:first li:first .btn").removeClass("active");
+            };
+            if(dialogObjthree.find(".btn.active").length == 0){
+                dialogObjthree.find("ul:first li:first .btn").addClass("active");
+            };
+		}else{
+            toOpenSupersearch();
+		}
     });
 /*	$(".jysstj").find(".jydqreset").click(function(){
 		//$(".point").addClass("hidden");

+ 19 - 12
src/web/templates/weixin/search/superSearch.html

@@ -17,7 +17,6 @@
 	<script src="/js/dropload.js?v={{Msg "seo" "version"}}"></script>
     <script src="/wxswordfish/jquery.resize.js"></script>
 	<script>
-
         var s_words = {{.T.searchvalue}};
         var firstPage = {{.T.list}};
         var pageSize = {{.T.pageSize}};
@@ -25,6 +24,7 @@
         var msgset={{.T.msgset}};
         var industryData={{.T.industry}}
         var sortArray={{.T.sortArray}}
+        var open_supersearch=false;
         window.top.noMoreCache = "false";
         var scrollDownObj=null;   //翻页对象
 		var dyDiv=true;     //显示订阅剑鱼信息
@@ -45,7 +45,7 @@
         $(function(){
             //loadTipMsg加载历史记录和我的订阅
             loadTipMsg(myHistory,msgset);
-					
+            flush_isOpenSupersearch();
             //筛选菜单展示or隐藏
             $(".wxhead").find(".screen").click(function(){	
                 $(".wxsearch").toggleClass("hidden");
@@ -140,8 +140,6 @@
                 if($(this).hasClass("on")){
                     beforeSubmit();
                     toquery();
-                }else{
-                    return
                 }
             });
 			//清除筛选
@@ -441,7 +439,7 @@
 				//招标单位
                 var agency=list[i].agency==null?"":list[i].agency;
 				//预算
-				var budget=list[i].budget==null?"":((list[i].budget)/1000+"").substring(0,5);
+				var budget=list[i].budget==null?"":((list[i].budget)/10000+"").substring(0,5);
 				//开标时间
 				var bidopentime=""
 				var optim=list[i].bidopentime;
@@ -552,11 +550,11 @@
             $("#table .content").html("<tr><td><div>序号</div></td><td><div>发布时间</div></td><td><div>公告类型</div></td><td><div>招标单位</div></td><td><div>项目名称</div></td><td><div>预算<br>(万元)</div></td><td><div>开标时间</div></td><td>中标单位</td><td><div>中标金额<br>(万元)</div></td></tr>");
             $("#table .content").append(TableHtmlobj);
 
-            if(!window.top.isBackIndex){
+           /* if(!window.top.isBackIndex){
                 if($(".jysstj").hasClass("hidden")){
                     window.top.$(".resbm").removeClass("hidden");
                 }
-            }
+            }*/
         }
         function myredirect(link,sid,sds){  //跳转三级页
             link = link.replace(/\n/g,"");
@@ -617,6 +615,12 @@
                 toquery();				 //查询
             })
 		}
+        function flush_isOpenSupersearch() {
+            $.post("/jylab/supsearch/getstatus",function(result){
+                open_supersearch=result.supstatus;
+			});
+        }
+        function toOpenSupersearch(){window.location.href="/jylab/laboratory/cjss"}
 	</script>
 </head>
 <body>
@@ -871,7 +875,6 @@
             beforeSubmit();
             toquery();
         }
-
         //展示方式
         //1.列表展示数据
         $(".showType .showlist").click(function(){
@@ -882,10 +885,14 @@
         })
         //2.表格展示数据
         $(".showType .showTable").click(function(){
-            $(this).addClass("on").siblings().removeClass("on");
-            $("#wrapper #table").removeClass("hidden");
-            $("#wrapper #list").addClass("hidden");
-            scrollDownObj.resetload();
+            if(open_supersearch==true){
+				$(this).addClass("on").siblings().removeClass("on");
+				$("#wrapper #table").removeClass("hidden");
+				$("#wrapper #list").addClass("hidden");
+				scrollDownObj.resetload();
+			}else{
+                toOpenSupersearch();
+			}
         })
 	</script>
 	{{include "/common/baiducc.html"}}