Prechádzať zdrojové kódy

移动端 微信搜索

wangshan 6 rokov pred
rodič
commit
c8ea23944c

+ 1 - 1
src/jfw/modules/app/src/config.json

@@ -28,7 +28,7 @@
 		"passWord": "Topnet123"
 	},
     "agreement": "http",
-    "webdomain": "http://wxzxl.qmx.top",
+    "webdomain": "http://web-jydev-ws.jianyu360.cn",
     "redirect": {
         "wxpushlist": "/jyapp/wxpush/bidinfo/%s",
         "newInfoFollow": "/jyapp/followent/newInfo/%s",

+ 3 - 3
src/web/staticres/css/wxsearch.css

@@ -1647,7 +1647,7 @@ body{
 	background-color:#fff;
 }
 #wrapper{
-	margin-bottom: 52px;
+	margin-bottom: -52px;
 }
 .parent-node img {
 	vertical-align: sub !important;
@@ -1693,8 +1693,8 @@ body{
 	height:40px;
 	line-height: 40px;
 	color:#888;
-	padding: 0 10px;
-	border-bottom: 1px solid #e0e0e0;
+/*	padding: 0 10px;
+	border-bottom: 1px solid #e0e0e0;*/
 }
 .selLable div{
 	float: left;

+ 1 - 1
src/web/staticres/js/dropload.js

@@ -138,7 +138,7 @@
             me._scrollTop = me.$scrollArea.scrollTop();
 
             // 滚动页面触发加载数据
-			//alert(me._scrollContentHeight +"--"+ me._threshold+"--"+me._scrollWindowHeight +"--"+ me._scrollTop)
+			console.log(me._scrollContentHeight +"--"+ me._threshold+"--"+me._scrollWindowHeight +"--"+ me._scrollTop)
             if(me.opts.loadDownFn != '' && !me.loading && !me.isLockDown && (me._scrollContentHeight - me._threshold) <= (me._scrollWindowHeight + me._scrollTop)){
                 loadDown(me);
             }

+ 28 - 12
src/web/staticres/js/wxSupersearch.js

@@ -562,10 +562,12 @@ var SuperSearch = {
 				hasNextPage = false;
 			}
 		}
+		console.log(hasNextPage)
 		SuperSearch.reqParam["pageNum"] = parseInt(pgNum);
 		SuperSearch.dropload = $('#supersearchPage #wrapper').dropload({
 			scrollArea: window,
 			loadDownFn: function(me){
+				console.log("+++++++++++++++++++++++++")
 				if(SuperSearch.dropload == null){
 					SuperSearch.dropload = me;
 				}
@@ -1387,18 +1389,19 @@ var SuperSearch = {
 			sessionStorage.searchpageName="superSearch";
 			sessionStorage.superSearch_dyDiv=SuperSearch.dyDiv;
 			sessionStorage.superSearch_advertIsClose=SuperSearch.advertIsClose;
-			if($("#supersearchPage .on").hasClass("showlist")){
-				sessionStorage.superSearch_showType="showList";
-			}else if($("#supersearchPage .on").hasClass("showtable")){
-				sessionStorage.superSearch_showType="showTable";
-			}
+//			if($("#supersearchPage .on").hasClass("showlist")){
+//				sessionStorage.superSearch_showType="showList";
+//			}else if($("#supersearchPage .on").hasClass("showtable")){
+//				sessionStorage.superSearch_showType="showTable";
+//			}
+			sessionStorage.superSearch_showType=$(".newdialog .tab-box .sub-show-list").find("li.active").attr('dataVal');
 			var shaxuanclass = $("#supersearchPage .jyshaxuan .shaixcl").attr("class");
 			if(shaxuanclass){
 				shaxuanclass = shaxuanclass.split(" ")[0];
 				sessionStorage.superSearch_shaxuan=shaxuanclass;
 			}
 			sessionStorage.superSearch_shaxuanFlag=!$("#supersearchPage #super_search").hasClass("hidden");
-			sessionStorage.superSearch_searchType=$("#supersearchPage #selLable>.com-title>span.on").attr("id");
+			sessionStorage.superSearch_searchType=$(".newdialog .tab-box .sub-search-title").find("li.active").attr('dataVal');//$("#supersearchPage #selLable>.com-title>span.on").attr("id");
 			sessionStorage.superSearch_interceptWord=SuperSearch.interceptWord;
 			var hasNoData_tiptext_index = $("#supersearchPage #hasNoData_tiptext>font:visible").index();
 			if(hasNoData_tiptext_index==1){
@@ -1586,14 +1589,27 @@ var SuperSearch = {
 				$("#supersearchPage .jytype-dialog").removeClass("hidden");
 			}
 		}
-		$("#supersearchPage #selLable>.com-title>span.on").removeClass("on");
-		$("#supersearchPage #selLable>.com-title>#"+sessionStorage.superSearch_searchType).addClass("on");
-		if(sessionStorage.superSearch_showType=="showList"){
-			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
+//		$("#supersearchPage #selLable>.com-title>span.on").removeClass("on");
+//		$("#supersearchPage #selLable>.com-title>#"+sessionStorage.superSearch_searchType).addClass("on");
+		$(".newdialog .sub-search-title").find("li").removeClass("active");
+		$(".newdialog .sub-show-list").find("li").removeClass("active");
+		if(sessionStorage.superSearch_searchType=="searchtitle"){
+			$(".selected-export .options .search-title").find("em").text("标题搜索");
+			$(".newdialog .sub-search-title").find("li[dataval='searchtitle']").addClass("active");
+		}else if(sessionStorage.superSearch_searchType=="searchall"){
+			$(".selected-export .options .search-title").find("em").text("全文搜索");
+			$(".newdialog .sub-search-title").find("li[dataval='searchall']").addClass("active");
+		}
+		if(sessionStorage.superSearch_showType=="showlist"){
+			$(".selected-export .show-list").find("em").text("列表显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showlist']").addClass("active");
+//			$("#supersearchPage .showlist").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").addClass("hidden");
 			$("#supersearchPage #wrapper #list").removeClass("hidden");
-		}else if(sessionStorage.superSearch_showType=="showTable"){
-			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
+		}else if(sessionStorage.superSearch_showType=="showtable"){
+			$(".selected-export .show-list").find("em").text("表格显示");
+			$(".newdialog .sub-show-list").find("li[dataval='showtable']").addClass("active");
+//			$("#supersearchPage .showtable").addClass("on").siblings().removeClass("on");
 			$("#supersearchPage #wrapper #table").removeClass("hidden");
 			$("#supersearchPage #wrapper #list").addClass("hidden");
 		}

+ 121 - 0
src/web/staticres/wx_dataExport/css/search_tab.css

@@ -0,0 +1,121 @@
+.container {
+  height: 100%;
+}
+
+.weui-mask {
+  z-index: 998 !important;
+}
+
+.selected-export-box {
+  position: relative;
+  padding: 0 .28rem 0 .34rem;
+/*  height: .8rem;*/
+/*  line-height: .8rem;*/
+  font-size: .26rem;
+  background-color: #fff;
+  z-index: 999;
+	width: 100%;
+}
+.selected-export-box .selected-export .options {
+  display: inline-block;
+}
+.selected-export-box .selected-export .options .search-title,
+.selected-export-box .selected-export .options .show-list {
+  display: inline-block;
+  position: relative;
+  height: 100%;
+}
+.selected-export-box .selected-export .options .search-title i,
+.selected-export-box .selected-export .options .show-list i {
+/*  position: absolute;*/
+  font-size: .15rem;
+/*  top: 55%;*/
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+/*  right: -0.25rem;*/
+}
+.selected-export-box .selected-export .options .search-title.active,
+.selected-export-box .selected-export .options .show-list.active {
+  color: #2CB7CA;
+}
+.selected-export-box .selected-export .options .show-list {
+  margin-left: .74rem;
+}
+.selected-export-box .selected-export .export {
+  position: absolute;
+  top: 50%;
+  right: .28rem;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+	color: #2CB7CA;
+}
+.selected-export-box .selected-export .export span i {
+/*  position: absolute;*/
+  font-size: .2rem;
+/*	top: 51%;*/
+/*    left: -0.33rem;*/
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+/*	right: 0.1rem;*/
+}
+.selected-export-box .selected-export .export:before {
+  position: absolute;
+  content: '';
+  left: -0.66rem;
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+  width: 1px;
+  height: 0.44rem;
+  background-color: #e0e0e0;
+}
+
+.newdialog {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  bottom: 1px;
+  -webkit-transform: translateY(100%);
+          transform: translateY(100%);
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+.newdialog .tab-box {
+  padding: 0 .14rem;
+	width:100%;
+}
+.newdialog .tab-box .sub-tab li {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  height: .9rem;
+  line-height: .9rem;
+  color: #686868;
+  font-size: .26rem;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+	width:100%;
+  padding: 0 .2rem;
+}
+.newdialog .tab-box .sub-tab li:nth-of-type(2) {
+  border-top: 1px solid #e0e0e0;
+}
+.newdialog .tab-box .sub-tab li.active {
+  color: #2CB7CA;
+}
+.newdialog .tab-box .sub-tab li.active i {
+  display: block;
+}
+.newdialog .tab-box .sub-tab li .weui-icon-success-no-circle {
+  display: none;
+  margin-top: -0.05rem;
+  font-size: .32rem;
+  color: #2CB7CA;
+}
+.weui-mask, .weui-mask_transparent {
+    top: 80px !important;
+}

+ 155 - 5
src/web/templates/weixin/search/mainSearch.html

@@ -9,7 +9,7 @@
 <link href="{{Msg "seo" "cdn"}}/css/bootstrap.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/jy.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/common.css?v={{Msg "seo" "version"}}" rel="stylesheet">
-<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}" rel="stylesheet" type="text/css" >
+<link href="{{Msg "seo" "cdn"}}/css/wxsearch.css?v={{Msg "seo" "version"}}1" rel="stylesheet" type="text/css" >
 <link href="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.css" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/dropload.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 <link href="{{Msg "seo" "cdn"}}/css/wxlist.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -20,9 +20,14 @@
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}212"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
+<!--2.8-->
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/search_tab.css">
+<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
 <title>搜索</title>
 <script type="text/javascript">
 	var s_openid = {{session "s_m_openid"}};
@@ -33,7 +38,106 @@
 	SuperSearch.ZBADDRESS = {{Msg "seo" "ZBADDRESS"}};
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};
+	$(function(){
+        // 动画隐藏tab栏
+        function hideTab () {
+            $('.newdialog .tab-box .sub-search-title').slideUp('fast')
+            $('.newdialog .tab-box .sub-show-list').slideUp('fast')
+            $('.weui-mask').hide()
+        }
+
+        // 搜索选择的显示隐藏
+        $('.selected-export .options').on('tap', 'span',function(e){
+            var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
+            var $this = $(this)
+            // 如果已经显示,则判断点击的是否和上次相同
+            if ($('.weui-mask').css('display') !== 'none') {
+                // 点击按钮的时候dialog显示了,显示的如果和这次的相同,则隐藏
+                // 找到显示的sub-tab的index
+                var showArr = []
+                $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                    if ($(dom).css('display') !== 'none') {
+                        showArr.push($(dom).attr('index'))
+                    }
+                })
+                if (showArr.length === 1 && showArr[0] === index) {
+                    // 和上次点击的相同,则关闭tab栏
+                    hideTab()
+
+                    $(this).find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    return // 直接结束函数
+                }
+
+                // 如果已经显示,则tab切换不需要动画
+                $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                    if ($(dom).attr('index') === index) {
+                        $(dom).show().siblings().hide()
+                        
+                        // 切换上下三角
+                        $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
+                        $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                        return false
+                    }
+                })
+                $('.weui-mask').show()
+                return
+            }
+
+            // tab切换
+            $('.newdialog .tab-box ul.sub-tab').each(function (i, dom){
+                if ($(dom).attr('index') === index) {
+                    // $(dom).show().siblings().hide()
+                    $(dom).slideDown('fast').siblings().hide()
+                    
+                    // 切换上下三角
+                    $this.find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-shouqi')
+                    $this.siblings().find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+                    return false
+                }
+            })
+            $('.weui-mask').show()
+
+        })
 
+        // tab内容的选择
+        $('.newdialog .tab-box .sub-tab').on('tap', 'li',function () {
+            var text = $(this).find('span').text();
+            var index = $(this).parent().attr('index');
+            var dataVal = $(this).attr('dataVal');
+            var $optionsDOM = $(this).parents('.newdialog').siblings().find('.options span');
+			var reqFlag = true;
+            $optionsDOM.each(function(i,dom){
+                if ($(dom).attr('index') === index) {
+					if($(dom).find('em').text()==text){
+						reqFlag = false;
+					}else{
+                    	$(dom).find('em').text(text);
+					}
+                }
+                $(dom).find('i').removeClass('icon-zhankai').removeClass('icon-shouqi').addClass('icon-zhankai');
+            })
+            $(this).addClass('active')
+            $(this).siblings().removeClass('active')
+            hideTab()
+			console.log(reqFlag+"---"+dataVal)
+			if (reqFlag){
+				if (dataVal=="searchtitle"){//标题搜索
+					SuperSearch.titleSearch();
+				}else if(dataVal=="searchall"){//全文搜索
+					SuperSearch.allSearch();
+				}else if(dataVal=="showlist"){//列表显示
+					SuperSearch.showlist();
+				}else if(dataVal=="showtable"){//表格显示
+					SuperSearch.showTable();
+				}
+			}
+        })
+
+        $('.weui-mask').on('click', function(){
+            hideTab()
+            $('.selected-export .options').find('i').removeClass('icon-shouqi').addClass('icon-zhankai')
+        })
+	})
 </script>
 	<style>
 		#searchIndex .content li:nth-of-type(1) a {
