wangkaiyue 6 лет назад
Родитель
Сommit
60f5dbd2a9

+ 5 - 4
src/jfw/front/swordfish.go

@@ -484,10 +484,6 @@ func (m *Front) PcAjaxReq() {
 	if currentPage > pc_maxPageNum {
 		currentPage = pc_maxPageNum
 	}
-	//只有前20条 有全字段,
-	if currentPage != 1 {
-		tabularflag = ""
-	}
 	start := (currentPage - 1) * pc_pageSize
 	area := m.GetString("area")
 	subtype := m.GetString("subtype")
@@ -497,6 +493,11 @@ func (m *Front) PcAjaxReq() {
 	minprice := m.GetString("minprice") //最低价格
 	maxprice := m.GetString("maxprice") //最高价格
 	m.SetSession("selectType", selectType)
+	//只有前20条 有全字段,
+	if subtype != "拟建" && currentPage != 1 {
+		tabularflag = ""
+	}
+
 	if selectType == "" {
 		selectType = "all"
 	}

+ 6 - 2
src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -1459,7 +1459,9 @@ var SuperSearch = {
 	},
 	isTable:function(flag){
 		if(flag){ //table
-			SuperSearch.dropload.lock(); //表格只展示20条数据
+			if(SuperSearch.dropload){
+				SuperSearch.dropload.lock(); //表格只展示20条数据
+			}
 			if($("#table .content tr").length>20){
 				$(".dropload-down").css("display","none");
 				$("#wrapper .shade_table").css("display","");
@@ -1468,7 +1470,9 @@ var SuperSearch = {
 				$("#wrapper .shade_table").css("display","none");
 			}
 		}else{ //list
-			SuperSearch.dropload.unlock();
+			if(SuperSearch.dropload){
+				SuperSearch.dropload.unlock();
+			}
 			$(".dropload-down").css("display","");
 			$("#wrapper .shade_table").css("display","none");
 		}

+ 6 - 2
src/web/staticres/js/wxSupersearch.js

@@ -1389,7 +1389,9 @@ var SuperSearch = {
 	},
 	isTable:function(flag){
 		if(flag){ //table
-			SuperSearch.dropload.lock(); //表格只展示20条数据
+			if(SuperSearch.dropload){//表格只展示20条数据
+				SuperSearch.dropload.lock();
+			} 
 			if($("#table .content tr").length>20){
 				$(".dropload-down").css("display","none");
 				$("#wrapper .shade_table").css("display","");
@@ -1398,7 +1400,9 @@ var SuperSearch = {
 				$("#wrapper .shade_table").css("display","none");
 			}
 		}else{ //list
-			SuperSearch.dropload.unlock();
+			if(SuperSearch.dropload){
+				SuperSearch.dropload.unlock();
+			}
 			$(".dropload-down").css("display","");
 			$("#wrapper .shade_table").css("display","none");
 		}

+ 1 - 1
src/web/templates/weixin/search/mainSearch.html

@@ -334,7 +334,7 @@
 				<div class="TableTip" id="TableTip" style="display:none;"><img class="tableclose" src="{{Msg "seo" "cdn"}}/images/table_close.png"><div class="TableText">推荐使用电脑浏览器访问剑鱼标讯网站<br>jianyu360.com查看数据表格,体验更佳。</div></div>
 			</div>
       <div class="shade_table">
-        <div class="more" onclick="location.href='/sjdc/index.html'">
+        <div class="more" onclick="SuperSearch.setSessionStorage();location.href='/sjdc/index.html'">
           查看更多
         </div>
       </div>