admin/hyapp-h5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yumi 修复

Browse Source
This commit is contained in:
zhx 2026-06-24 16:31:13 +08:00
parent 7dbcec4a86
commit 4b5d26e0f1
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/api.js
View File

@ -882,6 +882,11 @@ var default_api = 'https://api.global-interaction.com/';
if (isYumiWebPay()) {
return mapYumiOptions(
Object.assign({}, options, {
pay_country_id:
query.payCountryId ||
options.pay_country_id ||
options.payCountryId ||
'',
country_code:
query.countryCode || options.country_code,
})

43
recharge/index.html
View File

@ -2266,19 +2266,32 @@
function selectPayCountryFromConfig(context) {
var configured = selectedConfiguredPayCountry(context);
if (configured) {
var resolved = payCountryFromContext(
context,
configured.country_code || configured.countryCode
);
// app JSON 只控制国家和支付方式是否展示；后台 payCountryId 必须从账号 context 的国家映射里取，
// 否则 Yumi 这类旧下单接口会在商品已展示后因为 payCountryId 为空被参数校验拦截。
state.selectedPayCountryID =
configured.pay_country_id ||
configured.payCountryId ||
configured.id ||
resolved.pay_country_id ||
resolved.payCountryId ||
resolved.id ||
'';
state.selectedCountryCode = String(
configured.country_code ||
configured.countryCode ||
resolved.country_code ||
resolved.countryCode ||
''
).toUpperCase();
state.selectedCurrencyCode =
configured.currency_code ||
configured.currencyCode ||
resolved.currency_code ||
resolved.currencyCode ||
state.selectedCurrencyCode ||
'';
return configured;
@ -2351,6 +2364,36 @@
: [];
}
function payCountryFromContext(context, countryCode) {
var countries =
(context &&
(context.country_list || context.countryList)) ||
[];
var normalizedCountryCode = String(countryCode || '')
.trim()
.toUpperCase();
if (!normalizedCountryCode || !countries.length) {
return {};
}
return (
countries.find(function (item) {
return (
String(
item.country_code ||
item.countryCode ||
firstValue(item.country || {}, [
'alphaTwo',
'alpha_two',
'countryCode',
'country_code',
]) ||
''
).toUpperCase() === normalizedCountryCode
);
}) || {}
);
}
function userCountryCodeFromContext(context) {
context = context || {};
var account = (context && context.account) || {};