Pārlūkot izejas kodu

ios筛选显示问题

TANGSHIZHE 4 gadi atpakaļ
vecāks
revīzija
c4c3bbad88

+ 19 - 0
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -105,6 +105,7 @@ var vNode = {
         }
     },
     created: function () {
+        this.getUserRoot()
         // svip是超级订阅企业查询, 如果是超级订阅不能查看企业情报历史记录
         var svip = utils.getParam('svip')
         if (svip) {
@@ -169,6 +170,24 @@ var vNode = {
         },
     },
     methods: {
+        // 判断是否有关注企业权限
+        getUserRoot: function() {
+            let _this = this
+            $.ajax({
+            url: '/publicapply/bidcoll/power',
+            type: 'POST',
+            success: function(res) {
+                console.log(res)
+                if(!res.data.member) {
+                    _this.entInfo.followSearchFinish = false
+                    _this.entInfo.entExist = false
+                } else {
+                    _this.entInfo.followSearchFinish = true
+                    _this.entInfo.entExist = true
+                }
+            }
+            })
+        },
         showToast: function (message) {
             this.$toast({
                 duration: 1500,

+ 10 - 3
src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -52,7 +52,8 @@ var vm = new Vue({
         industrytimer: '',
         keytimer: '',
         noticetimer: ''
-      }
+      },
+      iosMeauStyle: false
     }
   },
   created () {
@@ -163,12 +164,18 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
+    open: function() {
+      this.iosMeauStyle = true
+    },
+    close: function() {
+      this.iosMeauStyle = false
+    },
     // 订阅推送消息展示数据
     setPushTime: function(time) {
       console.log(time)
       let pushtime = {
-        start: parseInt(time.split('_')[0]),
-        end: parseInt(time.split('_')[0]),
+        start: parseInt(time.split('_')[0] * 1000),
+        end: parseInt(time.split('_')[0] * 1000),
       }
       this.tagText.timeText = new Date(pushtime.start).pattern('yyyy.MM.dd') + '~' + new Date(pushtime.end).pattern('yyyy.MM.dd')
       this.selectDate.startDate = pushtime.start

+ 39 - 196
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -73,6 +73,9 @@
             height: 8px;
             background: #F5F6F7;
         }
+        .iosMeau{
+            height: 100%;
+        }
     </style>
 </head>
 <body class="p13" id="viperSuper" style="background: #fff;overflow: hidden;">
@@ -129,11 +132,11 @@
                         </p>
                     </div>
                 </div> -->
-                    <van-dropdown-menu style="width: auto;overflow-x: auto;">
-                        <van-dropdown-item :title="tagText.timeText"  ref="dateItem">
+                    <van-dropdown-menu style="width: auto;overflow-x: auto;" :class="{iosMeau:iosMeauStyle==true}">
+                        <van-dropdown-item :title="tagText.timeText"  ref="dateItem" @open="open" @close="close">
                             <date-component :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                         </van-dropdown-item>
-                        <van-dropdown-item ref="areaItem">
+                        <van-dropdown-item ref="areaItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="areaText">地区</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -144,7 +147,7 @@
                             <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>
                         </van-dropdown-item>
-                        <van-dropdown-item ref="industryItem">
+                        <van-dropdown-item ref="industryItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="industryText">行业</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -155,7 +158,7 @@
                             <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>
                         </van-dropdown-item>
-                        <van-dropdown-item  ref="cateItem">
+                        <van-dropdown-item  ref="cateItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="cateText">采购单位</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -166,7 +169,7 @@
                             <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>
                         </van-dropdown-item>
-                        <van-dropdown-item title="关键词" ref="keywordItem">
+                        <van-dropdown-item title="关键词" ref="keywordItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="keywordText">关键词</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -177,7 +180,7 @@
                             <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>
                         </van-dropdown-item>
-                        <van-dropdown-item title="公告类型" ref="noticeItem">
+                        <van-dropdown-item title="公告类型" ref="noticeItem" @open="open" @close="close">
                             <template #title>
                                 <span v-if="screenShow" class="noticeText">公告类型</span>
                                 <span v-if="!screenShow" class="rootstyletitle">
@@ -529,7 +532,7 @@
   var firstTime = {{.T.selectTime}}
     // firstTime = '1624377600'
   if( firstTime != '') {
-    firstTime = firstTime + "000" +'_'+ firstTime + "000";
+    firstTime = firstTime +'_'+ firstTime;
     vm.time = firstTime
   }else {
     firstTime = vm.time
@@ -541,7 +544,6 @@
   var selectCate = vm.buyerclass // 采购单位
   var selectKeyword = vm.key // 关键词
   var selectNotice = vm.subtype // 公告类型
-  console.log(selectCity,selectIndustry,selectCate,selectKeyword,selectNotice, '11')
   //获取当前时间
   var date = (function () {
       var date = new Date();
@@ -553,6 +555,24 @@
       return year + '-' + month + '-' + day;
   })();
 
+    let listparams = {
+        pageNum: 1
+    }
+    var listnum = 0
+    $.ajax({
+        url: '/publicapply/bidcoll/list',
+        type: "POST",
+        contentType: 'application/json;charset=utf-8',
+        data: JSON.stringify(listparams),
+        success: function(res) {
+            if(res.error_code == 0) {
+                if(res.data && res.data.res) {
+                    listnum = res.data.res.length
+                }
+            }
+        }
+    })
+
   function initpage() {
       afterJyObjInit();
       var thisClass=this;
@@ -740,6 +760,7 @@
                     hasNoData();
                 }
             });
+            firstPage.length = 0
             if (firstPage.length == 0) {
                 //sessionStorage.removeItem("search_starttime");
                 sessionStorage.removeItem(sessionStorage.userId + "_searchTime");
@@ -933,14 +954,12 @@ window.listScroll = function() {
   }
 
   function loadDatas(me, le) {
-    console.log('pag1')
       wxflag = me;
       selectCity = vm.area; // 地区
       selectIndustry = vm.subscopeclass // 行业
       selectCate = vm.buyerclass // 采购单位
       selectKeyword = vm.key // 关键词
       selectNotice = vm.subtype // 公告类型
-      console.log(vm.hasNextPage)
       if(vm.hasNextPage) {
         $.ajax({
           type: 'post',
@@ -992,9 +1011,11 @@ function hasNoData() {
     $("#loading").hide()
     $(".color_top").hide()
     // 如果no-key-no-data 不显示,才会显示no-data
-    console.log(nokeyNoDataShow, 'nokeyNoDataShow')
     if (!nokeyNoDataShow || !NoDataShow) {
-        $(".findnull_").css("display", "block").siblings('.empty').hide()
+        $(".findnull_").css("display", "block")
+        $('.findnull_').siblings('.empty').hide()
+    } else {
+        $(".findnull_").css("display", "none")
     }
 }
 
@@ -1151,7 +1172,6 @@ function hasNoData() {
               + '<div style="clear:both;"></div>'
               + '</div>'
       }
-      console.log("-------:"+listhtml)
       if (object.length <= 3 && ad != undefined && ad != "" && !closeAdvert && showAd) {
           appendList($("<div>" + listhtml + "<div class='adv-wxpush-center' id='E1'>" + ad + "</div></div>"));
       } else {
@@ -1193,7 +1213,9 @@ function hasNoData() {
             // 说明未收藏,点击收藏
             if (vKeepComponent) {
                 vKeepComponent.changeBid(id, !shoucang)
-                vKeepComponent.changeKeepStatus(!shoucang, _this)
+                if(listnum <= 100) {
+                    vKeepComponent.changeKeepStatus(!shoucang, _this)
+                }
             }
         })
   }
@@ -1376,7 +1398,7 @@ function hasNoData() {
           }
       });
       dataCache = firstPage;
-      console.log(firstPage.length == 0)
+    //   firstPage.length = 0
       if (firstPage.length == 0) {
           if ($(".findnull").css("display") == "block") {
               $(".findnull").css("display", "none");
@@ -1674,125 +1696,7 @@ function hasNoData() {
         if (firstTime != "" && firstTime != null) {
             date = formatDate(firstTime / 1000, "1");
         }
-        // 点击选择时间
-        $('#showDatePicker').on('click', function () {
-            console.log('11')
-            var that = this
-            // 判断头部vip订阅广告是否显示
-            var isAdShow = $('.header_header').is(':visible')
-            if (isAdShow) {
-                $('.header_header').hide()
-            }
-
-            // 给取遮罩绑定点击事件
-            function closeTimePicker () {
-                var timeResultBox = $(that).find('.time_result')
-                var timeResult = timeResultBox.text()
-                // 点击取消或者空白处,时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            $('.jymobile-datePicker .weui-mask').on('click', closeTimePicker)
-            // 关闭地区选择
-            if ($('.screen').css("display") !== "none") {
-                if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                    $('#showArea').find("span").toggleClass("current");
-                }
-                $('.area_container').slideUp();
-                $('.screen').hide();
-            }
-
-            // weui 时间选择器
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-            } else {
-                var computedTop = $("._header").offset().top + $("._header").height() - 1
-                $("._header").addClass('fix-top')
-                $(".filter_tab").addClass('is-hide-border')
-                weui.datePicker({
-                    id: 'up',
-                    start: 2000,
-                    title: '选择时间',
-                    container: '.app-content',
-                    end: new Date(),
-                    defaultValue: date.split('-'),
-                    className: 'jymobile-datePicker up',
-                    onChange: function (result) {
-                        var nowTArr = result.map(function (v) {
-                            return v.label
-                        })
-                        $(".jymobile-datePicker.up .weui-picker__item").each(function(){
-                            var nowT = $(this).text()
-                            $(this).removeClass('is-now-select')
-                            if (nowTArr.indexOf(nowT) !== -1) {
-                                $(this).addClass('is-now-select')
-                            }
-                        })
-                    },
-                    onClose: function () {
-                        $("._header").removeClass('fix-top')
-                        $(".filter_tab").removeClass('is-hide-border')
-                        closeTimePicker()
-                        if (isAdShow) {
-                            $('.header_header').show()
-                        }
-                    },
-                    onConfirm: function (result) {
-                        var year = result[0].value;
-                        var month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
-                        var day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
-                        var time_result = year + '.' + month + '.' + day;
-                        FTAGData(year + '-' + month + '-' + day)
-                        $('.time_result').html(time_result)
-                    }
-                });
-                $(".jymobile-datePicker.up #weui-picker-confirm").text('确认')
-                $(that).find('.time_result').addClass('current')
-                $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend("<a href=\"javascript:;\" class=\"weui-btn weui-btn_disabled weui-picker__btn\" id=\"resetTime\" data-action=\"select\" style=\"text-decoration: none;\">\u91CD\u7F6E</a>");
-                // $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
-                $(".jymobile-datePicker.up #resetTime").on('click',function () {
-                    FTAGData();
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').trigger('click');
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').click();
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                })
-            }
-            // 日期选择器样式修改--start---------------------
-            // 修改标题
-            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
-            // $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
-            // $("#weui-picker-confirm").css("text-decoration", "none");
-        });
-        // 选择地区
-        $('#showArea').on('click', function () {
-            // 关闭时间选择
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-                var timeResult = $('#showDatePicker').find('.time_result').text()
-                // 点击取消或者空白处,时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $('#showDatePicker').find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            //if(_scrollTop==0){
-            //	_scrollTop = scrollTop;
-            //}
-            //$(".subscribe").toggleClass('overClass');
-            //scrollHtml();
-            if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                $(this).find("span").toggleClass("current");
-            }
-            $('.area_container').slideToggle();
-            $('.screen').toggle();
-        })
-
-        // 扩大点击区域(点击城市名字也能选中)
-        $('.area_wrap .c_item .city-name').on('click', function () {
-            //$(this).parent().children('input').trigger('click')
-        })
+        
         //
         $('.screen').click(function () {
             //$(".subscribe").toggleClass('overClass');
@@ -1803,67 +1707,6 @@ function hasNoData() {
             $('.area_container').slideUp();
             $('.screen').hide();
         })
-        // 地区选择确认按钮
-        $('.enter_btn').click(function () {
-            //$(".subscribe").toggleClass('overClass');
-            var cityCount = $('.area_wrap .city input:checked').length - $('.area_wrap .city .cityAll input:checked').length;
-            $('.area_container').slideUp();
-            $('.screen').hide()
-            selectCity = "" //重新选择 初始化地区 参数
-
-            if (!cityCount) {
-                $('#showArea .jymobile-tab-triangle').removeClass('current').text('地区');
-                ajaxFun(firstTime, selectCity);
-                return
-            }
-
-            // cityName对象
-            var selectCityName = []
-            // 判断省份后面的数字是否隐藏来确定该省份下的城市有没有被选择
-            $('.area_wrap .province .p_item').each(function (i, dom) {
-                var f = $(dom).find('.city-count').is(':hidden')
-
-                // 如果隐藏说明该省份下没有被选中的城市
-                if (f) {
-                    // 结束当前循环,进入下个循环
-                    return true
-                }
-                // 省份名称
-                var provinceName = $(dom).children('.province-name').text()
-                var citiesBox = $('.area_wrap .city .province_city').eq(i)
-                var selectedCities = citiesBox.find('input:checked').parent().children('.city-name')
-                // 城市数组
-                var cityArr = []
-                selectedCities.each(function (i, dom) {
-                    // 对获取到的城市名字符串去空格处理
-                    cityArr.push($(dom).text().replace(/\s+/g, ''));
-                })
-                for (var i = 0; i < cityArr.length; i++) {
-                    if (selectCity != "") {
-                        selectCity += ","
-                    }
-                    selectCity += cityArr[i];
-                }
-                selectCityName.push({
-                    province: provinceName,
-                    selectCity: cityArr
-                });
-            })
-            sessionStorage.setItem(userId + "_selectCityName", JSON.stringify(selectCityName));
-            ajaxFun(firstTime, selectCity);
-            // 重写地区text
-            $('#showArea .jymobile-tab-triangle').addClass('current').text('地区 '+cityCount);
-
-        })
-        $('.reset_btn').click(function () {
-            selectCity = ''
-            $('#showArea .jymobile-tab-triangle').removeClass('current').text('地区');
-            ajaxFun(firstTime, selectCity);
-            $('.area_wrap .province .city-count').hide().text('')
-            $('.c_item input[type="checkbox"]').prop('checked', false)
-            $('.screen').trigger('click')
-            $('.screen').click()
-        })
         // 关闭设置弹窗
         $('#close_set').on('click', function () {
             $('.set_keyword').hide()

+ 4 - 1
src/web/staticres/common-module/collection/css/index.css

@@ -55,7 +55,7 @@
     overflow: auto;
     height: .88rem;
     box-shadow: none;
-    border-bottom: 1.5px solid rgba(0,0,0,0.05);
+    /* border-bottom: 1.5px solid rgba(0,0,0,0.05); */
     z-index: 10;
 }
 .collection .van-dropdown-menu__item{
@@ -291,6 +291,9 @@
     color: #171826;
     line-height: .4rem;
 }
+.collection  .main-hidden{
+    overflow: hidden;
+}
 .collection .timeTag{
     display: -webkit-box;
     display: -webkit-flex;

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

@@ -20,7 +20,7 @@ var dateComponentTemplate = `<div class="j-container">
           </span>
         </div>
       </div>
-      <div class="j-main">
+      <div class="j-main main-hidden">
         <van-datetime-picker
           class="datepopup"
           :show-toolbar="false"
@@ -54,7 +54,7 @@ var dateComponentTemplate = `<div class="j-container">
           </span>
         </div>
       </div>
-      <div class="j-main">
+      <div class="j-main main-hidden">
         <van-datetime-picker
           class="datepopup"
           :show-toolbar="false"
@@ -121,8 +121,8 @@ var dateComponent = {
       datePicker:{
         startshow: false,
         endshow: false,
-        minDate: new Date(2020, 0, 1),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(2000, 0, 1),
+        maxDate: new Date(),
         startcurrentDate: new Date(),
         endcurrentDate: new Date(),
       },

+ 7 - 3
src/web/staticres/common-module/collection/js/keyword-mobile.js

@@ -94,10 +94,14 @@ var keywordComponent = {
         type: 'POST',
         success: function(res) {
           // 如果不是超级订阅会员,获取免费用户关键词
-          if(res.data.vip > 0) {
-            _this.isvip = true
+          if(res.data.vip <= 0) {
+            if(res.data.member || res.data.entniche) {
+              _this.isvip = false
+            } else {
+              _this.isvip = true
+            }
           } else {
-            _this.isvip = false
+            _this.isvip = true
           }
         }
       })

+ 10 - 3
src/web/staticres/vipsubscribe/js/historypush.js

@@ -52,7 +52,8 @@ var vm = new Vue({
         industrytimer: '',
         keytimer: '',
         noticetimer: ''
-      }
+      },
+      iosMeauStyle: false
     }
   },
   created () {
@@ -149,11 +150,17 @@ var vm = new Vue({
       this.key = ''
       this.buyerclass = ''
     },
+    open: function() {
+      this.iosMeauStyle = true
+    },
+    close: function() {
+      this.iosMeauStyle = false
+    },
     // 订阅推送消息展示数据
     setPushTime: function(time) {
       let pushtime = {
-        start: parseInt(time.split('_')[0]),
-        end: parseInt(time.split('_')[0]),
+        start: parseInt(time.split('_')[0] * 1000),
+        end: parseInt(time.split('_')[0] * 1000),
       }
       this.tagText.timeText = new Date(pushtime.start).pattern('yyyy.MM.dd') + '~' + new Date(pushtime.end).pattern('yyyy.MM.dd')
       this.selectDate.startDate = pushtime.start

+ 11 - 224
src/web/templates/weixin/historypush.html

@@ -522,6 +522,9 @@
             color: #fff;
             text-decoration: none;
         }
+        .iosMeau{
+            height: 100%;
+        }
     </style>
 </head>
 <body class="p13">
@@ -582,11 +585,11 @@
                 </p>
             </div>
         </div> -->
-        <van-dropdown-menu style="width: auto;overflow-x: auto;">
-            <van-dropdown-item :title="tagText.timeText"  ref="dateItem" id="showDatePicker">
+        <van-dropdown-menu style="width: auto;overflow-x: auto;" :class="{iosMeau:iosMeauStyle==true}">
+            <van-dropdown-item :title="tagText.timeText"  ref="dateItem" id="showDatePicker" @open="open" @close="close">
                 <date-component :key="setTimer.datetimer" ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
             </van-dropdown-item>
-            <van-dropdown-item ref="areaItem">
+            <van-dropdown-item ref="areaItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="areaText">地区</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -597,7 +600,7 @@
                 <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>
             </van-dropdown-item>
-            <van-dropdown-item ref="industryItem">
+            <van-dropdown-item ref="industryItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="industryText">行业</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -608,7 +611,7 @@
                 <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>
             </van-dropdown-item>
-            <van-dropdown-item  ref="cateItem">
+            <van-dropdown-item  ref="cateItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="cateText">采购单位</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -619,7 +622,7 @@
                 <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>
             </van-dropdown-item>
-            <van-dropdown-item title="关键词" ref="keywordItem">
+            <van-dropdown-item title="关键词" ref="keywordItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="keywordText">关键词</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -630,7 +633,7 @@
                 <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>
             </van-dropdown-item>
-            <van-dropdown-item title="公告类型" ref="noticeItem">
+            <van-dropdown-item title="公告类型" ref="noticeItem" @open="open" @close="close">
                 <template #title>
                     <span v-if="screenShow" class="noticeText">公告类型</span>
                     <span v-if="!screenShow" class="rootstyletitle">
@@ -930,7 +933,7 @@
       var firstTime = {{.T.stime}}; // 时间
     //   firstTime = '1624377600'
       if (firstTime != "") {
-          firstTime = firstTime + "000" +'_'+ firstTime + "000";
+          firstTime = firstTime  +'_'+ firstTime
           vm.time = firstTime
       } else {
           firstTime = vm.time
@@ -992,24 +995,6 @@
               showPage();
           } else {
               userId = sessionStorage.userId;
-              if (sessionStorage.getItem(userId + "_searchTime") != null && sessionStorage.getItem(userId + "_searchTime") != "") {
-                  firstTime = sessionStorage.getItem(userId + "_searchTime");
-              }
-              if (sessionStorage.getItem(userId + "_selectCity") != null && sessionStorage.getItem(userId + "_selectCity") != "") {
-                  selectCity = sessionStorage.getItem(userId + "_selectCity");
-              }
-              if (sessionStorage.getItem(userId + "_selectIndustry") != null && sessionStorage.getItem(userId + "_selectIndustry") != "") {
-                  selectIndustry = sessionStorage.getItem(userId + "_selectIndustry");
-              }
-              if (sessionStorage.getItem(userId + "_selectCate") != null && sessionStorage.getItem(userId + "_selectCate") != "") {
-                  selectCate = sessionStorage.getItem(userId + "_selectCate");
-              }
-              if (sessionStorage.getItem(userId + "_selectKeyword") != null && sessionStorage.getItem(userId + "_selectKeyword") != "") {
-                  selectKeyword = sessionStorage.getItem(userId + "_selectKeyword");
-              }
-              if (sessionStorage.getItem(userId + "_selectNotice") != null && sessionStorage.getItem(userId + "_selectNotice") != "") {
-                  selectNotice = sessionStorage.getItem(userId + "_selectNotice");
-              }
               $.ajax({
                 type: 'post',
                 url: '/front/hasPushHistory?t=' + new Date().getTime(),
@@ -1605,36 +1590,6 @@
                 firstPage = data.data;
                 hasNextPage = data.hasNextPage;
                 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);
-                // }
                 ajaxFlag = true;
             },
             error: function (xhr, type) {
@@ -1984,114 +1939,7 @@
         if (firstTime != "" && firstTime != null) {
             date = formatDate(firstTime / 1000, "1");
         }
-        // 点击选择时间
-        $('#showDatePicker').on('click', function () {
-            var that = this
-            // 给取遮罩绑定点击事件
-            function closeTimePicker () {
-                var timeResultBox = $(that).find('.time_result')
-                var timeResult = timeResultBox.text()
-                // 点击取消或者空白处,时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            $('.jymobile-datePicker .weui-mask').on('click', closeTimePicker)
-            // 关闭地区选择
-            if ($('.screen').css("display") !== "none") {
-                if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                    $('#showArea').find("span").toggleClass("current");
-                }
-                $('.area_container').slideUp();
-                $('.screen').hide();
-            }
 
-            // weui 时间选择器
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-            } else {
-                var computedTop = $("._header").offset().top + $("._header").height() - 1
-                $("._header").addClass('fix-top')
-                $(".filter_tab").addClass('is-hide-border')
-                weui.datePicker({
-                    id: 'up',
-                    start: 2000,
-                    title: '选择时间',
-                    end: new Date(),
-                    defaultValue: date.split('-'),
-                    className: 'jymobile-datePicker up',
-                    onChange: function (result) {
-                        var nowTArr = result.map(function (v) {
-                            return v.label
-                        })
-                        $(".jymobile-datePicker.up .weui-picker__item").each(function(){
-                            var nowT = $(this).text()
-                            $(this).removeClass('is-now-select')
-                            if (nowTArr.indexOf(nowT) !== -1) {
-                                $(this).addClass('is-now-select')
-                            }
-                        })
-                    },
-                    onClose: function () {
-                        $("._header").removeClass('fix-top')
-                        $(".filter_tab").removeClass('is-hide-border')
-                        closeTimePicker()
-                    },
-                    onConfirm: function (result) {
-                        let year = result[0].value;
-                        let month = result[1].value < 10 ? '0' + result[1].value : result[1].value;
-                        let day = result[2].value < 10 ? '0' + result[2].value : result[2].value;
-                        let time_result = year + '.' + month + '.' + day;
-                        FTAGData(year + '-' + month + '-' + day)
-                        $('.time_result').html(time_result)
-                    }
-                });
-                $(".jymobile-datePicker.up #weui-picker-confirm").text('确认')
-                $(that).find('.time_result').addClass('current')
-                $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend("<a href=\"javascript:;\" class=\"weui-btn weui-btn_disabled weui-picker__btn\" id=\"resetTime\" data-action=\"select\" style=\"text-decoration: none;\">\u91CD\u7F6E</a>");
-                // $(".jymobile-datePicker.up .weui-half-screen-dialog__ft").prepend(`<a href="javascript:;" class="weui-btn weui-btn_disabled weui-picker__btn" id="resetTime" data-action="select" style="text-decoration: none;">重置</a>`)
-                $(".jymobile-datePicker.up #resetTime").on('click',function () {
-                    FTAGData();
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').trigger('click');
-                    $('.jymobile-datePicker.up .weui-mask.weui-animate-fade-in').click();
-                    $(that).find('.time_result').removeClass('current').text('时间')
-                })
-            }
-            // 日期选择器样式修改--start---------------------
-            // 修改标题
-            // $('.jymobile-datePicker .weui-picker__hd a[data-action=cancel]')
-            // $('.jymobile-datePicker .weui-picker__hd a:first').removeClass('weui-picker__action').addClass('jymobile-picker__action').text('选择时间')
-            // $("#weui-picker-confirm").css("text-decoration", "none");
-        });
-        // 选择地区
-        $('#showArea').on('click', function () {
-            // 关闭时间选择
-            if (Boolean($(".jymobile-datePicker").html())) {
-                $(".jymobile-datePicker .weui-mask").click()
-                $(".jymobile-datePicker .weui-mask").trigger('click')
-                var timeResult = $('#showDatePicker').find('.time_result').text()
-                // 点击取消或者空白处,时间选择器消失。判断#showDatePicker是否高亮
-                if (timeResult === '时间') {
-                    $('#showDatePicker').find('.time_result').removeClass('current').text('时间')
-                }
-            }
-            //if(_scrollTop==0){
-            //	_scrollTop = scrollTop;
-            //}
-            //$(".subscribe").toggleClass('overClass');
-            //scrollHtml();
-            if (sessionStorage.getItem(userId + "_selectCityName") == "" || sessionStorage.getItem(userId + "_selectCityName") == undefined) {
-                $(this).find("span").toggleClass("current");
-            }
-            $('.area_container').slideToggle();
-            $('.screen').toggle();
-        })
-
-        // 扩大点击区域(点击城市名字也能选中)
-        $('.area_wrap .c_item .city-name').on('click', function () {
-            //$(this).parent().children('input').trigger('click')
-        })
         //
         $('.screen').click(function () {
             //$(".subscribe").toggleClass('overClass');
@@ -2102,67 +1950,6 @@
             $('.area_container').slideUp();
             $('.screen').hide();
         })
-        // 地区选择确认按钮
-        $('.enter_btn').click(function () {
-            //$(".subscribe").toggleClass('overClass');
-            var cityCount = $('.area_wrap .city input:checked').length - $('.area_wrap .city .cityAll input:checked').length;
-            $('.area_container').slideUp();
-            $('.screen').hide()
-            selectCity = "" //重新选择 初始化地区 参数
-
-            if (!cityCount) {
-                $('#showArea .jymobile-tab-triangle').removeClass('current').text("地区");
-                ajaxFun(firstTime, selectCity);
-                return
-            }
-
-            // cityName对象
-            var selectCityName = []
-            // 判断省份后面的数字是否隐藏来确定该省份下的城市有没有被选择
-            $('.area_wrap .province .p_item').each(function (i, dom) {
-                var f = $(dom).find('.city-count').is(':hidden')
-
-                // 如果隐藏说明该省份下没有被选中的城市
-                if (f) {
-                    // 结束当前循环,进入下个循环
-                    return true
-                }
-                // 省份名称
-                var provinceName = $(dom).children('.province-name').text()
-                var citiesBox = $('.area_wrap .city .province_city').eq(i)
-                var selectedCities = citiesBox.find('input:checked').parent().children('.city-name')
-                // 城市数组
-                var cityArr = []
-                selectedCities.each(function (i, dom) {
-                    // 对获取到的城市名字符串去空格处理
-                    cityArr.push($(dom).text().replace(/\s+/g, ''));
-                })
-                for (var i = 0; i < cityArr.length; i++) {
-                    if (selectCity != "") {
-                        selectCity += ","
-                    }
-                    selectCity += cityArr[i];
-                }
-                selectCityName.push({
-                    province: provinceName,
-                    selectCity: cityArr
-                });
-            })
-            sessionStorage.setItem(userId + "_selectCityName", JSON.stringify(selectCityName));
-            ajaxFun(firstTime, selectCity);
-            // 重写地区text
-            $('#showArea .jymobile-tab-triangle').addClass('current').text("地区 " + cityCount);
-
-        })
-        $('.reset_btn').click(function () {
-            selectCity = ''
-            $('#showArea .jymobile-tab-triangle').removeClass('current').text("地区");
-            ajaxFun(firstTime, selectCity);
-            $('.area_wrap .province .city-count').hide().text('')
-            $('.c_item input[type="checkbox"]').prop('checked', false)
-            $('.screen').trigger('click')
-            $('.screen').click()
-        })
         // 关闭设置弹窗
         $('#close_set').on('click', function () {
             $('.set_keyword').hide()