Merge branch 'zz-dev'

src/views/bill/billHome/index.vue

@@ -148,8 +148,8 @@
 													{{ bill.billName }}
 												</div>
 												<div class="box1-main-left-info">
-													<AreaTag 	v-for="(item, index) in bill.hylyList"
-														:key="index" :tagName="item.industryName"></AreaTag>
+													<AreaTag v-for="(item, index) in bill.hylyList" :key="index" :tagName="item.industryName">
+													</AreaTag>
 
 													<div class="info-box" :class="{
 														info1: index === 0,
@@ -249,7 +249,7 @@
 					</div>
 					<DivideHeader id="position2" class="divide2" :titleText="'资讯要闻'"></DivideHeader>
 					<div class="center-center">
-						<div class="box3">
+						<!-- <div class="box3">
 							<div class="box3-header">
 								<div class="box3-header-left">
 									<div class="box3-header-icon">
@@ -284,11 +284,12 @@
 										<div class="right-footer">{{ news.newsContent }}</div>
 										<!-- <CommonPrompt :content="news.newsContent">
 											<div class="right-footer">{{ news.newsContent }}</div>
-										</CommonPrompt> -->
-									</div>
+										</CommonPrompt> --
 									</div>
 								</div>
 							</div>
+						</div> -->
+						<NewsList :list="newsList.slice(0, 5)" />
 						<div class="box4">
 							<div class="box4-header">
 								<div class="header-icon">
