diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue
index 0568ae95..d83050d0 100644
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -34,27 +34,18 @@
             </DropdownMenu>
           </Dropdown>
         </li>
-<<<<<<< HEAD
-        <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
-        <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
-=======
         <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
         <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
         <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
->>>>>>> dev-ryan
         <li v-if="$route.name !== 'Cart'" style="position:relative;">
           <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
           <Dropdown placement="bottom-start">
             <router-link to="/cart" target="_blank">
               <span @mouseenter="getCartList">
-<<<<<<< HEAD
-                <Icon size="18" class="cart-icon" type="ios-cart-outline"></Icon>
-=======
                 <Icon
                   size="18"
                   type="ios-cart-outline"
                 ></Icon>
->>>>>>> dev-ryan
                 购物车
               </span>
 
@@ -128,50 +119,21 @@ export default {
     },
   },
   methods: {
-<<<<<<< HEAD
-    handleClickTheme() {
-      this.themeType === "light"
-        ? (this.themeType = "dark")
-        : (this.themeType = "light");
-      window.document.documentElement.setAttribute(
-        "data-theme",
-        this.themeType
-      );
-    },
-    changeCity(city) {
-      this.city = city;
-    },
-    goToPay() {
-=======
     changeCity (city) { // 选择所在城市
       this.city = city;
     },
     goToPay () { // 跳转购物车
->>>>>>> dev-ryan
       let url = this.$router.resolve({
         path: "/cart",
       });
       window.open(url.href, "_blank");
     },
-<<<<<<< HEAD
-    myInfo() {
-=======
     myInfo () { // 跳转会员中心
->>>>>>> dev-ryan
       let url = this.$router.resolve({
         path: "/home",
       });
       window.open(url.href, "_blank");
     },
-<<<<<<< HEAD
-    signOutFun() {
-      storage.removeItem("accessToken");
-      storage.removeItem("refreshToken");
-      storage.removeItem("userInfo");
-      storage.removeItem("cartNum");
-      this.$store.commit("SET_CARTNUM", 0);
-      this.$router.push("/login");
-=======
     signOutFun () { // 退出登录
       storage.removeItem('accessToken');
       storage.removeItem('refreshToken');
@@ -179,7 +141,6 @@ export default {
       storage.removeItem('cartNum');
       this.$store.commit('SET_CARTNUM', 0)
       this.$router.push('/login');
->>>>>>> dev-ryan
     },
     goUserCenter(path) {
       // 跳转我的订单，我的足迹
@@ -410,13 +371,6 @@ export default {
 .sign-out p {
   font-size: 12px;
 }
-<<<<<<< HEAD
-.cart-icon {
-  padding: 0 6px;
-}
-=======
-
->>>>>>> dev-ryan
 .goods-title:hover {
   color: $theme_color;
 }