gengxin

src/jfw/front/search.go

@@ -4,83 +4,26 @@ import (
 	"fmt"
 
 	"github.com/go-xweb/xweb"
-	"strings"
-	"qfw/util/redis"
-	"jfw/wx"
-	"gopkg.in/mgo.v2/bson"
-	"qfw/util"
 )
 
 type Search struct {
 	*xweb.Action
 	/********************剑鱼搜索dev2.0**************************/
-	mainSearch  xweb.Mapper `xweb:"/front/mainSearch"`
-	superSearch xweb.Mapper `xweb:"/front/superSearch"`
-	wxSearch xweb.Mapper `xweb:"/front/wxSearch"`
+	mainSearch  xweb.Mapper `xweb:"/jylab/mainSearch"`
+	superSearch xweb.Mapper `xweb:"/jylab/superSearch"`
 }
 
-//
 func init() {
 	xweb.AddAction(&Search{})
 }
-
-//
 func (s *Search) MainSearch() error {
 	fmt.Println("------主页面搜索------")
 	s.T["name"] = "主页面搜索"
 	return s.Render("/weixin/search/mainSearch.html", &s.T)
 }
-func (s *Search) WxSearch() error {
+
+func (s *Search) SuperSearch() error {
 	fmt.Println("------超级搜索------")
 	s.T["name"] = "超级搜索"
-	return s.Render("/weixin/search/superSearch1.html", &s.T)
-}
-func (m *Search) SuperSearch() error {
-	defer util.Catch()
-	shname := m.GetSession("shname")
-	toptype := m.GetSession("toptype")
-	subtype := m.GetSession("subtype")
-	scope := m.GetSession("scope")
-	publishtime := m.GetSession("publishtime")
-	if shname != "" && shname != nil {
-		m.T["shname"] = shname
-	}
-	m.T["toptype"] = toptype
-	m.T["subtype"] = subtype
-	m.T["scope"] = scope
-	m.T["publishtime"] = publishtime
-	m.T["signature"] = wx.SignJSSDK(m.Site() + m.Url())
-	mynickname, _ := m.Session().Get("s_nickname").(string)
-	myavatar, _ := m.Session().Get("s_avatar").(string)
-	m.T["nickname"] = mynickname
-	m.T["avatar"] = myavatar
-	myopenid, _ := m.Session().Get("s_m_openid").(string)
-	m.T["openid"] = se.EncodeString(myopenid)
-	if userId := m.GetSession("userId"); userId != nil {
-		one, _ := mongodb.FindOneByField("user", bson.M{"_id": bson.ObjectIdHex(userId.(string))}, `{"o_jy":1}`)
-		history := redis.GetStr("other", "s_"+userId.(string))
-		arrs := strings.Split(history, ",")
-		if history == "" {
-			arrs = make([]string, 0)
-		}
-		l := len(arrs) - 1
-		for i := 0; i < len(arrs)/2; i++ {
-			tmp := arrs[l-i]
-			arrs[l-i] = arrs[i]
-			arrs[i] = tmp
-		}
-		m.T["history"] = arrs
-		if one != nil && len(*one) > 0 {
-			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
-			a_key, _ := o_jy["a_key"].([]interface{})
-			var keys []interface{}
-			for _, v := range a_key {
-				keyMap, _ := v.(map[string]interface{})
-				key, _ := keyMap["key"].([]interface{})
-				keys = append(keys, key)
-			}
-			m.T["msgset"] = keys
-		}
-	}
-	return m.Render("/weixin/search/superSearch.html", &m.T)
+	return s.Render("/weixin/search/superSearch.html", &s.T)
 }

src/web/staticres/wxswordfish/superSearch.css

@@ -762,7 +762,7 @@
 	color:#1d1d1d;
 }
 .wxsearch .jyshaxuan{
-	border-bottom:1px solid #ccc; 
+	border-bottom:1px solid #e0e0e0;
 	width:100%;
 	height:40px;
 	margin:-10px 0px 0px;
@@ -823,6 +823,10 @@
 	font-size:18px;
 }
 .wxsearch .jyshxbottom .jydqsure{
+	 background: rgb(204, 204, 204);
+	 color:#fff;
+}
+.wxsearch .jyshxbottom .jydqsure.on{
 	background-color:#2cb7ca;
 	color:#fff;
 }

