修改冲突

pages/erpbusiness/index.vue

@@ -79,15 +79,15 @@
 						show: true
 					},
 
-					{
-						num: 2,
-						name: '收购检斤',
-						// icon: 'cuIcon-copy',
-						src:'../../static/img/erp/shougoujianjin@3x.png',
-						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-						show: false
-					}
+					// {
+					// 	num: 2,
+					// 	name: '收购检斤',
+					// 	// icon: 'cuIcon-copy',
+					// 	src:'../../static/img/erp/shougoujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 	show: false
+					// }
 
 					// {
 					// 	num: 5,

pages/task/my_task.vue

@@ -350,7 +350,6 @@
 						})
 					}
 				}else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
-					debugger
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/Issueandreceipt_task_approval?id=` + item.businessId