ios筛选框高度调整、微信推送消息模板

src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

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

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

@@ -80,6 +80,7 @@
         padding: 0 0.62rem;
         display: flex;
         justify-content: space-between;
+        overflow: initial;
     }
     .vip_openDialog .van-hairline--top::after{
         border-top-width: 0;

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

@@ -814,10 +814,10 @@
             setTimeout(function () {
                 wxflag = $('.listcontent').dropload({
                     scrollArea: $(".listcontent"),
-                    loadUpFn: function (me) {
-                        //loadDatas(me,-1);
-                        reloadFirstPage(me);//下拉刷新更新订阅词
-                    },
+                    // loadUpFn: function (me) {
+                    //     //loadDatas(me,-1);
+                    //     reloadFirstPage(me);//下拉刷新更新订阅词
+                    // },
                     loadDownFn: function (me) {
                         loadDatas(me, lasttime);
                     }
@@ -827,9 +827,9 @@
             setTimeout(function () {
                 wxflag = $('.listcontent').dropload({
                     scrollArea: $(".listcontent"),
-                    loadUpFn: function (me) {
-                        loadDatas(me, -1);
-                    },
+                    // loadUpFn: function (me) {
+                    //     loadDatas(me, -1);
+                    // },
                     loadDownFn: function (me) {
                         loadDatas(me, lasttime);
                     }
@@ -1444,10 +1444,10 @@ function hasNoData() {
           setTimeout(function () {
               wxflag = $('.listcontent').dropload({
                   scrollArea: $(".listcontent"),
-                  loadUpFn: function (me) {
-                      //loadDatas(me,-1);
-                      reloadFirstPage(me);//下拉刷新更新订阅词
-                  },
+                //   loadUpFn: function (me) {
+                //       //loadDatas(me,-1);
+                //       reloadFirstPage(me);//下拉刷新更新订阅词
+                //   },
                   loadDownFn: function (me) {
                       loadDatas(me, lasttime);
                   }
@@ -1456,9 +1456,9 @@ function hasNoData() {
       } else {
           wxflag = $('.listcontent').dropload({
               scrollArea: $(".listcontent"),
-              loadUpFn: function (me) {
-                  loadDatas(me, -1);
-              },
+            //   loadUpFn: function (me) {
+            //       loadDatas(me, -1);
+            //   },
               loadDownFn: function (me) {
                   loadDatas(me, lasttime);
               }

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

@@ -442,7 +442,6 @@
 /* 采购单位类型 */
 .collection .unitTab{
     overflow: hidden;
-    height: 7.5rem;
     -webkit-box-flex: 0;
     -webkit-flex: none;
     flex: none;

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

@@ -238,6 +238,7 @@ var cateComponent = {
     },
     // 重置按钮
     resetAll:function() {
+      this.canClick = true
       let params = {
         name: 'cateItem',
         data: ''

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

@@ -11,7 +11,7 @@ var dateComponentTemplate = `
       </div>
   </div>
   <div v-if="type === 'more-picker'">
-    <van-popup v-model="datePicker.startshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '43%' }">
+    <van-popup v-model="datePicker.startshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '46%' }">
       <div class="j-container">
         <div class="j-header">
           <div class="headertitle">
@@ -45,7 +45,7 @@ var dateComponentTemplate = `
         </div>
       </div>
     </van-popup>
-    <van-popup v-model="datePicker.endshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '43%' }">
+    <van-popup v-model="datePicker.endshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '46%' }">
       <div class="j-container">
         <div class="j-header">
           <div class="headertitle">

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

@@ -247,6 +247,7 @@ var industryComponent = {
       }
     },
     resetAll:function() {
+      this.canClick = true
       let params = {
         name: 'industryItem',
         data: ''

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

@@ -118,72 +118,72 @@ var keywordComponent = {
         url: '/subscribepay/afterPay/getUserInfo?t=' + Date.now(),
         type:'POST',
         success: function(res){
-          console.log(res)
-          // this.initlist = res.userData.o_vipjy.a_items
-          let maxarr = []
-          if(_this.isvip) {
-            let data = res.userData.o_vipjy.a_items
-            data.forEach(function(item,index) {
-              let minarr = []
-              let keyname = item.s_item
-              let eachArr = item.a_key
-              eachArr.forEach(function(data, i){
-                data = {
-                  name: data.key[0],
+          if(res && res.userData) {
+            let maxarr = []
+            if(_this.isvip) {
+              let data = res.userData.o_vipjy.a_items
+              data.forEach(function(item,index) {
+                let minarr = []
+                let keyname = item.s_item
+                let eachArr = item.a_key
+                eachArr.forEach(function(data, i){
+                  data = {
+                    name: data.key[0],
+                    type: false
+                  }
+                  minarr.push(data)
+                })
+                let obj = {
+                  [keyname]: minarr,
                   type: false
                 }
-                minarr.push(data)
+                maxarr.push(obj)
               })
-              let obj = {
-                [keyname]: minarr,
-                type: false
-              }
-              maxarr.push(obj)
-            })
-            _this.tablist = maxarr
-            if(maxarr.length == 0) {
-              _this.active = 0
-            }else {
-              _this.active = 1
-            }
-          } else {
-            let initArr = [
-              {
-                a_key:res.userData.o_jy.a_key,
-                s_item: '未分类'
+              _this.tablist = maxarr
+              if(maxarr.length == 0) {
+                _this.active = 0
+              }else {
+                _this.active = 1
               }
-            ]
-            let data = initArr
+            } else {
+              let initArr = [
+                {
+                  a_key:res.userData.o_jy.a_key,
+                  s_item: '未分类'
+                }
+              ]
+              let data = initArr
 
-            console.log(data)
-            let maxarr = []
-            data.forEach(function(item,index) {
-              let minarr = []
-              let keyname = item.s_item
-              let eachArr = item.a_key
-              console.log(eachArr)
-              eachArr.forEach(function(data, i){
-                data = {
-                  name: data.key[0],
+              console.log(data)
+              let maxarr = []
+              data.forEach(function(item,index) {
+                let minarr = []
+                let keyname = item.s_item
+                let eachArr = item.a_key
+                console.log(eachArr)
+                eachArr.forEach(function(data, i){
+                  data = {
+                    name: data.key[0],
+                    type: false
+                  }
+                  minarr.push(data)
+                })
+                console.log(minarr)
+                let obj = {
+                  [keyname]: minarr,
                   type: false
                 }
-                minarr.push(data)
+                maxarr.push(obj)
               })
-              console.log(minarr)
-              let obj = {
-                [keyname]: minarr,
-                type: false
+              _this.tablist = maxarr
+              if(maxarr.length == 0) {
+                _this.active = 0
+              }else {
+                _this.active = 1
               }
-              maxarr.push(obj)
-            })
-            _this.tablist = maxarr
-            if(maxarr.length == 0) {
-              _this.active = 0
-            }else {
-              _this.active = 1
             }
+            _this.setState()
           }
-          _this.setState()
         },
         error: function(err){
           console.log(err)
@@ -302,6 +302,7 @@ var keywordComponent = {
       }
     },
     resetAll:function() {
+      this.canClick = true
       let params = {
         name: 'keywordItem',
         data: ''

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

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

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

@@ -87,6 +87,7 @@
         padding: 0 0.62rem;
         display: flex;
         justify-content: space-between;
+        overflow: initial;
     }
     .vip_openDialog .van-hairline--top::after{
         border-top-width: 0;

src/web/templates/weixin/historypush.html

@@ -369,7 +369,7 @@
         .vip_report > span > a {
             display: none;
             position: absolute;
-            top: -4.5px;
+            top: 14px;
             right: 0px;
             background-color: #FE737A;
             width: 8px;
@@ -544,7 +544,9 @@
             <div class="tab_right">
                 <div class="vip_report" style="display: none;">
                     <span class="report_book"></span>
-                    <span style="font-size: 15px;font-weight: 500;color: #171826;">报告</span>
+                    <span style="font-size: 15px;font-weight: 500;color: #171826;">
+                        <a></a>报告
+                    </span>
                 </div>
                 <div class="normal_set" id="normal_set">
                     <div class="normal_set_box" style="display: flex;align-items: center;">