解决样式冲突

pages/home/components/navigation.vue

@@ -9,13 +9,12 @@
 </template>
 
 <script>
-	import {
-		getTodoTaskPage
-	} from '@/api/wt/index.js'
+	import { getTodoTaskPage } from '@/api/wt/index.js'
 	export default {
 		data() {
 			return {
-				workList: [{
+				workList: [
+					{
 						class: 'iconfont icon-bianji',
 						title: '我的工单',
 						link_url: '/pages/home/work/work',
@@ -103,16 +102,6 @@
 			margin-top: 5rpx;
 			align-items: center;
 			flex: 1;
-<<<<<<< Updated upstream
-
-			span {
-				padding: 18rpx;
-				color: #ffffff;
-				margin-bottom: 14rpx;
-				border-radius: 50%;
-			}
-
-=======
 			span {
 				padding: 18rpx;
 				color: #ffffff;
@@ -120,7 +109,6 @@
 				border-radius: 50%;
 			}
 
->>>>>>> Stashed changes
 			.badge {
 				position: absolute;
 				top: 0;
@@ -132,37 +120,17 @@
 				font-style: normal;
 			}
 		}
-<<<<<<< Updated upstream
-
 		.nav-item:nth-child(1) span {
 			background-color: $uni-color-success;
 		}
-
 		.nav-item:nth-child(2) span {
 			background-color: $uni-color-warning;
 		}
-
 		.nav-item:nth-child(3) span {
 			background-color: $uni-color-primary;
 		}
-
-=======
-		.nav-item:nth-child(1) span {
-			background-color: $uni-color-success;
-		}
-		.nav-item:nth-child(2) span {
-			background-color: $uni-color-warning;
-		}
-		.nav-item:nth-child(3) span {
-			background-color: $uni-color-primary;
-		}
->>>>>>> Stashed changes
 		.nav-item:nth-child(4) span {
 			background-color: $uni-color-error;
 		}
 	}
-<<<<<<< Updated upstream
-</style>
-=======
 </style>
->>>>>>> Stashed changes