转账功能优化
This commit is contained in:
@@ -153,41 +153,92 @@ Page({
|
||||
this.setData({ withdrawName: e.detail.value });
|
||||
},
|
||||
onConfirmWithdraw() {
|
||||
const { withdrawName, withdrawAmount } = this.data;
|
||||
//提交前提现先确保完成免确认收款授权(授权后审核通过即可免确认直接到账零钱)
|
||||
this.ensureTransferAuthorized()
|
||||
.then(() => this.submitWithdraw())
|
||||
.catch((msg) => {
|
||||
wx.showToast({ title: typeof msg === 'string' && msg ? msg : '未完成授权,已取消提现', icon: 'none' });
|
||||
const title = msg && msg.message
|
||||
? msg.message
|
||||
: (typeof msg === 'string' && msg ? msg : '未完成授权,已取消提现');
|
||||
wx.showToast({ title: title, icon: 'none', duration: 2500 });
|
||||
});
|
||||
},
|
||||
// 确保完成免确认收款授权:已授权直接通过;未授权拉起微信授权页
|
||||
ensureTransferAuthorized() {
|
||||
return fetchTransferAuthorization().then((res) => {
|
||||
if (res.code != 1) {
|
||||
throw new Error(res.msg || '获取授权状态失败');
|
||||
}
|
||||
const data = res.data || {};
|
||||
if (data.authorized) {
|
||||
return;
|
||||
}
|
||||
//package_info 仅在授权状态为 WAIT_USER_CONFIRM(待用户确认)时才返回,缺失则无法拉起
|
||||
if (!data.package_info || !data.mch_id || !data.app_id) {
|
||||
throw new Error('免确认收款授权参数缺失,请稍后重试');
|
||||
}
|
||||
//文档要求:调起前须判断微信客户端/基础库是否支持 requestMerchantTransfer
|
||||
if (!wx.canIUse('requestMerchantTransfer')) {
|
||||
throw new Error('当前微信版本过低,请更新至最新版本后再授权');
|
||||
}
|
||||
//拉起授权用的 appId 必须与发起授权接口传入的 appid 为同一个
|
||||
let appId = data.app_id;
|
||||
const miniProgram = wx.getAccountInfoSync ? (wx.getAccountInfoSync().miniProgram || {}) : {};
|
||||
if (miniProgram.appId && miniProgram.appId !== data.app_id) {
|
||||
throw new Error('授权商户AppID与当前小程序不一致,无法拉起授权');
|
||||
}
|
||||
if (miniProgram.appId) {
|
||||
appId = miniProgram.appId;
|
||||
}
|
||||
|
||||
return this.requestMerchantTransfer({
|
||||
mchId: String(data.mch_id),
|
||||
appId: appId,
|
||||
package: data.package_info,
|
||||
});
|
||||
});
|
||||
},
|
||||
// 拉起微信免确认收款授权页(requestMerchantTransfer)
|
||||
requestMerchantTransfer(params) {
|
||||
return new Promise((resolve, reject) => {
|
||||
fetchTransferAuthorization().then((res) => {
|
||||
if (res.code != 1) {
|
||||
reject(res.msg || '获取授权状态失败');
|
||||
return;
|
||||
}
|
||||
const data = res.data || {};
|
||||
if (data.authorized) {
|
||||
resolve();
|
||||
return;
|
||||
}
|
||||
wx.requestMerchantTransfer({
|
||||
mchId: data.mch_id,
|
||||
appId: data.app_id,
|
||||
package: data.package_info,
|
||||
success: () => {
|
||||
wx.showToast({ title: '授权成功', icon: 'success' });
|
||||
resolve();
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log('requestMerchantTransfer fail', err);
|
||||
reject('需完成免确认收款授权后才能提现');
|
||||
},
|
||||
});
|
||||
}).catch(() => reject('网络异常,请稍后重试'));
|
||||
//在用户点击手势链路中调起:先二次确认,避免异步请求后直接调起被客户端拒绝
|
||||
wx.showModal({
|
||||
title: '免确认收款授权',
|
||||
content: '提现前需先开通免确认收款授权,点击「去授权」在微信授权页完成确认后即可提现。',
|
||||
confirmText: '去授权',
|
||||
cancelText: '取消',
|
||||
success: (modalRes) => {
|
||||
if (!modalRes.confirm) {
|
||||
reject('已取消授权,无法提现');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
wx.requestMerchantTransfer(Object.assign({}, params, {
|
||||
success: (res) => {
|
||||
//success 仅代表授权页展示成功,不代表用户已确认授权,最终以微信异步回调为准
|
||||
console.log('requestMerchantTransfer success', res);
|
||||
const errMsg = (res && (res.err_msg || res.errMsg)) || '';
|
||||
if (errMsg && errMsg !== 'requestMerchantTransfer:ok') {
|
||||
reject(errMsg === 'requestMerchantTransfer:cancel'
|
||||
? '已取消授权,无法提现'
|
||||
: '拉起授权失败:' + errMsg);
|
||||
return;
|
||||
}
|
||||
wx.showToast({ title: '请在授权页完成确认', icon: 'none', duration: 2000 });
|
||||
resolve();
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log('requestMerchantTransfer fail', err);
|
||||
const errMsg = (err && (err.errMsg || err.err_msg)) || '';
|
||||
reject(errMsg ? '拉起授权失败:' + errMsg : '拉起授权失败,请更新微信后重试');
|
||||
},
|
||||
}));
|
||||
} catch (e) {
|
||||
reject('当前微信版本不支持免确认收款授权,请更新后重试');
|
||||
}
|
||||
},
|
||||
fail: () => reject('已取消授权,无法提现'),
|
||||
});
|
||||
});
|
||||
},
|
||||
// 原提现提交逻辑
|
||||
|
||||
Reference in New Issue
Block a user