confilct

 <template>
   <div>
-<<<<<<< HEAD
     <layout-app
       :title="'\u200E'"
       class="buyer-order-detail-wrapper"
       :backAction="onBack"
     >
-=======
-    <layout-app :title="'\u200E'" class="buyer-order-detail-wrapper">
->>>>>>> 订单详情、我的收藏：移除scroll组件
       <div class="order-detail-wrapper">
         <div class="content">
           <!-- 状态信息 -->
@@ -141,10 +137,7 @@ import OrderActions from "../components/order-actions";
 import VideoPlayer from "../order-list/components/video-player";
 
 import orderActionMixin from "../mixin/order-action";
-<<<<<<< HEAD
 import routeActionMinxin from "../mixin/route";
-=======
->>>>>>> 订单详情、我的收藏：移除scroll组件
 
 const STORE_PATH = "order/orderDetail";