合并分支 'dev_hhq' 到 'master'

src/views/ZMOverView/components/newRisk/index.vue

@@ -72,14 +72,14 @@
 						<el-carousel ref="carouselRef" style="height: 443px; width: 664px" :autoplay="true" :interval="30000"
 							arrow="never" indicator-position="none" @change="handleCarouselChange">
 							<el-carousel-item v-for="(News, NewsIndex) in filteredHotNewsList" :key="NewsIndex">
-								<div class="carousel-item" @click="toDetaile(News.id, News.HotspotType)">
+								<div class="carousel-item" @click="toDetaile(News.hotspotID, News.hotspotType)">
 									<div class="carousel-title">
 										<div>
 											<div class="title-text">
 												{{ News.hotspotTitle }}
 											</div>
 											<div class="title-tag">
-												{{ News.hotspotType }}
+												{{ News.hotspotTag }}
 											</div>
 										</div>
 										<img :src="News.hotspotPicture" style="width: 96px; height: 96px" />
@@ -471,6 +471,7 @@ const highLight = (title) => {
 	}
 };
 const toDetaile = (id, type) => {
+	console.log(id, type)
 	if (type === '法案') {
 		let path = "/billLayout/bill/introduction";
 		let query = { billId: id };