合并分支 'fk-dev' 到 'pre'

src/components/base/boxBackground/overviewNormalBox.vue

@@ -73,7 +73,8 @@ const props = defineProps({
   }
 
   .box-down-box {
-    height: 20px;
+    // height: 20px;
+    height: fit-content;
     flex: auto;
     overflow: hidden;
   }

src/views/newsBrief/NewsMain.vue

@@ -20,10 +20,11 @@
                 </div>
             </box-background>
 
-            <box-background width="712px" title="中美博弈专题">
+            <box-background width="712px" height="100%" title="中美博弈专题">
                 <template #header-icon>
                     <img src="@/assets/icons/subject-icon.png" />
                 </template>
+
                 <el-space :size="16" direction="vertical" fill class="full-width common-padding">
                     <el-space v-for="(item, index) in subjectData.slice(0, 3)" :key="index"
                         @click="() => gotoNewsDetail(item.newsId)" alignment="center">
@@ -33,13 +34,13 @@
                         </common-text>
                         <common-text class="text-bold text-hover" color="var(--text-primary-80-color)">{{
                             item.newsTitle
-                            }}</common-text>
+                        }}</common-text>
                     </el-space>
                     <el-space v-for="(item, index) in subjectData.slice(3)" :key="index"
                         @click="() => gotoNewsDetail(item.newsId)">
                         <common-text class="text-regular text-hover" color="var(--text-primary-80-color)">{{
                             "• " + item.newsTitle
-                            }}</common-text>
+                        }}</common-text>
                     </el-space>
                 </el-space>
             </box-background>