Forráskód Böngészése

关键词设置、筛选条件样式修改

TANGSHIZHE 4 éve
szülő
commit
88b7aec080

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -77,7 +77,7 @@ img{
     transform:translateZ(0);
     transform:translateZ(0);
 }
 }
 .dropload-down{
 .dropload-down{
-    height: 50px;
+    height: 120px;
 }
 }
 .dropload-refresh,.dropload-update,.dropload-load,.dropload-noData{
 .dropload-refresh,.dropload-update,.dropload-load,.dropload-noData{
     height: 50px;
     height: 50px;

+ 34 - 4
src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -39,11 +39,20 @@ var vm = new Vue({
         keywordText: '关键词',
         keywordText: '关键词',
         noticeText: '公告类型'
         noticeText: '公告类型'
       },
       },
+      hasNextPage: false, // 是否有下一页
       selectCateList: [], // 选择的采购单位类型列表
       selectCateList: [], // 选择的采购单位类型列表
-      selectAreaList: [], // 选择的采购单位类型列表
+      selectAreaList: [], // 选择的地区列表
       selectIndustryList: [], // 选择的行业列表
       selectIndustryList: [], // 选择的行业列表
       selectKeyWordList: [], // 选择的行业列表
       selectKeyWordList: [], // 选择的行业列表
-      selectNoticeList: [] // 选择的公告类型列表
+      selectNoticeList: [], // 选择的公告类型列表
+      setTimer: {
+        datetimer: '',
+        areatimer: '',
+        catetimer: '',
+        industrytimer: '',
+        keytimer: '',
+        noticetimer: ''
+      }
     }
     }
   },
   },
   created () {
   created () {
@@ -51,6 +60,7 @@ var vm = new Vue({
     if (!recover) {
     if (!recover) {
       this.getUserRoot()
       this.getUserRoot()
     }
     }
+    this.addEventListerWeb()
   },
   },
   mounted () {
   mounted () {
     setTimeout(() => {
     setTimeout(() => {
@@ -66,6 +76,19 @@ var vm = new Vue({
     })
     })
   },
   },
   methods: {
   methods: {
+    addEventListerWeb: function() {
+      let _this = this
+      //监听浏览器tab切换,以便在tab切换之后,页面隐藏的时候,把弹幕停止
+        document.addEventListener('visibilitychange', function() {
+          var isHidden = document.hidden;
+          if (isHidden) {
+        //页面已隐藏
+            _this.setToggle()
+          } else {
+              //页面显示
+          }
+      }, false);
+    },
     recover: function () {
     recover: function () {
       let _this = this
       let _this = this
       var excludeKey = ['sessStorageKey']
       var excludeKey = ['sessStorageKey']
@@ -223,8 +246,8 @@ var vm = new Vue({
         this.tagText.industryText = data.t
         this.tagText.industryText = data.t
         this.subscopeclass = data.data.join(',')
         this.subscopeclass = data.data.join(',')
       } else if(data.name === 'cateItem'){
       } else if(data.name === 'cateItem'){
-        $('.cateText').html(data.t)
-        this.tagText.cateText = data.t
+        $('.cateText').html('采购单位' + data.t)
+        this.tagText.cateText = '采购单位' + data.t
         this.buyerclass = data.data.join(',')
         this.buyerclass = data.data.join(',')
       } else if(data.name === 'keywordItem'){
       } else if(data.name === 'keywordItem'){
         $('.keywordText').html(data.t)
         $('.keywordText').html(data.t)
@@ -246,21 +269,28 @@ var vm = new Vue({
       console.log(data)
       console.log(data)
       if(data.name === 'dateItem'){
       if(data.name === 'dateItem'){
         this.time = ''
         this.time = ''
+        this.tagText.timeText = '时间'
+        this.setTimer.datetimer = new Date().getTime()
       } else if(data.name === 'areaItem'){
       } else if(data.name === 'areaItem'){
         this.area = ''
         this.area = ''
         $('.areaText').html('地区')
         $('.areaText').html('地区')
+        this.setTimer.areatimer = new Date().getTime()
       } else if(data.name === 'industryItem'){
       } else if(data.name === 'industryItem'){
         this.subscopeclass = ''
         this.subscopeclass = ''
         $('.industryText').html('行业')
         $('.industryText').html('行业')
+        this.setTimer.industrytimer = new Date().getTime()
       } else if(data.name === 'cateItem'){
       } else if(data.name === 'cateItem'){
         this.buyerclass = ''
         this.buyerclass = ''
         $('.cateText').html('采购单位')
         $('.cateText').html('采购单位')
+        this.setTimer.catetimer = new Date().getTime()
       } else if(data.name === 'keywordItem'){
       } else if(data.name === 'keywordItem'){
         this.key = ''
         this.key = ''
         $('.keywordText').html('关键词')
         $('.keywordText').html('关键词')
+        this.setTimer.keytimer = new Date().getTime()
       } else if(data.name === 'noticeItem'){
       } else if(data.name === 'noticeItem'){
         this.subtype = ''
         this.subtype = ''
         $('.noticeText').html('公告类型')
         $('.noticeText').html('公告类型')
+        this.setTimer.noticetimer = new Date().getTime()
       }
       }
       this.setToggle()
       this.setToggle()
       setTimeout(()=>{
       setTimeout(()=>{

+ 2 - 2
src/jfw/modules/app/src/web/templates/frontRouter/collection/sess/index.html

@@ -45,13 +45,13 @@
           </div>
           </div>
           <van-dropdown-menu v-show="limitshow" :get-container="getContainer" :close-on-click-outside="false">
           <van-dropdown-menu v-show="limitshow" :get-container="getContainer" :close-on-click-outside="false">
             <van-dropdown-item  :title="tagText.perText"  ref="tagItem">
             <van-dropdown-item  :title="tagText.perText"  ref="tagItem">
-              <tags-component ref="tagcomp" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
+              <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.cateText" ref="cateItem">
             <van-dropdown-item :title="tagText.cateText" ref="cateItem">
-              <cate-component @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
+              <cate-component ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
             <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
               <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>
               <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>

+ 17 - 9
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -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");

+ 9 - 2
src/web/staticres/common-module/collection/js/cate-mobile.js

@@ -88,7 +88,7 @@ var cateComponent = {
     setState: function() {
     setState: function() {
       console.log(this.selectcatelist)
       console.log(this.selectcatelist)
       let arr = this.selectcatelist
       let arr = this.selectcatelist
-      if (this.selectcatelist) {
+      if (this.selectcatelist.length != 0) {
         this.tablist.forEach(function(item) {
         this.tablist.forEach(function(item) {
           item[Object.keys(item)[0]].forEach(function(data) {
           item[Object.keys(item)[0]].forEach(function(data) {
             arr.forEach(function(sum) {
             arr.forEach(function(sum) {
@@ -99,6 +99,13 @@ var cateComponent = {
           })
           })
         })
         })
         this.canClick = false
         this.canClick = false
+      } else {
+        this.tablist.forEach(function(item) {
+          item[Object.keys(item)[0]].forEach(function(data) {
+            data.type = false
+          })
+        })
+        console.log(this.tablist)
       }
       }
     },
     },
     // 获取数据
     // 获取数据
@@ -239,7 +246,7 @@ var cateComponent = {
           }
           }
         })
         })
       })
       })
-      t = '采购单位类型' + cateArr.length
+      t = cateArr.length
       let params = {
       let params = {
         name: 'cateItem',
         name: 'cateItem',
         data: cateArr,
         data: cateArr,

+ 1 - 1
src/web/staticres/common-module/collection/js/date-mobile.js

@@ -304,7 +304,7 @@ var dateComponent = {
       this.dateStyle = false
       this.dateStyle = false
       console.log(this.timeSelectList)
       console.log(this.timeSelectList)
       this.timeSelectList.forEach((v) => {
       this.timeSelectList.forEach((v) => {
-        console.log(v)
+        v.selected = false
         if(v.value == 'all') {
         if(v.value == 'all') {
           v.selected = true
           v.selected = true
         }
         }

+ 21 - 21
src/web/staticres/common-module/collection/js/index-wx.js

@@ -155,7 +155,7 @@ var vNode = {
       return this.$refs.searchContainer
       return this.$refs.searchContainer
     },
     },
     // 获取列表数据
     // 获取列表数据
-    getList: function() {
+    getList: function(isScreen) {
       let _this = this
       let _this = this
       _this.listState.loading = true
       _this.listState.loading = true
       let params = _this.limitlist
       let params = _this.limitlist
@@ -170,7 +170,11 @@ var vNode = {
             if (res.data && res.data.res && $.isArray(res.data.res)) {
             if (res.data && res.data.res && $.isArray(res.data.res)) {
               // 当数组为空时,且不为第一页,底部显示没有更多数据
               // 当数组为空时,且不为第一页,底部显示没有更多数据
               if(res.data.res.length == 0 && _this.limitlist.pageNum != 1){
               if(res.data.res.length == 0 && _this.limitlist.pageNum != 1){
-                _this.listState.list = _this.listState.list.concat(res.data.res)
+                if(isScreen) {
+                  _this.listState.list = res.data.res
+                } else {
+                  _this.listState.list = _this.listState.list.concat(res.data.res)
+                }
                 _this.listState.loading = false
                 _this.listState.loading = false
                 if(!res.data.haveNextPage){
                 if(!res.data.haveNextPage){
                     _this.listState.loading = true
                     _this.listState.loading = true
@@ -189,7 +193,11 @@ var vNode = {
                   res.data.res[i].bidamount = utils.moneyUnit(res.data.res[i].bidamount)
                   res.data.res[i].bidamount = utils.moneyUnit(res.data.res[i].bidamount)
                   res.data.res[i].publishtime = utils.dateFromNow(res.data.res[i].publishtime * 1000)
                   res.data.res[i].publishtime = utils.dateFromNow(res.data.res[i].publishtime * 1000)
                 }
                 }
-                _this.listState.list = _this.listState.list.concat(res.data.res)
+                if(isScreen) {
+                  _this.listState.list = res.data.res
+                } else {
+                  _this.listState.list = _this.listState.list.concat(res.data.res)
+                }
                 _this.listState.loading = false
                 _this.listState.loading = false
                 if(!res.data.haveNextPage){
                 if(!res.data.haveNextPage){
                   _this.listState.loading = true
                   _this.listState.loading = true
@@ -235,7 +243,7 @@ var vNode = {
           if(res.error_code == 0) {
           if(res.error_code == 0) {
             if(res.data) {
             if(res.data) {
               _this.$toast('取消收藏成功')
               _this.$toast('取消收藏成功')
-              _this.reLoadList()
+              _this.reLoadList(true)
             } else {
             } else {
               _this.$toast('取消收藏失败')
               _this.$toast('取消收藏失败')
             }
             }
@@ -289,7 +297,7 @@ var vNode = {
         }
         }
         this.limitlist.selectTime = (data.data.start / 1000).toFixed(0) + '_' + (data.data.end / 1000).toFixed(0)
         this.limitlist.selectTime = (data.data.start / 1000).toFixed(0) + '_' + (data.data.end / 1000).toFixed(0)
       } else if (data.name == 'cateItem') {
       } else if (data.name == 'cateItem') {
-        this.tagText.cateText = data.t
+        this.tagText.cateText = '采购单位类型' + data.t
         this.limitlist.buyerclass = data.data.join(',')
         this.limitlist.buyerclass = data.data.join(',')
       } else if (data.name == 'tagsItem') {
       } else if (data.name == 'tagsItem') {
         this.tagText.perText = data.t
         this.tagText.perText = data.t
@@ -301,7 +309,7 @@ var vNode = {
       }
       }
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       this.setToggle()
       this.setToggle()
-      this.reLoadList()
+      this.reLoadList(true)
     },
     },
     // 取消按钮事件
     // 取消按钮事件
     cancel: function(data) {
     cancel: function(data) {
@@ -314,21 +322,24 @@ var vNode = {
       } else if (data.name == 'cateItem') {
       } else if (data.name == 'cateItem') {
         this.tagText.cateText = '采购单位类型'
         this.tagText.cateText = '采购单位类型'
         this.limitlist.buyerclass = ''
         this.limitlist.buyerclass = ''
+        this.selectCateList = []
+        this.$refs.catecom.setState()
       } else if (data.name == 'tagsItem') {
       } else if (data.name == 'tagsItem') {
         this.limitlist.label = ''
         this.limitlist.label = ''
         this.tagText.perText = '个人标签'
         this.tagText.perText = '个人标签'
+        this.selectTagList = []
+        this.$refs.tagcom.setState()
       } else if (data.name == 'buyerItem') {
       } else if (data.name == 'buyerItem') {
         this.limitlist.buyerPhone = 0
         this.limitlist.buyerPhone = 0
       } else if (data.name == 'winnerItem') {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = 0
         this.limitlist.winnerPhone = 0
       }
       }
-      this.reLoadList()
+      this.reLoadList(true)
       this.setToggle()
       this.setToggle()
     },
     },
     // 刷新列表
     // 刷新列表
-    reLoadList: function() {
-      this.listState.list = []
-      this.getList()
+    reLoadList: function(isScreen) {
+      this.getList(isScreen)
     },
     },
     // 关闭菜单
     // 关闭菜单
     setToggle: function() {
     setToggle: function() {
@@ -338,17 +349,6 @@ var vNode = {
       this.$refs.buyerItem.toggle(false)
       this.$refs.buyerItem.toggle(false)
       this.$refs.winnerItem.toggle(false)
       this.$refs.winnerItem.toggle(false)
     },
     },
-
-    // 中标企业联系方式
-    getWinnerPhone: function(value) {
-      this.params.option5.forEach(function(data){
-        data.type = false
-      })
-      value.type = true
-      this.limitlist.winnerPhone = value.value
-      this.$refs.winnerItem.toggle(false)
-      this.reLoadList()
-    },
     // 获取个人标签列表
     // 获取个人标签列表
     getTagsList: function() {
     getTagsList: function() {
       let _this = this
       let _this = this

+ 23 - 23
src/web/staticres/common-module/collection/js/index.js

@@ -149,22 +149,25 @@ var vNode = {
       return this.$refs.searchContainer
       return this.$refs.searchContainer
     },
     },
     // 获取列表数据
     // 获取列表数据
-    getList: function() {
+    getList: function(isScreen) {
       let _this = this
       let _this = this
-      _this.listState.loading = true
       let params = _this.limitlist
       let params = _this.limitlist
+      _this.listState.loading = true
       $.ajax({
       $.ajax({
         url: '/publicapply/bidcoll/list',
         url: '/publicapply/bidcoll/list',
         type: "POST",
         type: "POST",
         contentType: 'application/json;charset=utf-8',
         contentType: 'application/json;charset=utf-8',
         data: JSON.stringify(params),
         data: JSON.stringify(params),
         success: function(res){
         success: function(res){
-          console.log(res)
           if (res.error_code == 0) {
           if (res.error_code == 0) {
             if (res.data && res.data.res && $.isArray(res.data.res)) {
             if (res.data && res.data.res && $.isArray(res.data.res)) {
               // 当数组为空时,且不为第一页,底部显示没有更多数据
               // 当数组为空时,且不为第一页,底部显示没有更多数据
               if(res.data.res.length == 0 && _this.limitlist.pageNum != 1){
               if(res.data.res.length == 0 && _this.limitlist.pageNum != 1){
-                _this.listState.list = _this.listState.list.concat(res.data.res)
+                if(isScreen) {
+                  _this.listState.list = res.data.res
+                } else {
+                  _this.listState.list = _this.listState.list.concat(res.data.res)
+                }
                 _this.listState.loading = false
                 _this.listState.loading = false
                 if(!res.data.haveNextPage){
                 if(!res.data.haveNextPage){
                     _this.listState.loading = true
                     _this.listState.loading = true
@@ -183,7 +186,11 @@ var vNode = {
                   res.data.res[i].bidamount = utils.moneyUnit(res.data.res[i].bidamount)
                   res.data.res[i].bidamount = utils.moneyUnit(res.data.res[i].bidamount)
                   res.data.res[i].publishtime = utils.dateFromNow(res.data.res[i].publishtime * 1000)
                   res.data.res[i].publishtime = utils.dateFromNow(res.data.res[i].publishtime * 1000)
                 }
                 }
-                _this.listState.list = _this.listState.list.concat(res.data.res)
+                if(isScreen) {
+                  _this.listState.list = res.data.res
+                } else {
+                  _this.listState.list = _this.listState.list.concat(res.data.res)
+                }
                 _this.listState.loading = false
                 _this.listState.loading = false
                 if(!res.data.haveNextPage){
                 if(!res.data.haveNextPage){
                   _this.listState.loading = true
                   _this.listState.loading = true
@@ -229,7 +236,7 @@ var vNode = {
           if(res.error_code == 0) {
           if(res.error_code == 0) {
             if(res.data) {
             if(res.data) {
               _this.$toast('取消收藏成功')
               _this.$toast('取消收藏成功')
-              _this.reLoadList()
+              _this.reLoadList(true)
             } else {
             } else {
               _this.$toast('取消收藏失败')
               _this.$toast('取消收藏失败')
             }
             }
@@ -281,7 +288,7 @@ var vNode = {
           }
           }
         }
         }
       } else if (data.name == 'cateItem') {
       } else if (data.name == 'cateItem') {
-        this.tagText.cateText = data.t
+        this.tagText.cateText = '采购单位类型' + data.t
         this.limitlist.buyerclass = data.data.join(',')
         this.limitlist.buyerclass = data.data.join(',')
       } else if (data.name == 'tagsItem') {
       } else if (data.name == 'tagsItem') {
         this.tagText.perText = data.t
         this.tagText.perText = data.t
@@ -291,9 +298,10 @@ var vNode = {
       } else if (data.name == 'winnerItem') {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = parseInt(data.data)
         this.limitlist.winnerPhone = parseInt(data.data)
       }
       }
+      isScreen = true
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       this.setToggle()
       this.setToggle()
-      this.reLoadList()
+      this.reLoadList(true)
     },
     },
     // 取消按钮事件
     // 取消按钮事件
     cancel: function(data) {
     cancel: function(data) {
@@ -306,21 +314,24 @@ var vNode = {
       } else if (data.name == 'cateItem') {
       } else if (data.name == 'cateItem') {
         this.tagText.cateText = '采购单位类型'
         this.tagText.cateText = '采购单位类型'
         this.limitlist.buyerclass = ''
         this.limitlist.buyerclass = ''
+        this.selectCateList = []
+        this.$refs.catecom.setState()
       } else if (data.name == 'tagsItem') {
       } else if (data.name == 'tagsItem') {
         this.limitlist.label = ''
         this.limitlist.label = ''
         this.tagText.perText = '个人标签'
         this.tagText.perText = '个人标签'
+        this.selectTagList = []
+        this.$refs.tagcom.setState()
       } else if (data.name == 'buyerItem') {
       } else if (data.name == 'buyerItem') {
         this.limitlist.buyerPhone = 0
         this.limitlist.buyerPhone = 0
       } else if (data.name == 'winnerItem') {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = 0
         this.limitlist.winnerPhone = 0
       }
       }
-      this.reLoadList()
+      this.reLoadList(true)
       this.setToggle()
       this.setToggle()
     },
     },
     // 刷新列表
     // 刷新列表
-    reLoadList: function() {
-      this.listState.list = []
-      this.getList()
+    reLoadList: function(isScreen) {
+      this.getList(isScreen)
     },
     },
     // 关闭菜单
     // 关闭菜单
     setToggle: function() {
     setToggle: function() {
@@ -330,17 +341,6 @@ var vNode = {
       this.$refs.buyerItem.toggle(false)
       this.$refs.buyerItem.toggle(false)
       this.$refs.winnerItem.toggle(false)
       this.$refs.winnerItem.toggle(false)
     },
     },
-
-    // 中标企业联系方式
-    getWinnerPhone: function(value) {
-      this.params.option5.forEach(function(data){
-        data.type = false
-      })
-      value.type = true
-      this.limitlist.winnerPhone = value.value
-      this.$refs.winnerItem.toggle(false)
-      this.reLoadList()
-    },
     // 获取个人标签列表
     // 获取个人标签列表
     getTagsList: function() {
     getTagsList: function() {
       let _this = this
       let _this = this

+ 1 - 0
src/web/staticres/common-module/collection/js/keyword-mobile.js

@@ -81,6 +81,7 @@ var keywordComponent = {
     }
     }
   },
   },
   created () {
   created () {
+    this.getUserRoot()
     this.getData()
     this.getData()
     this.getbBtnClick()
     this.getbBtnClick()
   },
   },

+ 4 - 0
src/web/staticres/common-module/collection/js/tags-mobile.js

@@ -37,6 +37,10 @@ var tagsComponent = {
             }
             }
           })
           })
         })
         })
+      } else {
+        this.taglist.forEach(function(item,index) {
+          item.type = false
+        })
       }
       }
     },
     },
     getState (data) {
     getState (data) {

+ 18 - 19
src/web/staticres/vipsubscribe/js/historypush.js

@@ -44,7 +44,15 @@ var vm = new Vue({
       selectAreaList: [], // 选择的地区列表
       selectAreaList: [], // 选择的地区列表
       selectIndustryList: [], // 选择的行业列表
       selectIndustryList: [], // 选择的行业列表
       selectKeyWordList: [], // 选择的关键词列表
       selectKeyWordList: [], // 选择的关键词列表
-      selectNoticeList: [] // 选择的公告类型列表
+      selectNoticeList: [], // 选择的公告类型列表
+      setTimer: {
+        datetimer: '',
+        areatimer: '',
+        catetimer: '',
+        industrytimer: '',
+        keytimer: '',
+        noticetimer: ''
+      }
     }
     }
   },
   },
   created () {
   created () {
@@ -133,9 +141,6 @@ var vm = new Vue({
       this.subscopeclass = ''
       this.subscopeclass = ''
       this.key = ''
       this.key = ''
       this.buyerclass = ''
       this.buyerclass = ''
-      setTimeout(() => {
-        this.$nextTick(this.getAjaXParams())
-      })
     },
     },
     revorceOtherData: function() {
     revorceOtherData: function() {
       this.area = ''
       this.area = ''
@@ -143,9 +148,6 @@ var vm = new Vue({
       this.subscopeclass = ''
       this.subscopeclass = ''
       this.key = ''
       this.key = ''
       this.buyerclass = ''
       this.buyerclass = ''
-      setTimeout(() => {
-        this.$nextTick(this.getAjaXParams())
-      })
     },
     },
     // 订阅推送消息展示数据
     // 订阅推送消息展示数据
     setPushTime: function(time) {
     setPushTime: function(time) {
@@ -228,8 +230,8 @@ var vm = new Vue({
         this.tagText.industryText = data.t
         this.tagText.industryText = data.t
         this.subscopeclass = data.data.join(',')
         this.subscopeclass = data.data.join(',')
       } else if(data.name === 'cateItem'){
       } else if(data.name === 'cateItem'){
-        $('.cateText').html(data.t)
-        this.tagText.cateText = data.t
+        $('.cateText').html('采购单位' + data.t)
+        this.tagText.cateText = '采购单位' + data.t
         this.buyerclass = data.data.join(',')
         this.buyerclass = data.data.join(',')
       } else if(data.name === 'keywordItem'){
       } else if(data.name === 'keywordItem'){
         $('.keywordText').html(data.t)
         $('.keywordText').html(data.t)
@@ -251,31 +253,28 @@ var vm = new Vue({
       console.log(data)
       console.log(data)
       if(data.name === 'dateItem'){
       if(data.name === 'dateItem'){
         this.time = ''
         this.time = ''
+        this.tagText.timeText = '时间'
+        this.setTimer.datetimer = new Date().getTime()
       } else if(data.name === 'areaItem'){
       } else if(data.name === 'areaItem'){
         this.area = ''
         this.area = ''
-        this.selectAreaList = []
-        this.$refs.areaItem.setState()
         $('.areaText').html('地区')
         $('.areaText').html('地区')
+        this.setTimer.areatimer = new Date().getTime()
       } else if(data.name === 'industryItem'){
       } else if(data.name === 'industryItem'){
         this.subscopeclass = ''
         this.subscopeclass = ''
-        this.selectIndustryList = []
-        this.$refs.industryCom.setState()
         $('.industryText').html('行业')
         $('.industryText').html('行业')
+        this.setTimer.industrytimer = new Date().getTime()
       } else if(data.name === 'cateItem'){
       } else if(data.name === 'cateItem'){
         this.buyerclass = ''
         this.buyerclass = ''
-        this.selectCateList = []
-        this.$refs.cateItem.setState()
         $('.cateText').html('采购单位')
         $('.cateText').html('采购单位')
+        this.setTimer.catetimer = new Date().getTime()
       } else if(data.name === 'keywordItem'){
       } else if(data.name === 'keywordItem'){
         this.key = ''
         this.key = ''
-        this.selectKeyWordList = []
-        this.$refs.keywordItem.setState()
         $('.keywordText').html('关键词')
         $('.keywordText').html('关键词')
+        this.setTimer.keytimer = new Date().getTime()
       } else if(data.name === 'noticeItem'){
       } else if(data.name === 'noticeItem'){
         this.subtype = ''
         this.subtype = ''
-        this.selectNoticeList = []
-        this.$refs.noticeItem.setState()
         $('.noticeText').html('公告类型')
         $('.noticeText').html('公告类型')
+        this.setTimer.noticetimer = new Date().getTime()
       }
       }
       this.setToggle()
       this.setToggle()
       setTimeout(()=>{
       setTimeout(()=>{

+ 2 - 2
src/web/templates/frontRouter/wx/collection/sess/index.html

@@ -51,13 +51,13 @@
           </div>
           </div>
           <van-dropdown-menu v-show="limitshow" :get-container="getContainer" :close-on-click-outside="false">
           <van-dropdown-menu v-show="limitshow" :get-container="getContainer" :close-on-click-outside="false">
             <van-dropdown-item  :title="tagText.perText"  ref="tagItem">
             <van-dropdown-item  :title="tagText.perText"  ref="tagItem">
-              <tags-component ref="tagcomp" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
+              <tags-component ref="tagcom" @confirm="confirm" @cancel="cancel" :selecttaglist="selectTagList" :taglist="tagList"></tags-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
             <van-dropdown-item :title="tagText.timeText" ref="dateItem">
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
               <date-component ref="datecom" @confirm="confirm" @cancel="cancel" :selectdate="selectDate"></date-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item :title="tagText.cateText" ref="cateItem">
             <van-dropdown-item :title="tagText.cateText" ref="cateItem">
-              <cate-component @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
+              <cate-component ref="catecom" @confirm="confirm" @cancel="cancel" :selectcatelist="selectCateList"></cate-component>
             </van-dropdown-item>
             </van-dropdown-item>
             <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
             <van-dropdown-item ref="buyerItem" v-model="limitlist.buyerPhone" title="采购单位联系方式">
               <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>
               <phone-component :data="params.buyerData" @confirm="confirm"></phone-component>

+ 36 - 36
src/web/templates/weixin/historypush.html

@@ -584,7 +584,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" id="showDatePicker">
             <van-dropdown-item :title="tagText.timeText"  ref="dateItem" id="showDatePicker">
-                <date-component ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
+                <date-component :key="setTimer.datetimer" ref="datecom" @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>
@@ -594,7 +594,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">
@@ -605,7 +605,7 @@
                         <span class="root_open">开通</span>
                         <span class="root_open">开通</span>
                     </span>
                     </span>
                 </template>
                 </template>
-                <industry-component ref="industryCom" v-if="screenShow" @cancel="cancel" @confirm="confirm" :selectindustrylist="selectIndustryList"></industry-component>
+                <industry-component :key="setTimer.industrytimer" ref="industryCom" 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">
@@ -616,7 +616,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 :key="setTimer.catetimer" @cancel="cancel" v-if="screenShow" @confirm="confirm" :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">
@@ -627,7 +627,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">
@@ -638,7 +638,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>
@@ -1599,36 +1599,36 @@
                 firstPage = data.data;
                 firstPage = data.data;
                 hasNextPage = data.hasNextPage;
                 hasNextPage = data.hasNextPage;
                 count = 0;
                 count = 0;
-                if (time == undefined || time == "") {
-                    sessionStorage.removeItem(userId + "_searchTime");
-                } else {
-                    sessionStorage.setItem(userId + "_searchTime", time);
-                }
-                if (area == undefined || area == "") {
-                    sessionStorage.removeItem(userId + "_selectCity");
-                } else {
-                    sessionStorage.setItem(userId + "_selectCity", area);
-                }
-                if (subscopeclass == undefined || subscopeclass == "") {
-                    sessionStorage.removeItem(userId + "_selectIndustry");
-                } else {
-                    sessionStorage.setItem(userId + "_selectIndustry", subscopeclass);
-                }
-                if (buyerclass == undefined || buyerclass == "") {
-                    sessionStorage.removeItem(userId + "_selectCate");
-                } else {
-                    sessionStorage.setItem(userId + "_selectCate", buyerclass);
-                }
-                if (key == undefined || key == "") {
-                    sessionStorage.removeItem(userId + "_selectKeyword");
-                } else {
-                    sessionStorage.setItem(userId + "_selectKeyword", key);
-                }
-                if (subtype == undefined || subtype == "") {
-                    sessionStorage.removeItem(userId + "_selectNotice");
-                } else {
-                    sessionStorage.setItem(userId + "_selectNotice", subtype);
-                }
+                // if (time == undefined || time == "") {
+                //     sessionStorage.removeItem(userId + "_searchTime");
+                // } else {
+                //     sessionStorage.setItem(userId + "_searchTime", time);
+                // }
+                // if (area == undefined || area == "") {
+                //     sessionStorage.removeItem(userId + "_selectCity");
+                // } else {
+                //     sessionStorage.setItem(userId + "_selectCity", area);
+                // }
+                // if (subscopeclass == undefined || subscopeclass == "") {
+                //     sessionStorage.removeItem(userId + "_selectIndustry");
+                // } else {
+                //     sessionStorage.setItem(userId + "_selectIndustry", subscopeclass);
+                // }
+                // if (buyerclass == undefined || buyerclass == "") {
+                //     sessionStorage.removeItem(userId + "_selectCate");
+                // } else {
+                //     sessionStorage.setItem(userId + "_selectCate", buyerclass);
+                // }
+                // if (key == undefined || key == "") {
+                //     sessionStorage.removeItem(userId + "_selectKeyword");
+                // } else {
+                //     sessionStorage.setItem(userId + "_selectKeyword", key);
+                // }
+                // if (subtype == undefined || subtype == "") {
+                //     sessionStorage.removeItem(userId + "_selectNotice");
+                // } else {
+                //     sessionStorage.setItem(userId + "_selectNotice", subtype);
+                // }
                 ajaxFlag = true;
                 ajaxFlag = true;
             },
             },
             error: function (xhr, type) {
             error: function (xhr, type) {