update

src/views/bill/billHome/index.vue

@@ -641,21 +641,12 @@
 							</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>
@@ -685,7 +676,6 @@
 									</div>
 								</div>
 							</div>
-							</div>
 							<div class="right-footer">
 								<div class="footer-left">
 									{{ `共${total}项调查` }}