合并冲突

subpackage/after-sale/activation-once-again/select-car.vue

@@ -27,11 +27,11 @@
 			<view v-if="state.loading" class="flex">加载中...</view>
 			<view v-if="state.finished && state.list.length > 0" class="flex">没有更多了</view>
 		</scroll-view>
-		<view class="action">
+		<<!-- view class="action">
 			<button type="default" class="ui-btn" @click="add()">
 				新增车辆
 			</button>
-		</view>
+		</view> -->
 	</view>
 </template>