diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue
index d27b493..d656113 100644
--- a/src/components/apartment/seachModule.vue
+++ b/src/components/apartment/seachModule.vue
@@ -1,9 +1,9 @@
 <template>
     <div class="dis-f jus-x al-item" style="position: relative;z-index: 333;">
         <div class="body-maxWidth">
-            <div class="s-w-100 seach-box-bg">
+            <div class="s-w-100 seach-box-bg" :style="{ boxShadow: !props.seachPage ? 'none' : '' }">
                 <div class="seach-box">
-                    <div class="top-seach dis-f al-item"  v-if="props.seachPage">
+                    <div class="top-seach dis-f al-item" v-if="props.seachPage">
                         <div style="position: absolute;left: -8px;top: 20px;">
                             <div class="location-box dis-f jus-x al-item">
                                 <img src="../../assets/homeImage/addressImg.png" class="img" alt="">
@@ -55,7 +55,7 @@
                             发布房源
                         </div>
 
-                        <el-popover placement="bottom-end"   popper-class="consult-popover flexcenter" :width="300"
+                        <el-popover placement="bottom-end" popper-class="consult-popover flexcenter" :width="300"
                             trigger="click" :show-arrow="false"
                             popper-style="background-color:transparent;border: none;box-shadow: none;padding:0;">
                             <template #reference>
@@ -85,7 +85,8 @@
                         <img class="triangle" src="@/assets/img/publicImage/triangle-black.svg" />
                     </div>
 
-                    <div class="option-area flexflex" v-if="state == 'unfold'">
+                    <div class="option-area flexflex" v-if="state == 'unfold'"
+                        :style="{ borderTop: !props.seachPage ? 'none' : '' }">
                         <div class="option-left">
                             <div class="option-item flexflex">
                                 <div class="option-title">学校附近</div>
@@ -386,7 +387,6 @@ const selectOption = (type, value) => {
         background: #FFFFFF;
         // transform: translate(0, 3px);
         border-radius: 16px;
-        filter: drop-shadow(0px3px 0px #d7d7d7);
 
         .top-seach {
             padding: 20px;
diff --git a/src/components/public/head.vue b/src/components/public/head.vue
index 305bf5f..e88c7f8 100644
--- a/src/components/public/head.vue
+++ b/src/components/public/head.vue
@@ -166,20 +166,12 @@ const tabList = [{
         transform: translateX(-50%);
         margin: 0 auto;
         width: 100%;
-        // <<<<<<< HEAD
-        //         height: 47px;
-        // =======
         height: 50px;
-        // >>>>>>> origin/main
         background: rgba(0, 0, 0, 0.596078431372549);
         border-bottom: 4px solid rgba(78, 144, 204, 1);
 
         .nav-list {
-            // <<<<<<< HEAD
-            //             // background: red;
-            //             color: #e2edf7;
-            //             font-size: 18px;
-            // =======
+      
             color: #E2EDF7;
             text-align: center;
             // >>>>>>> origin/main
diff --git a/src/router/index.js b/src/router/index.js
index bd01a92..2538073 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -98,13 +98,11 @@ const router = createRouter({
 
 
 router.beforeEach((to, from, next) => {
-  // <<<<<<< HEAD
   //导航数据
   if (/['seachPage','needHousing','intermediaryHousing','personHousing']/.test(from.path)) {
     store.state.routeList.secondaryIndex.title = from.meta.title
     store.state.routeList.secondaryIndex.path = from.path
   }
-  // >>>>>>> 542e853 (提交)
   next()
   let meta = to['meta'] || {}
   let title = meta['title']
diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue
index d9a56a9..ce6d910 100644
--- a/src/views/housingView/apartment.vue
+++ b/src/views/housingView/apartment.vue
@@ -124,7 +124,6 @@ const handleTransfer = (data) => {
 <style lang="less" scoped>
 .screen-box {
     margin: 0 auto 20px;
-    // box-shadow: 0 0 3px 0 #d7d7d7;
 }
 
 .list {