update

src/views/bill/billHome/index.vue

@@ -641,49 +641,39 @@
 							</div>
 						</div>
 						<div class="right-main" v-loading="loading">
-							<<<<<<< HEAD
 							<div
 								class="right-main-box"
 								v-for="(item, index) in bills"
 								:key="index"
 								@click="handleClickToDetailO(item)"
 							>
-								=======
-								<div
-									class="right-main-box"
-									v-for="(item, index) in bills"
-									:key="index"
-									@click="handleClickToDetail()"
-								>
-									>>>>>>> e641835b10377b442772bb20faa9c6a12d09b494
-									<div class="header">
-										<div class="title">{{ item.name }}</div>
-										<div class="en-title">{{ item.eName }}</div>
+								<div class="header">
+									<div class="title">{{ item.name }}</div>
+									<div class="en-title">{{ item.eName }}</div>
+								</div>
+								<div class="main">
+									<div class="item">
+										<div class="item-left">{{ "提案人：" }}</div>
+										<div class="item-right">{{ item.tcr }}</div>
 									</div>
-									<div class="main">
-										<div class="item">
-											<div class="item-left">{{ "提案人：" }}</div>
-											<div class="item-right">{{ item.tcr }}</div>
-										</div>
-										<div class="item">
-											<div class="item-left">{{ "委员会：" }}</div>
-											<div class="item-right">{{ item.wyh }}</div>
-										</div>
-										<div class="item">
-											<div class="item-left">{{ "相关领域：" }}</div>
-											<div class="item-right1">
-												<div class="tag" v-for="(val, idx) in item.areaList" :key="idx">{{ val }}</div>
-											</div>
-										</div>
-										<div class="item">
-											<div class="item-left">{{ "最新动议：" }}</div>
-											<div class="item-right">{{ item.zxdy }}</div>
-										</div>
-										<div class="item">
-											<div class="item-left">{{ "法案进展：" }}</div>
-											<div class="item-right2"></div>
+									<div class="item">
+										<div class="item-left">{{ "委员会：" }}</div>
+										<div class="item-right">{{ item.wyh }}</div>
+									</div>
+									<div class="item">
+										<div class="item-left">{{ "相关领域：" }}</div>
+										<div class="item-right1">
+											<div class="tag" v-for="(val, idx) in item.areaList" :key="idx">{{ val }}</div>
 										</div>
 									</div>
+									<div class="item">
+										<div class="item-left">{{ "最新动议：" }}</div>
+										<div class="item-right">{{ item.zxdy }}</div>
+									</div>
+									<div class="item">
+										<div class="item-left">{{ "法案进展：" }}</div>
+										<div class="item-right2"></div>
+									</div>
 								</div>
 							</div>
 							<div class="right-footer">
@@ -3455,4 +3445,4 @@ onUnmounted(() => {});
 :deep(.el-input__wrapper.is-focus) {
 	box-shadow: none !important;
 }
-</style>
\ No newline at end of file
+</style>