Browse Source

优化

master
陈裕财 4 years ago
parent
commit
28b98fd857
  1. 4
      src/views/xm/core/xmTask/XmTaskEdit.vue
  2. 6
      src/views/xm/core/xmTaskOrder/ToPay.vue

4
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -290,7 +290,7 @@
</el-col> </el-col>
</el-row> </el-row>
</p> </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>
<el-tab-pane label="营销推广" name="82" v-if="editForm.ntype!='1'"> <el-tab-pane label="营销推广" name="82" v-if="editForm.ntype!='1'">
@ -375,7 +375,7 @@
</el-col> </el-col>
</el-row> </el-row>
</p> </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>
<el-tab-pane label="关注" name="91"> <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> <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>

6
src/views/xm/core/xmTaskOrder/ToPay.vue

@ -54,7 +54,7 @@
...mapGetters([ 'userInfo' ]), ...mapGetters([ 'userInfo' ]),
}, },
props:['taskId'],
props:['taskId','visible','bizType'],
watch: { watch: {
'visible':function(visible) { 'visible':function(visible) {
@ -117,7 +117,7 @@
this.$emit('cancel'); this.$emit('cancel');
}, },
calcOrder(){ calcOrder(){
var params={taskId:this.taskId,payType:this.payType}
var params={taskId:this.taskId,payType:this.payType,bizType:this.bizType}
calcXmTaskOrder(params).then(res=>{ calcXmTaskOrder(params).then(res=>{
var tips = res.data.tips var tips = res.data.tips
if(tips.isOk){ if(tips.isOk){
@ -128,7 +128,7 @@
}) })
}, },
createOrder() { createOrder() {
var params={taskId:this.taskId,payType:this.payType}
var params={taskId:this.taskId,payType:this.payType,bizType:this.bizType}
addXmTaskOrder(params).then(res => { addXmTaskOrder(params).then(res => {
if(res.data.tips.isOk){ if(res.data.tips.isOk){
// //

Loading…
Cancel
Save