From 28b98fd8577e850b8e714b34d33cd5ec1c8d6b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 6 Jul 2022 18:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskEdit.vue | 4 ++--
 src/views/xm/core/xmTaskOrder/ToPay.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 7c514c1b..7973b659 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -290,7 +290,7 @@
 							</el-col> 
 						</el-row>  
 						</p>
-						 <to-pay v-else-if="toPayVisible " :task-id="editForm.id" :visible="toPayVisible" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
+						 <to-pay v-else-if="toPayVisible" :biz-type="'1'" :task-id="editForm.id" :visible="toPayVisible" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
 					</el-tab-pane>
 					
 					<el-tab-pane label="营销推广" name="82" v-if="editForm.ntype!='1'">
@@ -375,7 +375,7 @@
 							</el-col> 
 						</el-row>  
 						</p>
-						 <to-pay v-else :task-id="editForm.id" :visible="toPayVisible" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
+						 <to-pay v-else :task-id="editForm.id" :visible="toPayVisible" :biz-type="'2'" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
 					</el-tab-pane>
 					<el-tab-pane label="关注" name="91"> 
 						<xm-my-do-focus v-if="activateTabPaneName=='91'" :biz-id="editForm.id" :pbiz-id="editForm.projectId" :biz-name="editForm.name" focus-type="2"></xm-my-do-focus>
diff --git a/src/views/xm/core/xmTaskOrder/ToPay.vue b/src/views/xm/core/xmTaskOrder/ToPay.vue
index 10e6b8f5..f41c6377 100644
--- a/src/views/xm/core/xmTaskOrder/ToPay.vue
+++ b/src/views/xm/core/xmTaskOrder/ToPay.vue
@@ -54,7 +54,7 @@
 		    ...mapGetters([ 'userInfo'  ]),
 
 		},
-		props:['taskId'],
+		props:['taskId','visible','bizType'],
 
 		watch: { 
 	      'visible':function(visible) { 
@@ -117,7 +117,7 @@
 				this.$emit('cancel');
 			}, 
 			calcOrder(){
-				var params={taskId:this.taskId,payType:this.payType}
+				var params={taskId:this.taskId,payType:this.payType,bizType:this.bizType}
 				calcXmTaskOrder(params).then(res=>{
 					var tips = res.data.tips
 					if(tips.isOk){
@@ -128,7 +128,7 @@
 				})
 			},
 			createOrder() { 
-			var params={taskId:this.taskId,payType:this.payType}
+			var params={taskId:this.taskId,payType:this.payType,bizType:this.bizType}
 			addXmTaskOrder(params).then(res => {
 				if(res.data.tips.isOk){
 				//获取订单号