ios筛选兼容性问题

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -69,7 +69,7 @@
     .vip_openDialog .van-dialog__content .vip_head .vip_extend{
         font-size: 0.26rem;
     }
-    .van-overlay{
+    .vipOverlay.van-overlay{
         height: 85%;
         background-color: rgba(255,255,255,0);
         backdrop-filter: blur(5px);
@@ -117,6 +117,7 @@
         :before-close="beforeClose"
         class="vip_openDialog"
         :overlay="overlayShow"
+        overlay-class="vipOverlay"
         :confirm-button-text="bidcollPowerInfo.btntext"
         cancel-button-text="再想一想"
         >

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -923,6 +923,11 @@ window.listScroll = function() {
       if($(".vip_report").is(":hidden")||$(".vip_report>a").is(":hidden")){
         afterJyObjInit();
       }
+      selectCity = vm.area; // 地区
+      selectIndustry = vm.subscopeclass // 行业
+      selectCate = vm.buyerclass // 采购单位
+      selectKeyword = vm.key // 关键词
+      selectNotice = vm.subtype // 公告类型
       $.ajax({
           type: 'post',
           url: '/jyapp/front/hasPushHistory?t=' + new Date().getTime(),

src/web/staticres/common-module/collection/css/index.css

@@ -65,6 +65,9 @@
     flex: none;
     padding: .24rem .38rem;
 }
+.collection .van-dropdown-item .van-dropdown-item__content{
+    max-height: 70vh;
+}
 .collection .my-search.van-search.van-search--show-action{
     border-bottom:1.5px solid rgba(0,0,0,0.05);
 }

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

@@ -197,6 +197,8 @@ var dateComponent = {
     clearDateTimePicker () {
       this.dateTimePickerState.start = ''
       this.dateTimePickerState.end = ''
+      this.dateTimePickerState.startPlaceHolder = ''
+      this.dateTimePickerState.endPlaceHolder = ''
     },
     getState () {
       // timeState.exact: all/lately7/lately30/lastYear/exact5种状态
@@ -224,6 +226,7 @@ var dateComponent = {
           timeState.end = ''
         }
       }
+      console.log(timeState)
       return timeState
     },
     // 计算lately7/lately30/lastYear的开始和结束时间

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

@@ -131,6 +131,12 @@ var vNode = {
       }
       return !!$data
     },
+    setrecover: function() {
+      var scrollTop = $(this.$refs.jList).scrollTop()
+      // 如果滚动高度为0，或者entList长度为0，则不缓存数据(即返回刷新)
+      this.listState.scrollTop = scrollTop
+      sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
+    },
     // 判断是否是有权限
     getUserRoot: function() {
       let _this = this
@@ -149,10 +155,7 @@ var vNode = {
     },
     // 列表跳转
     linkRouter: function(id) {
-      var scrollTop = $(this.$refs.jList).scrollTop()
-      // 如果滚动高度为0，或者entList长度为0，则不缓存数据(即返回刷新)
-      this.listState.scrollTop = scrollTop
-      sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
+      this.setrecover()
       location.href = '/article/content/' + id + '.html'
     },
     // 筛选按钮
@@ -198,6 +201,7 @@ var vNode = {
                 // 当数组为空时，且为第一页，页面为暂无数据页面
                 _this.listState.loading = true
                 _this.listState.finished = true;
+                _this.listState.list = res.data.res
               } else {
                 // 数据正常加载更多
                 for (let i = 0; i < res.data.res.length; i++) {
@@ -322,7 +326,6 @@ var vNode = {
       } else if (data.name == 'winnerItem') {
         this.limitlist.winnerPhone = parseInt(data.data)
       }
-      sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       this.setToggle()
       this.reLoadList(true)
     },

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

@@ -124,6 +124,12 @@ var vNode = {
           sessionStorage.removeItem(this.sessStorageKey)
       }
       return !!$data
+  },
+  setrecover: function() {
+    var scrollTop = $(this.$refs.jList).scrollTop()
+    // 如果滚动高度为0，或者entList长度为0，则不缓存数据(即返回刷新)
+    this.listState.scrollTop = scrollTop
+    sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
   },
     // 判断是否是有权限
     getUserRoot: function() {
@@ -143,10 +149,7 @@ var vNode = {
     },
     // 列表跳转
     linkRouter: function(id) {
-      var scrollTop = $(this.$refs.jList).scrollTop()
-      // 如果滚动高度为0，或者entList长度为0，则不缓存数据(即返回刷新)
-      this.listState.scrollTop = scrollTop
-      sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
+      this.setrecover()
       location.href = '/jyapp/article/content/' + id + '.html'
     },
     // 筛选按钮
@@ -191,6 +194,7 @@ var vNode = {
                 // 当数组为空时，且为第一页，页面为暂无数据页面
                 _this.listState.loading = true
                 _this.listState.finished = true;
+                _this.listState.list = res.data.res
               } else {
                 // 数据正常加载更多
                 for (let i = 0; i < res.data.res.length; i++) {
@@ -314,7 +318,6 @@ var vNode = {
         this.limitlist.winnerPhone = parseInt(data.data)
       }
       isScreen = true
-      sessionStorage.setItem(this.sessStorageKey, JSON.stringify(this.$data))
       this.setToggle()
       this.reLoadList(true)
     },
@@ -346,6 +349,7 @@ var vNode = {
     },
     // 刷新列表
     reLoadList: function(isScreen) {
+      console.log(isScreen)
       this.getList(isScreen)
     },
     // 关闭菜单

src/web/staticres/vipsubscribe/js/historypush.js

@@ -57,9 +57,9 @@ var vm = new Vue({
     }
   },
   created () {
+    this.getUserRoot()
     var recover = this.recover()
     if (!recover) {
-      this.getUserRoot()
       setTimeout(() => {
         // 如果订阅消息进来时间不清空
         if(this.time !== '') {

src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -76,7 +76,7 @@
     .vip_openDialog .van-dialog__content .vip_head .vip_extend{
         font-size: 0.26rem;
     }
-    .van-overlay{
+    .vipOverlay.van-overlay{
         height: 85%;
         background-color: rgba(255,255,255,0);
         backdrop-filter: blur(5px);
@@ -123,6 +123,7 @@
         :before-close="beforeClose"
         class="vip_openDialog"
         :overlay="overlayShow"
+        overlay-class="vipOverlay"
         :confirm-button-text="bidcollPowerInfo.btntext"
         cancel-button-text="再想一想"
         >

src/web/templates/weixin/historypush.html

@@ -524,7 +524,7 @@
             text-decoration: none;
         }
        #dropDownItemGroup .van-dropdown-item__content {
-         max-height: 70vh;
+         max-height: 76vh;
        }
     </style>
 </head>