Merge remote-tracking branch 'origin/master'

public/css/list.scss

@@ -109,6 +109,5 @@
   }
 }
 .positionTop{
-  top: 3rem;
-  padding-bottom:3rem;
+  //top: 3rem;
 }
\ No newline at end of file

src/components/mobile/searchList.vue

 <template>
-    <div class="contentList" :class="isMargin?'marginTop':'positionTop'" style="overflow: auto;-webkit-overflow-scrolling: touch;">
+    <div class="contentList" :class="isMargin?'marginTop':'positionTop'" style="-webkit-overflow-scrolling: touch;overflow: auto">
         <mt-loadmore :top-method="loadTop" :bottom-method="loadBottom" :auto-fill="false" :bottom-all-loaded="allLoaded" ref="loadmore">
             <ul v-if="tableData">
                 <li v-for="(item,index) in tableData" :key="item.businessId" v-if="$route.query.tab==2||isMargin" @click="handleToDetail(item)">

src/views/bigbusiness/pages/searchRecord.vue

@@ -73,8 +73,10 @@
                 window.sessionStorage.setItem("keyword",keyword);
                 this.businessProjectsCount = data.businessProjectsCount;
                 this.businessRequirementsCount = data.businessRequirementsCount;
-                window.sessionStorage.setItem("businessProjectsCount",data.businessProjectsCount);
-                window.sessionStorage.setItem("businessRequirementsCount",data.businessRequirementsCount);
+                this.totalCount = (data.businessProjectsCount?data.businessProjectsCount:0)+(data.businessRequirementsCount?data.businessRequirementsCount:0);
+                window.sessionStorage.setItem("totalCount",this.totalCount);
+                window.sessionStorage.setItem("businessProjectsCount",this.businessProjectsCount);
+                window.sessionStorage.setItem("businessRequirementsCount",this.businessRequirementsCount);
             })
         }
     }

src/views/mobile/searchRecord.vue

@@ -12,7 +12,9 @@
                 </li>
             </ul>
         </div>
-        <searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
+        <div class="moreWrap">
+            <searchList :isWhich="currentIndex" :isVisible="isShow" @sendBusinessCountFunc="getBusinessCountFunc" @sendProjectCountFunc="getProjectCountFunc" ref="searchList"></searchList>
+        </div>
     </div>
 </template>
 
@@ -154,5 +156,13 @@
             }
         }
     }
+    .moreWrap{
+        width: 100%;
+        position: absolute;
+        left: 0;
+        overflow: hidden;
+        height: 100vh;
+        top: 3rem;
+    }
 
 </style>
\ No newline at end of file

src/views/mobile/selectScreen.vue

@@ -114,6 +114,7 @@
         mounted(){
             this.bigBusinessselect();
             this.selectBigBusinessLevelOneSet();
+            this.resetClik();
         }
     }
 </script>