Merge branch 'CRM_15.6'

src/views/custom_manage/overseasList/overseasCustomRoadshow.vue

@@ -565,7 +565,7 @@ export default {
 </script>
 <style scoped lang="scss">
 .overseas-custom-roadshow-box {
-    height: calc(100vh - 110px);
+    min-height: calc(100vh - 110px);
     background-color: white;
     border: 1px solid #ECECEC;
     border-radius: 2px;
@@ -589,6 +589,7 @@ export default {
     }
     .cont-wrapper {
       margin-top: 10px;
+      padding-bottom: 40px;
     }
     .editor{
         color:#409EFF;

src/views/dataReport_manage/statistic/newCustomlist.vue

@@ -127,6 +127,7 @@
 			<m-page
 				:total="total"
 				:page_no="page_no"
+				:pageSize="pageSize"
 				@handleCurrentChange="handleCurrentChange"
 			/>
 		</div>

src/views/roadshow_manage/compononts/activityDetailDia.vue

@@ -214,6 +214,10 @@ export default {
 						{ ...dynamic_column }
 				]	
 			this.$refs.tableRef && this.$refs.tableRef.clearSort()
+			this.$nextTick(()=>{
+				// 滚动条高度归零
+				this.$refs.tableRef && (this.$refs.tableRef.$el.querySelector('.el-table__body-wrapper').scrollTop=0)
+			})
 		}
 	},
 	created() {},