diff --git a/src/components/public/head.vue b/src/components/public/head.vue
index 728bf07..fc3b0fd 100644
--- a/src/components/public/head.vue
+++ b/src/components/public/head.vue
@@ -3,8 +3,7 @@
         <nav class="header-nav flexacenter">
             <div class="header-nav-item" :class="{ pitch: index == 3 }" v-for="(item, index) in navList" :key="index">
                 {{ item }}</div>
-            <img class="header-nav-item header-user-img"
-                src="">
+            <img class="header-nav-item header-user-img" src="">
         </nav>
         <div class="logo-box flexacenter">
             <img class="logo-icon" src="@/assets/img/edit/logo.png" />
@@ -15,20 +14,20 @@
 
         <nav class="nav-box flexflex" v-if="!isNoTabList">
             <div class="nav-list wid1200 flexflex">
-<<<<<<< HEAD
+                <!-- <<<<<<< HEAD
                 <div class="nav-item flexcenter" :class="{ pitch: item['name'] == '我的' }" v-for="item in tabList"
                     :key="item">{{ item.name }}</div>
-=======
+======= -->
                 <div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': i === 0 }" v-for="(item, i) in tabList"
                     :key="i">
                     <el-badge :value="12">
                         <div class="pd-rl-10">
-                           {{ item.name }} 
+                            {{ item.name }}
                         </div>
                     </el-badge>
 
                 </div>
->>>>>>> origin/main
+                <!-- >>>>>>> origin/main -->
             </div>
         </nav>
     </header>
@@ -167,23 +166,23 @@ const tabList = [{
         transform: translateX(-50%);
         margin: 0 auto;
         width: 100%;
-<<<<<<< HEAD
-        height: 47px;
-=======
+        // <<<<<<< HEAD
+        //         height: 47px;
+        // =======
         height: 50px;
->>>>>>> origin/main
+        // >>>>>>> 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;
-=======
+            // <<<<<<< HEAD
+            //             // background: red;
+            //             color: #e2edf7;
+            //             font-size: 18px;
+            // =======
             color: #E2EDF7;
             text-align: center;
->>>>>>> origin/main
+            // >>>>>>> origin/main
             margin: 0 auto;
             font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
             font-weight: 400;
@@ -227,8 +226,9 @@ const tabList = [{
     display: flex;
     justify-content: center;
     align-items: center;
-    .pd-rl-10{
-       padding:0 10px;
+
+    .pd-rl-10 {
+        padding: 0 10px;
     }
 }