diff --git a/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue b/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue index 0de1993291c2b32e828b8b875f4294fc9cf97273..61c52fd3a8325b679be88320c1bbe9026b728611 100644 --- a/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue +++ b/uni_modules/uni-pay-x/components/uni-pay/uni-pay.uvue @@ -282,12 +282,14 @@ } // #ifdef APP if (options['provider'] == "wxpay") { - uni.showModal({ - title: "提示", - content: "uni-pay 的 uni-app x 版本暂未适配微信支付", - showCancel: false - }) - return; + // #ifdef uniVersion < 4.11 + uni.showModal({ + title: "提示", + content: "请先升级HBX至4.11", + showCancel: false + }) + return; + // #endif } // #endif @@ -341,13 +343,6 @@ // 调起支付 orderPayment(res : UTSJSONObject) { this.orderRes = res; - let _order = res.get('order'); - let orderStr = ""; - if (typeof _order == "string") { - orderStr = res.get('order') as string; - } else { - //order = res.get('order') as UTSJSONObject; - } if (res['qr_code'] != null && res['qr_code'] != "") { this.$emit("qrcode", res); } @@ -379,6 +374,8 @@ } // #endif // #ifndef H5 + let _order = res.get('order'); + let orderStr = typeof _order == "string" ? _order as string : JSON.stringify(_order) as string; uni.requestPayment({ provider: res['provider'] as string, orderInfo: orderStr, diff --git a/uni_modules/uni-pay-x/uniCloud/cloudfunctions/uni-pay-co/index.obj.js b/uni_modules/uni-pay-x/uniCloud/cloudfunctions/uni-pay-co/index.obj.js index 19ddb619ed3d3a316900ece38d241d0cc80598b2..596089111cca6687283f61e038cb4be3bdce99e8 100644 --- a/uni_modules/uni-pay-x/uniCloud/cloudfunctions/uni-pay-co/index.obj.js +++ b/uni_modules/uni-pay-x/uniCloud/cloudfunctions/uni-pay-co/index.obj.js @@ -119,7 +119,10 @@ module.exports = { cloudInfo, wxpay_virtual, }); - + // uniappx-特殊处理 + if (typeof res.order === "object" && typeof res.order["timestamp"] === "string") { + res.order["timestamp"] = parseFloat(res.order["timestamp"]); + } return res; }, /** @@ -256,7 +259,7 @@ module.exports = { }; } }, - + /** * 验证iosIap苹果内购支付凭据 */ @@ -272,7 +275,7 @@ module.exports = { transaction_identifier }); }, - + /** * 接收微信小程序虚拟支付异步通知 */ @@ -286,5 +289,5 @@ module.exports = { cloudInfo }); }, - + }