解决冲突

my/order/payModify.vue

@@ -2,7 +2,6 @@
 	<view class="content">
 		<view class="padding-bottom u-skeleton">
 			<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
-<<<<<<< .mine
 				<view class="head-top">
 					<view class="pay-title" style="">服务项目</view>
 					<view class="flex">
@@ -33,40 +32,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="padding margin-top-sm header-view">
-=======
 				<view class="ske-padding margin-top-sm header-view">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
 					<view v-if="!detailaddress">请选择地址</view>
 					<view class="margin-right-xs">
 						<view class="flex justify-between margin-top-lg">
@@ -1358,7 +1324,6 @@
 </script>
 
 <style lang="scss" scoped>
-<<<<<<< .mine
 	.head-bottom{
 		width: 68%;
 		display: flex;
@@ -1406,7 +1371,6 @@
 		color: #333333;
 		margin-bottom: 5px;
 	}
-=======
 	.view-more{
 		display:inline-block;
 		border-top:1px solid;
@@ -1426,35 +1390,6 @@
 		
 	}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
 	.header-bottom-money-zhen span{
 		color: #F95900 !important;
 		font-weight: bold !important;