|
@@ -131,7 +131,7 @@
|
|
</div> -->
|
|
</div> -->
|
|
<van-dropdown-menu style="width: auto;overflow-x: auto;">
|
|
<van-dropdown-menu style="width: auto;overflow-x: auto;">
|
|
<van-dropdown-item :title="tagText.timeText" ref="dateItem">
|
|
<van-dropdown-item :title="tagText.timeText" ref="dateItem">
|
|
- <date-component @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
|
|
|
|
|
|
+ <date-component :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
<van-dropdown-item ref="areaItem">
|
|
<van-dropdown-item ref="areaItem">
|
|
<template #title>
|
|
<template #title>
|
|
@@ -141,7 +141,7 @@
|
|
<span class="root_open">开通</span>
|
|
<span class="root_open">开通</span>
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
- <area-component v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
|
|
|
|
|
|
+ <area-component :key="setTimer.areatimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectarealist="selectAreaList"></area-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
<van-dropdown-item ref="industryItem">
|
|
<van-dropdown-item ref="industryItem">
|
|
@@ -152,7 +152,7 @@
|
|
<span class="root_open">开通</span>
|
|
<span class="root_open">开通</span>
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
- <industry-component v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
|
|
|
|
|
|
+ <industry-component :key="setTimer.industrytimer" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
<van-dropdown-item ref="cateItem">
|
|
<van-dropdown-item ref="cateItem">
|
|
@@ -163,7 +163,7 @@
|
|
<span class="root_open">开通</span>
|
|
<span class="root_open">开通</span>
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
- <cate-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectcatelist="selectCateList"></cate-component>
|
|
|
|
|
|
+ <cate-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :key="setTimer.catetimer" :selectcatelist="selectCateList"></cate-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
<van-dropdown-item title="关键词" ref="keywordItem">
|
|
<van-dropdown-item title="关键词" ref="keywordItem">
|
|
@@ -174,7 +174,7 @@
|
|
<span class="root_open">开通</span>
|
|
<span class="root_open">开通</span>
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
- <keyword-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectkeywordlist="selectKeyWordList"></keyword-component>
|
|
|
|
|
|
+ <keyword-component :key="setTimer.keytimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectkeywordlist="selectKeyWordList"></keyword-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
<van-dropdown-item title="公告类型" ref="noticeItem">
|
|
<van-dropdown-item title="公告类型" ref="noticeItem">
|
|
@@ -185,7 +185,7 @@
|
|
<span class="root_open">开通</span>
|
|
<span class="root_open">开通</span>
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
- <notice-component @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectnoticelist="selectNoticeList"></notice-component>
|
|
|
|
|
|
+ <notice-component :key="setTimer.noticetimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :selectnoticelist="selectNoticeList"></notice-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
<root-component v-if="!screenShow" @cancel="cancel" @confirm="confirm"></root-component>
|
|
</van-dropdown-item>
|
|
</van-dropdown-item>
|
|
</van-dropdown-menu>
|
|
</van-dropdown-menu>
|
|
@@ -730,6 +730,7 @@
|
|
pageIndex = 2;
|
|
pageIndex = 2;
|
|
lasttime = data.thistime;
|
|
lasttime = data.thistime;
|
|
hasNextPage = data.hasNextPage;
|
|
hasNextPage = data.hasNextPage;
|
|
|
|
+ vm.hasNextPage = data.hasNextPage
|
|
userId = data.userId;
|
|
userId = data.userId;
|
|
sessionStorage.userId = userId;
|
|
sessionStorage.userId = userId;
|
|
sessionStorage.setItem(userId + "_searchTime", firstTime);
|
|
sessionStorage.setItem(userId + "_searchTime", firstTime);
|
|
@@ -932,13 +933,16 @@ window.listScroll = function() {
|
|
}
|
|
}
|
|
|
|
|
|
function loadDatas(me, le) {
|
|
function loadDatas(me, le) {
|
|
|
|
+ console.log('pag1')
|
|
wxflag = me;
|
|
wxflag = me;
|
|
selectCity = vm.area; // 地区
|
|
selectCity = vm.area; // 地区
|
|
selectIndustry = vm.subscopeclass // 行业
|
|
selectIndustry = vm.subscopeclass // 行业
|
|
selectCate = vm.buyerclass // 采购单位
|
|
selectCate = vm.buyerclass // 采购单位
|
|
selectKeyword = vm.key // 关键词
|
|
selectKeyword = vm.key // 关键词
|
|
selectNotice = vm.subtype // 公告类型
|
|
selectNotice = vm.subtype // 公告类型
|
|
- $.ajax({
|
|
|
|
|
|
+ console.log(vm.hasNextPage)
|
|
|
|
+ if(vm.hasNextPage) {
|
|
|
|
+ $.ajax({
|
|
type: 'post',
|
|
type: 'post',
|
|
url: '/jyapp/swordfish/historypush/paging',
|
|
url: '/jyapp/swordfish/historypush/paging',
|
|
data: {"pageNum": pageIndex, "selectTime": firstTime, "area": selectCity, "subscopeclass": selectIndustry, "buyerclass": selectCate, "key": selectKeyword, "subtype": selectNotice},
|
|
data: {"pageNum": pageIndex, "selectTime": firstTime, "area": selectCity, "subscopeclass": selectIndustry, "buyerclass": selectCate, "key": selectKeyword, "subtype": selectNotice},
|
|
@@ -963,7 +967,8 @@ window.listScroll = function() {
|
|
error: function (xhr, type) {
|
|
error: function (xhr, type) {
|
|
noMoreData(me);
|
|
noMoreData(me);
|
|
}
|
|
}
|
|
- });
|
|
|
|
|
|
+ });
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
function noMoreData(me) {
|
|
function noMoreData(me) {
|
|
@@ -986,6 +991,7 @@ function hasNoData() {
|
|
$("#loading").hide()
|
|
$("#loading").hide()
|
|
$(".color_top").hide()
|
|
$(".color_top").hide()
|
|
// 如果no-key-no-data 不显示,才会显示no-data
|
|
// 如果no-key-no-data 不显示,才会显示no-data
|
|
|
|
+ console.log(nokeyNoDataShow, 'nokeyNoDataShow')
|
|
if (!nokeyNoDataShow) {
|
|
if (!nokeyNoDataShow) {
|
|
$(".findnull_").css("display", "block").siblings('.empty').hide()
|
|
$(".findnull_").css("display", "block").siblings('.empty').hide()
|
|
}
|
|
}
|
|
@@ -1341,6 +1347,7 @@ function hasNoData() {
|
|
lasttime = data.thistime;
|
|
lasttime = data.thistime;
|
|
firstPage = data.data;
|
|
firstPage = data.data;
|
|
hasNextPage = data.hasNextPage;
|
|
hasNextPage = data.hasNextPage;
|
|
|
|
+ vm.hasNextPage = data.hasNextPage
|
|
userId = data.userId;
|
|
userId = data.userId;
|
|
ajaxFlag = true;
|
|
ajaxFlag = true;
|
|
if (time == undefined || time == "") {
|
|
if (time == undefined || time == "") {
|
|
@@ -1352,7 +1359,7 @@ function hasNoData() {
|
|
sessionStorage.removeItem(userId + "_selectCity");
|
|
sessionStorage.removeItem(userId + "_selectCity");
|
|
sessionStorage.removeItem(userId + "_selectCityName");
|
|
sessionStorage.removeItem(userId + "_selectCityName");
|
|
} else {
|
|
} else {
|
|
- sessionStorage.setItem(userId + "_selectCity", area);
|
|
|
|
|
|
+ // sessionStorage.setItem(userId + "_selectCity", area);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
error: function (xhr, type) {
|
|
error: function (xhr, type) {
|
|
@@ -1361,6 +1368,7 @@ function hasNoData() {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
dataCache = firstPage;
|
|
dataCache = firstPage;
|
|
|
|
+ console.log(firstPage.length == 0)
|
|
if (firstPage.length == 0) {
|
|
if (firstPage.length == 0) {
|
|
if ($(".findnull").css("display") == "block") {
|
|
if ($(".findnull").css("display") == "block") {
|
|
$(".findnull").css("display", "none");
|
|
$(".findnull").css("display", "none");
|