From e094a8c9fd221aa794a9b81b413b21854da61309 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 20:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=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 | 24 +++++++++++-------------
 src/views/xm/core/xmTaskOrder/ToPay.vue |  5 +++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 347d2f49..33c4d4c0 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -210,7 +210,7 @@
 						<el-steps :active="calcTaskStep" align-center simple v-if="editForm.crowd==='1'">
 							<el-step v-for="(item,index) in dicts.bidStep" :title="item.name" :description="item.name" :key="index"></el-step> 
 						</el-steps> 
-						<p v-if="!toPayVisible &&  activateTabPaneName=='8'">
+						<p v-if="!toPayEfundsVisible &&  activateTabPaneName=='8'">
 					 	<el-form-item> 
 							 <el-checkbox v-model="editForm.taskOut" true-label="1" false-label="0" id="taskOut" @change="editXmTaskSomeFields(editForm,'taskOut',$event)">外购</el-checkbox>   
  						 
@@ -286,18 +286,18 @@
 							<el-col :span="6" v-if="editForm.bidStep=='4'">  
 								<strong> 合计待付款￥:</strong>&nbsp;&nbsp;<font style="font-size:48px;color:red;"> {{needPayEfundsAt}}&nbsp;</font>元
 								 <br/>
-								 <el-button class="padding" @click="toPayAt" type="primary">去付款</el-button> 
+								 <el-button class="padding" @click="toPayEfundsVisible=true" type="primary">去付款</el-button> 
 							</el-col> 
 						</el-row>  
 						</p>
-						 <to-pay v-else-if="toPayVisible &&  activateTabPaneName=='8'" :biz-type="'1'" :task-id="editForm.id" :visible="toPayVisible" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
+						 <to-pay v-else-if="toPayEfundsVisible &&  activateTabPaneName=='8'" :biz-type="'1'" :task-id="editForm.id" :visible="toPayEfundsVisible" @cancel="toPayEfundsVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
 					</el-tab-pane>
 					
 					<el-tab-pane label="营销推广" name="82" v-if="editForm.ntype!='1'">
 						<el-steps :active="calcTaskStep" align-center simple v-if="editForm.crowd==='1'">
 							<el-step v-for="(item,index) in dicts.bidStep" :title="item.name" :description="item.name" :key="index"></el-step> 
 						</el-steps> 
-						<p v-if="!toPayVisible &&  activateTabPaneName=='82'">  
+						<p v-if="!toPayMarketVisible &&  activateTabPaneName=='82'">  
 						
 						<el-row v-if="editForm.crowd==='1'">
 							<el-col :span="18">  
@@ -371,11 +371,11 @@
 							<el-col :span="6" v-if="needPayMarketAt>0">  
 								<strong> 合计待付款￥:</strong>&nbsp;&nbsp;<font style="font-size:48px;color:red;"> {{needPayMarketAt}}&nbsp;</font>元
 								 <br/>
-								 <el-button class="padding" @click="toPayAt" type="primary">去付款</el-button> 
+								 <el-button class="padding" @click="toPayMarketVisible=true" type="primary">去付款</el-button> 
 							</el-col> 
 						</el-row>  
 						</p>
-						 <to-pay v-else-if=" toPayVisible &&  activateTabPaneName=='82'" :task-id="editForm.id" :visible="toPayVisible" :biz-type="'2'" @cancel="toPayVisible=false" @pay-success="onTaskPaySuccess"></to-pay>
+						 <to-pay v-else-if=" toPayMarketVisible &&  activateTabPaneName=='82'" :task-id="editForm.id" :visible="toPayMarketVisible" :biz-type="'2'" @cancel="toPayMarketVisible=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>
@@ -560,7 +560,8 @@
 				activateTabPaneName:'2',
 				selectParentTaskVisible:false, 
 				supRequires:[],
-				toPayVisible:false,
+				toPayEfundsVisible:false,
+				toPayMarketVisible:false,
 				 /**end 在上面加自定义属性**/
 			}//end return
 		},//end data
@@ -891,17 +892,14 @@
 			},
 			doAddXmRecordVisit(){
 				addXmRecordVisit({bizId:this.editForm.id,objType:'2',pbizId:this.editForm.projectId})
-			},
-
-			toPayAt(){
-				this.toPayVisible=true;
-			},
+			}, 
 			onTaskPaySuccess(orderId){ 
 				listXmTask({ids:[this.editForm.id]}).then(res=>{
 					Object.assign(this.editForm,res.data.data[0])
 					this.editFormBak={...this.editForm}
 					this.$emit("pay-success",this.editForm)
-					this.toPayVisible=false;
+					this.toPayEfundsVisible=false;
+					this.toPayMarketVisible=false;
 				})
 				
 			}
diff --git a/src/views/xm/core/xmTaskOrder/ToPay.vue b/src/views/xm/core/xmTaskOrder/ToPay.vue
index f41c6377..cd6bfba5 100644
--- a/src/views/xm/core/xmTaskOrder/ToPay.vue
+++ b/src/views/xm/core/xmTaskOrder/ToPay.vue
@@ -28,6 +28,7 @@
 			title="微信支付"
 			:visible.sync="weixinPayVisible"
 			:show-close="false"
+			append-to-body
 			@close="closeDialog"
 			width="350px"
 			>
@@ -85,13 +86,13 @@
 					label: '支付宝',
 					val: '2',
 					icon: aliPayImg,
-					isChecked: true
+					isChecked: false
 					},
 					{
 					label: '微信',
 					val: '1',
 					icon: weixinPayImg,
-					isChecked: false
+					isChecked: true
 					}
 				],
 				agreementChecked:false,