|
@@ -32,9 +32,6 @@ export const createOrder = async (orderData) => {
|
|
|
const { inapp, wechat_jsapi } = createOrderResult.pay_channel;
|
|
const { inapp, wechat_jsapi } = createOrderResult.pay_channel;
|
|
|
|
|
|
|
|
|
|
|
|
|
- console.log("createOrderResult", createOrderResult)
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
let midasPayParams = {}
|
|
let midasPayParams = {}
|
|
|
let gzhPayParams = {}
|
|
let gzhPayParams = {}
|
|
|
|
|
|
|
@@ -137,7 +134,7 @@ const makePay = async ({ curOrderInfo, gzhPayParams }) => {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
} else if (curOrderInfo.pay_type === "kf") {
|
|
} else if (curOrderInfo.pay_type === "kf") {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 拉起客服消息
|
|
// 拉起客服消息
|
|
|
wx.openCustomerServiceConversation({
|
|
wx.openCustomerServiceConversation({
|
|
|
sessionFrom: gzhPayParams.sessionFrom,
|
|
sessionFrom: gzhPayParams.sessionFrom,
|
|
@@ -146,7 +143,7 @@ const makePay = async ({ curOrderInfo, gzhPayParams }) => {
|
|
|
sendMessageTitle: gzhPayParams.sendMessageTitle,
|
|
sendMessageTitle: gzhPayParams.sendMessageTitle,
|
|
|
sendMessageImg: gzhPayParams.sendMessageImage,
|
|
sendMessageImg: gzhPayParams.sendMessageImage,
|
|
|
});
|
|
});
|
|
|
- console.log("kfkkk===>",{
|
|
|
|
|
|
|
+ console.log("kfkkk===>", {
|
|
|
sessionFrom: gzhPayParams.sessionFrom,
|
|
sessionFrom: gzhPayParams.sessionFrom,
|
|
|
showMessageCard: gzhPayParams.showMessageCard,
|
|
showMessageCard: gzhPayParams.showMessageCard,
|
|
|
sendMessagePath: gzhPayParams.sendMessagePath,
|
|
sendMessagePath: gzhPayParams.sendMessagePath,
|
|
@@ -159,7 +156,19 @@ const makePay = async ({ curOrderInfo, gzhPayParams }) => {
|
|
|
const midasPay = async ({ curOrderInfo, midasPayParams }) => {
|
|
const midasPay = async ({ curOrderInfo, midasPayParams }) => {
|
|
|
|
|
|
|
|
let platform = getDeviceInfo('platform')
|
|
let platform = getDeviceInfo('platform')
|
|
|
- try {
|
|
|
|
|
|
|
+ console.log({
|
|
|
|
|
+ mode: "game",
|
|
|
|
|
+ env: midasPayParams.env,
|
|
|
|
|
+ offerId: midasPayParams.offerId,
|
|
|
|
|
+ currencyType: "CNY",
|
|
|
|
|
+ platform: platform,
|
|
|
|
|
+ buyQuantity: midasPayParams.buyQuantity,
|
|
|
|
|
+ amt: curOrderInfo.money,
|
|
|
|
|
+ zoneId: midasPayParams.zoneId,
|
|
|
|
|
+ outTradeNo: curOrderInfo.order_id,
|
|
|
|
|
+ })
|
|
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
|
|
+ // console.log("curOrderInfo.money * 100", curOrderInfo.money * 100)
|
|
|
wx.requestMidasPayment({
|
|
wx.requestMidasPayment({
|
|
|
mode: "game",
|
|
mode: "game",
|
|
|
env: midasPayParams.env,
|
|
env: midasPayParams.env,
|
|
@@ -171,6 +180,7 @@ const midasPay = async ({ curOrderInfo, midasPayParams }) => {
|
|
|
zoneId: midasPayParams.zoneId,
|
|
zoneId: midasPayParams.zoneId,
|
|
|
outTradeNo: curOrderInfo.order_id,
|
|
outTradeNo: curOrderInfo.order_id,
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
|
|
+
|
|
|
// 腾讯广告小游戏SDK上报支付
|
|
// 腾讯广告小游戏SDK上报支付
|
|
|
DnSdk.getInstance().onPurchase(curOrderInfo.money * 100);
|
|
DnSdk.getInstance().onPurchase(curOrderInfo.money * 100);
|
|
|
// 支付成功后回调
|
|
// 支付成功后回调
|
|
@@ -180,17 +190,13 @@ const midasPay = async ({ curOrderInfo, midasPayParams }) => {
|
|
|
order_id: curOrderInfo.order_id,
|
|
order_id: curOrderInfo.order_id,
|
|
|
callback_type: "client",
|
|
callback_type: "client",
|
|
|
});
|
|
});
|
|
|
- return Promise.resolve();
|
|
|
|
|
|
|
+ resolve(res);
|
|
|
},
|
|
},
|
|
|
fail: (error) => {
|
|
fail: (error) => {
|
|
|
- return Promise.reject(error);
|
|
|
|
|
|
|
+ reject(error); // ✅ 正确传递,外层 try/catch 能捕获
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
- } catch (error) {
|
|
|
|
|
- return Promise.reject(error);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ });
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
/**
|