修改bug

src/views/apartmentDetail.vue

@@ -1422,13 +1422,13 @@ const publicJump = path => router.push(path)
                 &::after {
                     content: "";
                     position: absolute;
-                    width: 10px;
-                    height: 10px;
-                    background-color: #fff;
-                    transform: rotate(45deg) translateX(-50%);
+                    width: 0;
+                    height: 0;
                     left: 50%;
-                    bottom: -14px;
-                    z-index: -1;
+                    bottom: -12px;
+                    border-left: 7px solid transparent;
+                    border-right: 7px solid transparent;
+                    border-top: 8px solid #fff;
                 }
 
                 .same-brand-icon {

src/views/edit.vue

@@ -1991,6 +1991,7 @@ export default {
                             right: 0;
                             z-index: 100;
                             transform: translate(50%, -50%);
+                            cursor: pointer;
                         }
 
                         .media-img {

src/views/seachIndex.vue

@@ -24,12 +24,7 @@
                 </div>
             </div>
         </div>
-<!-- <<<<<<< HEAD
-        <loadMoreText v-if="loading" loadText="加载中...."></loadMoreText>
-        <loadMoreText loadText="到底了"></loadMoreText>
-======= -->
         <loadMoreText :loadText="loadingText"></loadMoreText>
-<!-- >>>>>>> origin/main -->
         <listBtmPrompt></listBtmPrompt>
         <footerTool></footerTool>
     </div>