Merge branch 'dev/4.8.94_zsy' of qmx/jy into feature/v4.8.94

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

@@ -514,6 +514,8 @@
                 if (pData) {
                     this.isSet = pData.isSet;
                     this.scrollTop = pData.scrollTop;
+                    this.totalCount = pData.totalCount;
+                    this.distinctCount = pData.distinctCount;
                     this.set = pData.set;
                     this.list = pData.list;
                     this.page = pData.page;
@@ -544,6 +546,7 @@
             methods: {
                 onLoad: function () {
                     var that = this;
+                    that.page++;
                     setTimeout(function () {
                         // that.loading = true;
                         that.getList();
@@ -595,7 +598,6 @@
                                         }
                                     })
                                     that.list = that.list.concat(res.data.list);
-                                    that.page++;
                                     if ($.isArray(res.data.list) && res.data.list.length != 0) {
                                         console.log('有数据')
                                     } else {

src/web/templates/pc/supsearch.html

@@ -385,7 +385,7 @@
         $("#infoBtn").removeClass("active");
         subtype = subtype.split(",");
         for(var i=0;i<subtype.length;i++){
-          $(".info-content>font").each(function(){
+          $(".info-content font").each(function(){
             if($(this).text() == subtype[i]){
               $(this).addClass("active")
             }
@@ -4612,7 +4612,7 @@ function checkTagDisabled () {
           $(".info-content font").removeClass('active').removeClass('secondActice')
           item.subtype = item.subtype.toString().split(",");
           for(var i=0;i<item.subtype.length;i++){
-            $(".info-content>font").each(function(){
+            $(".info-content font").each(function(){
               if($(this).text() == item.subtype[i]){
                 $(this).addClass("active")
               }
@@ -5081,6 +5081,8 @@ function checkTagDisabled () {
           if(item === 1) {
             location.replace('/jylab/supsearch/index.html?searchGroup=1')
           }
+        } else {
+          window.location.replace('/page_workDesktop/work-bench/page?link=' + encodeURIComponent('/jylab/supsearch/index.html?searchGroup=' + item))
         }
         this.searchTab = item
         // if (item !== 0) {