Skip to content

Commit 50e7ae2

Browse files
committed
mall + pay:
1. 拆分支付回调、退款回调的 URL 2. 修复微信支付回调的时间解析错误
1 parent 2fa09f0 commit 50e7ae2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/views/pay/app/components/wechatChannelForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div>
33
<el-dialog :visible.sync="transferParam.wechatOpen" :title="title" @close="close" append-to-body width="800px">
4-
<el-form ref="wechatJsApiForm" :model="form" :rules="rules" size="medium" label-width="100px"
4+
<el-form ref="wechatJsApiForm" :model="form" :rules="rules" size="medium" label-width="120px"
55
v-loading="transferParam.loading">
66
<el-form-item label-width="180px" label="渠道费率" prop="feeRate">
77
<el-input v-model="form.feeRate" placeholder="请输入渠道费率" clearable :style="{width: '100%'}">

src/views/pay/cashier/index.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,9 @@ export default {
331331
* ③ close:支付已关闭
332332
*/
333333
goReturnUrl(payResult) {
334+
// 清理任务
335+
this.clearQueryInterval();
336+
334337
// 未配置的情况下,只能关闭
335338
if (!this.returnUrl) {
336339
this.$tab.closePage();

0 commit comments

Comments
 (0)