style：修改样式

page_task/gain_task/gain_task.vue

@@ -17,18 +17,18 @@
 
 <script>
 	import TaskItem from "@/common/task/task-item.vue"
-<<<<<<< HEAD
 	import TaskImgTab from "@/page_task/module/task_ima_tab.vue"
 	import {
 		getTaskReceiving,
 		takeTask
 	} from "@/api/task";
 	import tools from "@/service/tools";
-=======
 	import TaskImgTab from "@/common/task/task_ima_tab.vue"
-  import {getTaskReceiving, takeTask} from "@/api/task";
-  import tools from "@/service/tools";
->>>>>>> 115515895717a610da60bb7ef15828663115e978
+	import {
+		getTaskReceiving,
+		takeTask
+	} from "@/api/task";
+	import tools from "@/service/tools";
 
 	export default {
 		components: {