Merge branch 'dev/v1.0.51_zsy' of jianyu/web into feature/v1.0.51

apps/bigmember_pc/src/views/analysisReport/components/ReportDownloadDialog.vue

@@ -8,6 +8,7 @@
     top="15%"
     custom-class="market-report-download-dialog"
     width="1000px"
+    style="overflow: hidden"
   >
     <div class="content" v-loading="loading">
       <section class="report-effect-box">
@@ -343,6 +344,7 @@ export default {
       padding: 32px 32px 0 32px;
     }
     .el-dialog__body {
+      overflow-y: auto;
       padding: 0 32px 20px 32px;
     }
     .el-dialog__footer{

apps/bigmember_pc/src/views/analysisReport/index.vue

@@ -341,6 +341,13 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@media (max-height: 600px) {
+  ::v-deep {
+    .market-report-download-dialog .el-dialog__body{
+      max-height: calc(90vh - 56px - 69px);
+    }
+  }
+}
 .in-app {
   .analysis-report {
     @extend .sub-page-container;

apps/bigmember_pc/src/views/portrayal/EntPortrayal.vue

@@ -78,7 +78,7 @@
           >
         </div>
       </div>
-      <div class="tab-content" style="padding-bottom: 40px">
+      <div class="tab-content" >
         <div id="entInfo" class="tab-content-item p-l-r-32 bg-white">
           <!-- 工商信息 -->
           <!-- 标记滚动位置 默认浏览器顶端滚动位置为tab定位偏移量加tab高度-->
@@ -159,8 +159,7 @@
             </div>
             <div
               id="project-information"
-              class="p-l-16 p-r-32 p-b-32"
-              :style="{ padding: '32px 0 0' }"
+              class="p-l-16 p-r-32 p-b-32 p-t-32"
             >
               <!-- 列表部分 -->
               <Dynamic-list
@@ -911,13 +910,13 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@media (max-height: 740px) {
+@media (max-height: 840px) {
   ::v-deep {
     .short-dialog__body .ent-report-download-dialog .el-dialog__body{
       height: auto;
     }
     .ent-report-download-dialog .el-dialog__body{
-      height: calc(90vh - 56px - 69px - 10px);
+      max-height: calc(90vh - 56px - 69px);
     }
   }
 }

apps/bigmember_pc/src/views/portrayal/EntSearchPortrayal.vue

@@ -1381,13 +1381,13 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-@media (max-height: 740px) {
+@media (max-height: 840px) {
   ::v-deep {
     .short-dialog__body .ent-report-download-dialog .el-dialog__body{
       height: auto;
     }
     .ent-report-download-dialog .el-dialog__body{
-      height: calc(90vh - 56px - 69px - 10px);
+      max-height: calc(90vh - 56px - 69px);
     }
   }
 }

apps/bigmember_pc/src/views/portrayal/UnitPortrayal.vue

@@ -1696,13 +1696,13 @@ export default {
 @include diy-icon('renling-01', 18, 18);
 @include diy-icon('renling-active', 18, 18);
 @include diy-icon('share', 18, 18);
-@media (max-height: 720px) {
+@media (max-height: 840px) {
   ::v-deep {
     .short-dialog__body .prop-report-download-dialog .el-dialog__body{
       height: auto;
     }
     .prop-report-download-dialog .el-dialog__body{
-      height: calc(90vh - 56px - 69px - 10px);
+      max-height: calc(90vh - 56px - 69px);
     }
   }
 }