@@ -990,7 +991,7 @@ const handleGetNews = async () => {
 		const res = await getNews(params);
 		console.log("新闻资讯", res);
 		if (res.code === 200) {
-			newsList.value = res.data||[].map(item => {
+			newsList.value = res.data || [].map(item => {
 				return {
 					...item,
 					from: `${item.newsOrg} · ${item.newsDate ? item.newsDate.slice(5) : ""}`,

src/views/coopRestriction/components/askPage/index.vue

@@ -48,6 +48,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { ref, onMounted } from "vue";
 import router from '@/router'
 import { getCoopRestrictionNews, getCoopRestrictionSocial } from '@/api/coopRestriction/coopRestriction'

src/views/exportControl/index.vue

 <template>
 	<div class="home-wrapper">
-<<<<<<< HEAD
+
 
 =======
 		<div class="search-header" v-show="isShow">
@@ -41,7 +41,7 @@
 				</div>
 			</div>
 		</div>
->>>>>>> zz-dev
+
 		<!-- <div class="home-header" v-show="!isShow">
 			<div class="header-left">
 				<HeaderMenu></HeaderMenu>
@@ -202,15 +202,9 @@
 
 			<el-row :gutter="15" style="width: 1600px; margin: 0 auto; height: 50px; margin-top: 64px">
 				<CustomTitle id="position2" title="资讯要闻" />
-<<<<<<< HEAD
-				<el-col :span="12">
-						<NewsList :list="newsList.slice(0, 5)" :defaultImg="newsImg" />
-					<!-- <custom-container title="新闻资讯" :titleIcon="newsIcon" height="450px">
-=======
 			</el-row>
 			<!-- <el-col :span="12">
 					<custom-container title="新闻资讯" :titleIcon="newsIcon" height="450px">
->>>>>>> zz-dev
 						<template #header-right>
 							<el-button type="primary" link @click="handleToMoreNews">
 								{{ "更多 +" }}
@@ -222,11 +216,6 @@
 								<NewsList :list-data="newsList" @item-click="item => handleNewsInfoClick(item)" />
 							</div>
 						</template>
-<<<<<<< HEAD
-					</custom-container> -->
-				</el-col>
-				<el-col :span="12">
-=======
 					</custom-container>
 				</el-col> -->
 			<div class="center-center">
@@ -235,7 +224,6 @@
 						content="newsContent" />
 				</div>
 				<div class="boxs4">
->>>>>>> zz-dev
 					<custom-container title="社交媒体" :titleIcon="dialogIcon" height="450px">
 						<template #default>
 							<div class="dialog-list">
@@ -639,11 +627,6 @@ import CustomContainer from "@/components/Container/index.vue";
 import ClickableCard from "./components/link.vue";
 import InfoCard from "./components/info.vue";
 import CustomTitle from "./components/title.vue";
-<<<<<<< HEAD
-// import NewsList from "./components/news.vue";
-import newsImg from "@/assets/images/news-img.png";
-=======
->>>>>>> zz-dev
 
 import MessageBubble from "./components/dialog.vue";
 import CommonPrompt from "./commonPrompt/index.vue";

src/views/finance/index.vue

@@ -1708,61 +1708,6 @@ onMounted(async () => {
 				margin-top: 43px;
 			}
 
-<<<<<<< HEAD
-=======
-			.home-main-header-center {
-				margin: 0 auto;
-				margin-top: 20px;
-				width: 800px;
-				height: 48px;
-				border-radius: 10px;
-				box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-				background: rgba(255, 255, 255, 1);
-				box-sizing: border-box;
-				padding: 1px;
-				position: relative;
-				border: 1px solid transparent;
-
-				&:hover {
-					border: 1px solid var(--color-main-active);
-				}
-
-				.search {
-					position: absolute;
-					right: -1px;
-					top: 0px;
-					width: 120px;
-					height: 46px;
-					border-radius: 10px;
-					background: var(--color-main-active);
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					cursor: pointer;
-
-					.search-icon {
-						width: 18px;
-						height: 18px;
-
-						img {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.search-text {
-						margin-left: 8px;
-						height: 22px;
-						color: #fff;
-						font-family: Microsoft YaHei;
-						font-size: 16px;
-						font-weight: 400;
-						line-height: 22px;
-					}
-				}
-			}
-
->>>>>>> zz-dev
 			.home-main-header-footer {
 				margin-top: 38px;
 				width: 700px;

src/views/innovationSubject/index.vue

@@ -13,13 +13,8 @@
 					</div>
 				</div> -->
 				<div class="home-main-header-center">
-						<SearchContainer
-							style="margin-bottom: 0;margin-top: 48px; "
-							v-if="containerRef"
-							placeholder="搜索创新主体"
-							:containerRef="containerRef"
-							areaName=""
-						/>
+					<SearchContainer style="margin-bottom: 0;margin-top: 48px; " v-if="containerRef" placeholder="搜索创新主体"
+						:containerRef="containerRef" areaName="" />
 					<!-- <el-input v-model="input" style="width: 838px; height: 100%" placeholder="搜索创新主体" />
 					<div class="search">
 						<div class="search-icon">
@@ -376,6 +371,7 @@
 
 <script setup>
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { onMounted, ref, computed } from "vue";
 import * as echarts from "echarts";
 import router from "@/router";

src/views/marketAccessRestrictions/marketAccessHome/index.vue

@@ -11,13 +11,8 @@
 					</div>
 				</div> -->
 				<div class="home-main-header-center">
-					<SearchContainer
-						style="margin-bottom: 0;margin-top: 48px;  height: fit-content"
-						v-if="containerRef"
-						placeholder="搜索市场准入限制调查"
-						:containerRef="containerRef"
-						areaName=""
-					/>
+					<SearchContainer style="margin-bottom: 0;margin-top: 48px;  height: fit-content" v-if="containerRef"
+						placeholder="搜索市场准入限制调查" :containerRef="containerRef" areaName="" />
 				</div>
 				<!-- <div class="home-main-header-footer">
 					<div class="home-main-header-footer-item">
@@ -562,6 +557,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import RiskSignal from "@/components/RiskSignal/RiskSignal.vue";
 import { onMounted, ref } from "vue";
 import setChart from "@/utils/setChart";
@@ -1580,62 +1576,7 @@ onMounted(async () => {
 				display: flex;
 				justify-content: space-between;
 			}
-<<<<<<< HEAD
-	
-=======
-
-			.home-main-header-center {
-				margin-top: 48px;
-				width: 960px;
-				height: 48px;
-				border-radius: 10px;
-				box-shadow: 0px 0px 15px 0px rgba(22, 119, 255, 0.1);
-				background: rgba(255, 255, 255, 1);
-				box-sizing: border-box;
-				padding: 1px;
-				position: relative;
-				border: 1px solid transparent;
-
-				&:hover {
-					border: 1px solid var(--color-main-active);
-				}
-
-				.search {
-					position: absolute;
-					right: -1px;
-					top: 0px;
-					width: 120px;
-					height: 46px;
-					border-radius: 10px;
-					background: var(--color-main-active);
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					cursor: pointer;
-
-					.search-icon {
-						width: 18px;
-						height: 18px;
-
-						img {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.search-text {
-						margin-left: 8px;
-						height: 22px;
-						color: #fff;
-						font-family: Microsoft YaHei;
-						font-size: 16px;
-						font-weight: 400;
-						line-height: 22px;
-					}
-				}
-			}
 
->>>>>>> zz-dev
 			.home-main-header-footer {
 				margin-top: 38px;
 				width: 688px;

src/views/scientificFunding/components/askPage/index.vue

@@ -50,6 +50,7 @@
 </template>
 
 <script setup>
+import NewsList from "@/components/NewsList/NewsList.vue";
 import { ref, onMounted } from "vue";
 import {
     getSocialMediaInfo, getNews