style：修改样式

common/task/task_ima_tab.vue

@@ -22,52 +22,49 @@
 		getTaskType
 	} from "@/api/task";
 
-<<<<<<< HEAD:page_task/module/task_ima_tab.vue
 	export default {
-=======
-  export default {
-    name:'task-ima-tab',
->>>>>>> 115515895717a610da60bb7ef15828663115e978:common/task/task_ima_tab.vue
-		data() {
-			return {
-				current: 0,
-				navList: [{
-					id: 0,
-					briefness_name: '全部',
-					product_icon: '/static/img/task/task-all.png'
-				}]
-			}
-		},
-		mounted() {
-			this.getTaskType()
-		},
-		methods: {
-			getTaskType() {
-				getTaskType().then(res => {
-					if (res.code === 1) {
-						this.navList.push(...res.data)
-
-					}
-				})
-			},
-			setType(current) {
-				// this.$nextTick(() => {
-				// 	uni.createSelectorQuery().in(this).select(".z-tabs-scroll-view").fields({
-				// 		scrollOffset: true
-				// 	}, data => {
-				// 		if (data) {
-				// 			this.currentScrollLeft = data.scrollLeft;
-				// 			console.log(data);
-				// 		} else {}
-				// 	}).exec();
-				// })
-				if (current !== this.current) {
-					this.current = current
-					this.$emit('setProductId', this.navList[current].id)
+		export default {
+			name: 'task-ima-tab',
+			data() {
+				return {
+					current: 0,
+					navList: [{
+						id: 0,
+						briefness_name: '全部',
+						product_icon: '/static/img/task/task-all.png'
+					}]
 				}
 			},
+			mounted() {
+				this.getTaskType()
+			},
+			methods: {
+				getTaskType() {
+					getTaskType().then(res => {
+						if (res.code === 1) {
+							this.navList.push(...res.data)
+
+						}
+					})
+				},
+				setType(current) {
+					// this.$nextTick(() => {
+					// 	uni.createSelectorQuery().in(this).select(".z-tabs-scroll-view").fields({
+					// 		scrollOffset: true
+					// 	}, data => {
+					// 		if (data) {
+					// 			this.currentScrollLeft = data.scrollLeft;
+					// 			console.log(data);
+					// 		} else {}
+					// 	}).exec();
+					// })
+					if (current !== this.current) {
+						this.current = current
+						this.$emit('setProductId', this.navList[current].id)
+					}
+				},
+			}
 		}
-	}
 </script>
 
 <style lang="scss" scoped>

page_task/gain_task/gain_task.vue

@@ -16,14 +16,14 @@
 </template>
 
 <script>
-	import TaskItem from "@/common/task/task-item.vue"
+	// import TaskItem from "@/common/task/task-item.vue"
 	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 TaskImgTab from "@/common/task/task_ima_tab.vue"
 	import {
 		getTaskReceiving,
 		takeTask
@@ -32,7 +32,7 @@
 
 	export default {
 		components: {
-			TaskImgTab,
+			// TaskImgTab,
 			TaskItem
 		},
 		data() {