@@ -124,12 +228,58 @@
 	</form>
 	<div>
 		<div class="selLable hidden" id="selLable">
-			<div class="com-title"><!--height:30px; margin-top:20px;-->
+			<div class="selected-export-box">
+                <div class="selected-export">
+                    <div class="options">
+                        <span class="search-title active" index="1">
+                            <em>标题搜索</em>
+                            <i class="iconfont icon-zhankai"></i>
+                        </span>
+                        <span class="show-list active" index="2">
+                            <em>列表显示</em>
+                            <!-- icon-shouqi -->
+                            <i class="iconfont icon-zhankai"></i>
+                        </span>
+                    </div>
+                    <div class="export">
+                        <span>
+                            <i class="iconfont icon-shujudaochu"></i>
+                            <em>数据导出</em>
+                        </span>
+                    </div>
+                </div>
+                <div class="newdialog">
+                    <div class="tab-box">
+                        <ul class="sub-tab sub-search-title" index="1"  style="display: none">
+                            <li class="active" dataVal="searchtitle">
+                                <span>标题搜索</span>
+                                <i class="weui-icon-success-no-circle"></i>
+                            </li>
+                            <li dataVal="searchall">
+                                <span>全文搜索</span>
+                                <i class="weui-icon-success-no-circle"></i>
+                            </li>
+                        </ul>
+                        <ul class="sub-tab sub-show-list" index="2" style="display: none">
+                            <li class="active" dataVal="showlist">
+                                <span>列表显示</span>
+                                <i class="weui-icon-success-no-circle"></i>
+                            </li>
+                            <li dataVal="showtable">
+                                <span>表格显示</span>
+                                <i class="weui-icon-success-no-circle"></i>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="weui-mask" style="display: none"></div>
+			<div class="com-title" style="display:none;"><!--height:30px; margin-top:20px;-->
 				<span id="search_title" class="on">标题搜索</span><!--<span style="float:left;">|</span>--><span id="search_all">全文搜索</span>
 			</div>
-			<div class="line-vertical">
+			<div class="line-vertical" style="display:none;">
 			</div>
-			<div class="showType">
+			<div class="showType" style="display:none;">
 				<div class="showlist on">列表</div>
 				<div class="showtable">表格</div>
 			</div>