fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by lea guo
Commit ae9d73ad66bb0cceb7e6869f79f3e7e5aa12e6e0 1 parent e0a26f82

confilct

Inline Side-by-side
Showing 1 changed file with 0 additions and 7 deletions
1 <template> 1 <template>
2 <div> 2 <div>
3 -<<<<<<< HEAD  
4 <layout-app 3 <layout-app
5 :title="'\u200E'" 4 :title="'\u200E'"
6 class="buyer-order-detail-wrapper" 5 class="buyer-order-detail-wrapper"
7 :backAction="onBack" 6 :backAction="onBack"
8 > 7 >
9 -=======  
10 - <layout-app :title="'\u200E'" class="buyer-order-detail-wrapper">  
11 ->>>>>>> 订单详情、我的收藏：移除scroll组件  
12 <div class="order-detail-wrapper"> 8 <div class="order-detail-wrapper">
13 <div class="content"> 9 <div class="content">
14 <!-- 状态信息 --> 10 <!-- 状态信息 -->
@@ -141,10 +137,7 @@ import OrderActions from "../components/order-actions"; @@ -141,10 +137,7 @@ import OrderActions from "../components/order-actions";
141 import VideoPlayer from "../order-list/components/video-player"; 137 import VideoPlayer from "../order-list/components/video-player";
142 138
143 import orderActionMixin from "../mixin/order-action"; 139 import orderActionMixin from "../mixin/order-action";
144 -<<<<<<< HEAD  
145 import routeActionMinxin from "../mixin/route"; 140 import routeActionMinxin from "../mixin/route";
146 -=======  
147 ->>>>>>> 订单详情、我的收藏：移除scroll组件  
148 141
149 const STORE_PATH = "order/orderDetail"; 142 const STORE_PATH = "order/orderDetail";
150 143