feat: 新增拼团

This commit is contained in:
2026-09-23 10:29:41 +08:00
parent f7b9e66172
commit 67f8b3f352
33 changed files with 7491 additions and 858 deletions
+27 -13
View File
@@ -1,5 +1,5 @@
import { appDypayFun } from './douyin-pay.js';
import { jumpToPaymentSuccess, jumpToPaymentFailure } from './payment-navigation.js';
import { appDypayFun } from './douyin-pay.js';
import { jumpToPaymentSuccess, jumpToPaymentFailure } from './payment-navigation.js';
import { feedback } from "@/api/payment.js";
/**
@@ -8,7 +8,7 @@ import { feedback } from "@/api/payment.js";
* @param {Object} orderId 支付的订单ID
* @param {Object} orderNum 支付的订单编号
*/
export function appWxpayFun(alipay, orderId, orderNum) {
export function appWxpayFun(alipay, orderId, orderNum, customSuccessUrl) {
const type = alipay.type;
const orderStr = alipay.orderStr;
console.log("微信支付---", alipay, type);
@@ -29,7 +29,7 @@ export function appWxpayFun(alipay, orderId, orderNum) {
success: function (res) {
console.log("success:" + res);
payFeedbackFun(orderId, orderNum, 1);
jumpWayOk();
jumpWayOk(customSuccessUrl);
},
fail: function (err) {
console.log("fail:", err);
@@ -53,7 +53,7 @@ export function appWxpayFun(alipay, orderId, orderNum) {
success: function (res) {
console.log("success:" + res);
payFeedbackFun(orderId, orderNum, 1);
jumpWayOk();
jumpWayOk(customSuccessUrl);
},
fail: function (err) {
console.log("fail:", err);
@@ -76,8 +76,9 @@ export function appWxpayFun(alipay, orderId, orderNum) {
* @param {Object} alipay 微信支付的参数
* @param {Object} orderId 支付的订单ID
* @param {Object} orderNum 支付的订单编号
* @param {string} customSuccessUrl 自定义成功跳转页面
*/
export function zfbPayFun(alipay, orderId, orderNum) {
export function zfbPayFun(alipay, orderId, orderNum, customSuccessUrl) {
console.log("alipay", alipay);
const type = alipay.type;
const orderStr = alipay.orderStr;
@@ -97,7 +98,7 @@ export function zfbPayFun(alipay, orderId, orderNum) {
success: function (res) {
console.log("zfbPayFun res", res);
payFeedbackFun(orderId, orderNum, 1);
jumpWayOk();
jumpWayOk(customSuccessUrl);
},
fail: function (err) {
console.error("支付宝支付error", err);
@@ -124,13 +125,26 @@ export const appDyPayFun = douyinPayFun;
export const appDouyinPayFun = douyinPayFun;
// 跳转到支付成功页面
export function jumpWayOk() {
return jumpToPaymentSuccess();
}
export function jumpWayOk(customUrl) {
if (customUrl) {
const pages = typeof getCurrentPages === "function" ? getCurrentPages() : [];
if (pages[pages.length - 1]?.route === customUrl.replace(/^\//, "")) return Promise.resolve(true);
return new Promise((resolve) => {
uni.redirectTo({
url: customUrl,
success: () => resolve(true),
fail: () => {
uni.navigateTo({ url: customUrl, success: () => resolve(true), fail: () => resolve(false) });
},
});
});
}
return jumpToPaymentSuccess();
}
// 跳转到支付失败页面
export function jumpWayError() {
return jumpToPaymentFailure();
}
export function jumpWayError() {
return jumpToPaymentFailure();
}
/**
* 支付结果回调
* @param {Object} orderId 支付订单ID