src/web/staticres/wxswordfish/superSearch.js

@@ -188,34 +188,8 @@ $(function(){
 	function processVal(value){
 		$("[name='searchvalue']").val(value.replace(/^\s+|\s+$/g,"").replace(/\s+/g,"+"));
 	}
-	////////////////////////列表页面过滤条件//////////////////////////////
-	$(".sl-jyshxbottom").find(".jydqsure").click(function(){
-		var sn = $("#searchlist").contents().find(".searchname").val();
-		listf.window.processVal(sn);
-		listf.window.beforeSubmit();
-	});
-	$(".sl-jyshxbottom").find(".jydqreset").click(function(){
-		$("#searchlist").contents().find(".searchname [name='searchvalue']").val("");
-		$("#searchlist").contents().find(".searchname [name='area']").val("");
-		$("#searchlist").contents().find(".searchname [name='scope']").val("");
-		var dObj = $("#searchlist").contents().find(".contentone");
-		var dObjTwo = $("#searchlist").contents().find(".contenttwo");
-		dObj.find(".btn").removeClass("active");
-		dObj.find('div[id="dqbtn"]').removeClass("active");
-		dObjTwo.find(".btn").removeClass("active");
-		dObjTwo.find('div[id="dqbtn"]').removeClass("active");
-		if(dObj.find(".btn.active").length == 0){
-			dObj.find("ul:first li:first .btn").addClass("active");
-		};
-		if(dObjTwo.find(".btn.active").length == 0){
-			dObjTwo.find("ul:first li:first .btn").addClass("active");
-		};
-		var dObjThree = $("#searchlist").contents().find(".jypt-dialog");
-		dObjThree.find(".jypt-timeinputs").removeClass("jypt-timeinputs-active");
-		dObjThree.find(".jypt-pt>button").removeClass("jypt-active");
-		dObjThree.find(".jypt-pt>button:first").addClass("jypt-active");
-	});
-	//
+
+	//获取输入时间
 	$(".jypt-pt button").click(function(){
 		var thisIndex = $(".jypt-pt .jypt-active").index();
 		$(".jypt-pt .jypt-active").removeClass("jypt-active");

src/web/templates/weixin/search/superSearch1.html

@@ -1,354 +0,0 @@
-<html>
-<head>
-<title>超级搜索</title>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="renderer" content="webkit">
-<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,initial-scale=1.0" user-scalable="no" />
-<meta name="applicable-device" content="pc,mobile" />
-<meta charset="utf-8">
-<meta name="baidu-site-verification" content="cSFG2PMaYX" />
-<link href="/mobiscroll/mobiscroll.min.css" rel="stylesheet">
-<link href="/css/search/superSearch.css" rel="stylesheet">
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-<link href="/css/bootswatch.min.css" rel="stylesheet">
-<link href="/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<script src="/js/jquery.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/jy.js?v={{Msg "seo" "version"}}"></script>
-<script src="/mobiscroll/mobiscroll.min.js"></script>
-<script src="/wxswordfish/superSearch1.js"></script>
-<style>
-
-</style>
-</head>
-<body>
-	<!-->顶部搜索<-->
-<div id="searchDiv">
-	<form class="searchform" id="searchform" method="post" action="/swordfish/searchlist" target="listf">
-	<div class="wxhead">
-	<input class="form-control searchname" id="searchname" name="searchname" maxlength ="50" value="{{if .T.shname}}{{.T.shname}}{{end}}" placeholder="示例：税务局 软件"/>
-	<span class="tubiao"><img src="/images/wx/jywxjs.png"/></span>
-	<span class="qc"><img src="/images/wx/jyqingchu.png"/></span>
-	<span class="shaixuan">筛选</span>
-	</div>
-	</form>
-</div>
-	<!-->过滤搜索<-->
-<div id="set_search" class="">
-	<div class="select">
-		<div>行业</div>
-		<div>金额</div>
-		<div>发布日期</div>
-		<div>项目地区</div>
-		<div>信息类型</div>
-	</div>
-	<div>
-			<!-->行业<-->
-		<div class="selector industry">
-			<ul class="hyHead">
-				<li class="on">全部</li>
-				<li>建筑工程</li>
-				<li>水利水电</li>
-				<li>能源化工</li>
-				<li>弱点安防</li>
-				<li>信息技术</li>
-				<li>行政办公</li>
-				<li>机械设备</li>
-				<li>交通工程</li>
-				<li>医疗卫生</li>
-				<li>市政设施</li>
-				<li>服务采购</li>
-			</ul>
-			<div class="hyBody">
-	
-				<div style="display: block;" class="iner-list">
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>勘察设计</li>
-						<li>工程施工</li>
-						<li>工程监理</li>
-						<li>材料设备</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>水利工程</li>
-						<li>发电工程</li>
-						<li>航运工程</li>
-						<li>其他工程</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>原材料</li>
-						<li>仪器仪表</li>
-						<li>设备</li>
-						<li>化工产品</li>
-						<li>新能源</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>综合布线</li>
-						<li>智能系统</li>
-						<li>智能家居</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>系统集成及安全</li>
-						<li>软件开发</li>
-						<li>运维服务</li>
-						<li>其他</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>办公家具</li>
-						<li>通用办公设备</li>
-						<li>专业设备</li>
-						<li>办公用品</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>农业机械</li>
-						<li>矿山机械</li>
-						<li>工程机械</li>
-						<li>机械零部件</li>
-						<li>机床</li>
-						<li>车辆</li>
-						<li>其他机械设备</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>隧道工程</li>
-						<li>轨道工程</li>
-						<li>桥梁工程</li>
-						<li>其他工程</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>设备</li>
-						<li>耗材</li>
-						<li>药品</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>市政道路</li>
-						<li>市政绿化</li>
-						<li>管道线路</li>
-						<li>综合项目</li>
-					</ul>
-				</div>
-				<div class="iner-list">
-					<ul>
-						<li>全部</li>
-						<li>法律咨询</li>
-						<li>会计服务</li>
-						<li>物业服务</li>
-						<li>审计服务</li>
-						<li>安保服务</li>
-						<li>物流服务</li>
-						<li>其他服务</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-		<!-->金额<-->
-		<div class="selector money hidden">
-			<ul>
-				<li><button class="btn">全部</button></li>
-				<li>价格区间</li>
-				<li class="money-inp">
-					<div class="min-price">
-						<input class="form-control"  placeholder="最低价"/>
-						<span class="min-unit">万元</span>
-						<span class="fgx"></span>
-					</div>
-					<div class="max-price">
-						<input class="form-control"  placeholder="最高价"/>
-						<span class="max-unit">万元</span>
-					</div>
-					
-				</li>
-			</ul>
-		</div>
-		<!-->发布日期<-->
-		<div class="selector pubtime hidden">
-			<center class="jypt-pt">
-				<button type="button" data-value="" class="btn">全部</button>
-				<button type="button" data-value="lately-7" class="btn">最近7天</button>
-				<button type="button" data-value="lately-30" class="btn">最近30天</button>
-				<button type="button" data-value="thisyear" class="btn">去年</button>
-			</center>
-			<center class="jypt-timeinputs">
-				<input type="text" name="starttime" readonly="readonly" id="starttime" data-value="" class="mbsc-comp">
-				<div class="jypt-fg">
-					<span></span>
-				</div>
-				<input type="text" name="endtime" readonly="readonly" id="endtime" data-value="" class="mbsc-comp">
-			</center>
-		</div>
-		<!-->地区<-->
-		<div class="selector area hidden">
-			<ul>
-				<li>
-					<button class="btn">全国</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">华北地区</div>
-					<button class="btn">北京</button>
-					<button class="btn">天津</button>
-					<button class="btn">河北</button>
-					<button class="btn">山西</button>
-					<button class="btn">内蒙古</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">东北地区</div>
-					<button class="btn">辽宁</button>
-					<button class="btn">吉林</button>
-					<button class="btn">黑龙江</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">华东地区</div>
-					<button class="btn">上海</button>
-					<button class="btn">江苏</button>
-					<button class="btn">浙江</button>
-					<button class="btn">安徽</button>
-					<button class="btn">福建</button>
-					<button class="btn">江西</button>
-					<button class="btn">山东</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">华南地区</div>
-					<button class="btn">广东</button>
-					<button class="btn">广西</button>
-					<button class="btn">海南</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">华中地区</div>
-					<button class="btn">河南</button>
-					<button class="btn">湖北</button>
-					<button class="btn">湖南</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">西南地区</div>
-					<button class="btn">重庆</button>
-					<button class="btn">四川</button>
-					<button class="btn">贵州</button>
-					<button class="btn">云南</button>
-					<button class="btn">西藏</button>
-				</li>
-				<li>
-					<div id="dqbtn" style="width:81px;">西北地区</div>
-					<button class="btn">陕西</button>
-					<button class="btn">甘肃</button>
-					<button class="btn">青海</button>
-					<button class="btn">宁夏</button>
-					<button class="btn">新疆</button>
-				</li>
-			</ul>
-		</div>
-		<!-->类型<-->
-		<div class="selector infotype hidden">
-			<div class="contenttwo">
-				<ul>
-					<li>
-						<button class="btn">全部</button>
-					</li>
-					<li>
-						<div id="dqbtn" style="width:81px;position:relative;float:left;" data-value="拟建">拟建项目</div><img style="float:left;" class="q-mark" src="/images/wx/q-mark.png">
-						<button class="btn hidden" style="clear:both;">拟建</button>
-					</li>
-					<li>
-						<div id="dqbtn" style="width:81px;" data-value="预告">招标预告</div>
-						<button class="btn hidden">预告</button>
-					</li>
-					<li>
-						<div id="dqbtn" style="width:81px;" data-value="招标">招标公告</div>
-						<button class="btn">招标</button>
-						<button class="btn">邀标</button>
-						<button class="btn">询价</button>
-						<button class="btn">竞谈</button>
-						<button class="btn">单一</button>
-						<button class="btn">竞价</button>
-						<button class="btn">变更</button>
-					</li>
-					<li>
-						<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
-						<button class="btn">中标</button>
-						<button class="btn">成交</button>
-						<button class="btn">废标</button>
-						<button class="btn">流标</button>
-					</li>
-					<li>
-						<div id="dqbtn" style="width:111px;" data-value="其它">招标信用信息</div>
-						<button class="btn">合同</button>
-						<button class="btn">验收</button>
-						<button class="btn">违规</button>
-						<button class="btn">其它</button>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>	
-	<div class="bottom_btn">
-		<ul>
-			<li class="jydqreset reset">重置</li>
-			<li class="jydqsure sure">确定</li>
-		</ul>
-	</div>	
-</div>
-</body>
-</html>
-<script>
-	//显示筛选过滤选择
-	$(".shaixuan").click(function(){
-		if($("#set_search").attr("class")=="hidden"){
-			$("#set_search").removeClass("hidden");
-		}else{
-			$("#set_search").addClass("hidden");
-		}
-	})
-	$(function(){
-				//筛选菜单
-				var menu=$("#set_search .select div"),
-				    selector=$(".selector");
-						
-				menu.click(function(){
-					$(this).css("color","#2cb7ca").css("background-image","url('/images/search/sys-jt-bottom2.png')");
-					$(this).siblings().css("color","#888").css("background-image","url('/images/search/sys-jt-bottom.png')");
-					selector.eq($(this).index()).removeClass("hidden");
-					selector.eq($(this).index()).siblings().addClass("hidden");	
-				})
-
-		
-				//行业点击
-				var $leftTab = $(".industry .hyHead li"),
-					$inerLists = $(".industry .hyBody .iner-list");
-				$leftTab.on('click',function(){
-					$(this).addClass('on').siblings().removeClass("on");
-					$inerLists.eq($(this).index()).show().siblings().hide();
-				})
-				$inerLists.on('click','li',function(){
-					$(this).addClass('active').siblings().removeClass("active")
-				})
-			})
-
-</script>