diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index 75f91a3..0a8e6ca 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -154,7 +154,6 @@ export default {
       uid: this.$store.state.user.userInfo.uid, // 用户id
     })
   },
-
   methods: {
     toGoods(id, sk_id) {
       console.log('cart-list', this.$store.state.cart.cartList)
@@ -166,7 +165,6 @@ export default {
         complete: () => {},
       })
     },
-
     counter(index, isadd, item) {
       // console.log('===>>counter ===>num',num)
       // console.log('===>>counter ===>isadd',isadd)
@@ -240,7 +238,7 @@ export default {
       for (let i = 0; i < this.childIsOpen.length; i++) {
         m = m & this.childIsOpen[i]
       }
-      if (m == 1) {
+      if (m === 1) {
         this.pIsoPen = true
       } else {
         this.pIsoPen = false
@@ -495,8 +493,6 @@ export default {
       }
     }
   }
-
-<<<<<<< HEAD
   .footer {
     position: fixed;
     left: 0;
@@ -539,6 +535,3 @@ export default {
   }
 }
 </style>
-=======
-</style>
->>>>>>> cb58acb8c1540674edb1dd7cba23e4f04df66c19