|
@@ -4,7 +4,7 @@ import log from '@/utils/log.js';
|
|
import { compare } from '@/utils/location.js';
|
|
import { compare } from '@/utils/location.js';
|
|
import uni from '@/utils/uniHooks';
|
|
import uni from '@/utils/uniHooks';
|
|
import { initWxJsSdkConfig } from '@/utils/login';
|
|
import { initWxJsSdkConfig } from '@/utils/login';
|
|
-import { getAppIdByGroupIdAndMallId, getIsWxh5, getPlatform } from '@/utils';
|
|
|
|
|
|
+import { getAppIdByGroupIdAndMallId, getIsWxh5, getPlatform, isAlipay } from '@/utils';
|
|
import { Dialog, Toast } from 'vant';
|
|
import { Dialog, Toast } from 'vant';
|
|
import { ordersAndPrepay } from '@/api/parking';
|
|
import { ordersAndPrepay } from '@/api/parking';
|
|
// import checkOutResponse from '@/api/mockData/checkout.hz.response'
|
|
// import checkOutResponse from '@/api/mockData/checkout.hz.response'
|
|
@@ -262,6 +262,7 @@ export default {
|
|
},
|
|
},
|
|
kerryPayment(session = '011cad54-735f-4e92-8f1b-f22bdfe073cd', payParams) {
|
|
kerryPayment(session = '011cad54-735f-4e92-8f1b-f22bdfe073cd', payParams) {
|
|
const platform = getPlatform();
|
|
const platform = getPlatform();
|
|
|
|
+ console.log('platform:::', platform)
|
|
let appId = uni.getStorageSync('appid');
|
|
let appId = uni.getStorageSync('appid');
|
|
let openId = uni.getStorageSync('openid') || this.openid;
|
|
let openId = uni.getStorageSync('openid') || this.openid;
|
|
if (platform === 'miniprogram') {
|
|
if (platform === 'miniprogram') {
|
|
@@ -269,11 +270,13 @@ export default {
|
|
// appId = 'wxd830fe4d1e04988e';
|
|
// appId = 'wxd830fe4d1e04988e';
|
|
appId = this.appId;
|
|
appId = this.appId;
|
|
}
|
|
}
|
|
|
|
+ console.log('支付宝::', isAlipay())
|
|
const params = {
|
|
const params = {
|
|
region: 'cn',
|
|
region: 'cn',
|
|
- payChannel: 'OFFICIAL_ACCOUNT',
|
|
|
|
|
|
+ payChannel: isAlipay() ? 'MINI_PROGRAM' : 'OFFICIAL_ACCOUNT',
|
|
// payChannel: 'MOBILE_WEB',
|
|
// payChannel: 'MOBILE_WEB',
|
|
- payOption: 'WECHATPAY',
|
|
|
|
|
|
+
|
|
|
|
+ payOption: isAlipay() ? 'ALIPAY' : 'WECHATPAY',
|
|
appId: appId,
|
|
appId: appId,
|
|
// openId: 'oudWQ5SCDElfn-IQH6eBR5JesOz4', // 下的appid: wxd830fe4d1e04988e
|
|
// openId: 'oudWQ5SCDElfn-IQH6eBR5JesOz4', // 下的appid: wxd830fe4d1e04988e
|
|
openId,
|
|
openId,
|
|
@@ -293,6 +296,7 @@ export default {
|
|
// console.log(1795, res);
|
|
// console.log(1795, res);
|
|
if (res.data?.code == '000000') {
|
|
if (res.data?.code == '000000') {
|
|
const prepayJson = res.data.data.params;
|
|
const prepayJson = res.data.data.params;
|
|
|
|
+ console.log('prepayJson::', res.data)
|
|
const platform = getPlatform();
|
|
const platform = getPlatform();
|
|
this.isPay = true
|
|
this.isPay = true
|
|
// TODO: h5环境判断
|
|
// TODO: h5环境判断
|
|
@@ -315,16 +319,25 @@ export default {
|
|
this.reCreateParkOrder();
|
|
this.reCreateParkOrder();
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- window.toWXSendMsg({
|
|
|
|
- type: 'openWxPay',
|
|
|
|
- options: {
|
|
|
|
|
|
+ let options = {}
|
|
|
|
+ if (isAlipay()) {
|
|
|
|
+ options = {
|
|
|
|
+ provider: 'alipay',
|
|
|
|
+ orderInfo: prepayJson.trade_no,
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ options = {
|
|
provider: 'wxpay',
|
|
provider: 'wxpay',
|
|
timeStamp: prepayJson.timeStamp,
|
|
timeStamp: prepayJson.timeStamp,
|
|
nonceStr: prepayJson.nonceStr,
|
|
nonceStr: prepayJson.nonceStr,
|
|
package: prepayJson.package,
|
|
package: prepayJson.package,
|
|
signType: prepayJson.signType,
|
|
signType: prepayJson.signType,
|
|
paySign: prepayJson.paySign,
|
|
paySign: prepayJson.paySign,
|
|
- },
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ window.toWXSendMsg({
|
|
|
|
+ type: 'openWxPay',
|
|
|
|
+ options: options,
|
|
});
|
|
});
|
|
window.subscribe('wxPayOver', (options) => {
|
|
window.subscribe('wxPayOver', (options) => {
|
|
// this.Toastloading.clear();
|
|
// this.Toastloading.clear();
|