解决冲突

src/components/Home.vue

@@ -362,11 +362,7 @@ import OrderDetail from './orderComponents/orderDetail.vue';
      }
      .order_detail{
       width: 100%;
-<<<<<<< HEAD
       border-left: 10px solid #F1F2F5;
-=======
-
->>>>>>> dev_zlx
       background: #fff;
       box-sizing: border-box;
       .detail_title{
@@ -381,10 +377,6 @@ import OrderDetail from './orderComponents/orderDetail.vue';
         font-weight: 600;
         color: #B1B1B1;
       }
-<<<<<<< HEAD
-      
-      
-=======
       .detail_cont{
         width: 100%;
         padding: 16px;
@@ -463,8 +455,6 @@ import OrderDetail from './orderComponents/orderDetail.vue';
           }
         }
       }
-
->>>>>>> dev_zlx
      }
    }
   }