Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/my_task.vue

@@ -588,7 +588,29 @@
 			},
 			navToDetailPage(item) {
 				uni.setStorageSync('taskContent',item.messageContent)
-				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
+				if(item.vesselId == "点击切换任务状态")
+				{
+					let data = {}
+					data.id = item.id
+					this.$api.doRequest('get', '/newNoticeTask/confirmFee',data).then(res => {
+							console.log(res)
+						if (res.data.code == 200) {
+							this.getIndexBuyData(1,this.keyword)
+							uni.showToast({
+								title: "确认成功",
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					})
+				}
+				else if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId + "&isShowbtn=true"
 					})