diff --git a/api/config.ts b/api/config.ts index 11478ba..1805be1 100644 --- a/api/config.ts +++ b/api/config.ts @@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development'; */ const BASE_URL_MAP = { development: { - MAIN: 'http://192.168.110.100:9300/pb/', // 张川川 - //MAIN: 'https://global.nuttyreading.com/', // 线上 + //MAIN: 'http://192.168.110.100:9300/pb/', // 张川川 + MAIN: 'https://global.nuttyreading.com/', // 线上 // PAYMENT: 'https://dev-pay.example.com', // 暂时用不到 // CDN: 'https://cdn-dev.example.com', // 暂时用不到 }, diff --git a/locale/en.json b/locale/en.json index be5b387..afcee3f 100644 --- a/locale/en.json +++ b/locale/en.json @@ -145,7 +145,7 @@ "updateFailed": "Update Failed", "paymentMethod": "Payment Method", "googlePay": "Google Pay", - "applePay": "Apple Pay", + "applePay": "In-App Purchase", "agreeText": "I have agreed", "agreement": "Recharge Agreement", "agreeFirst": "Please agree to the recharge agreement first", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 91a9b24..538f917 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -146,7 +146,7 @@ "updateFailed": "更新失败", "paymentMethod": "支付方式", "googlePay": "Google Pay", - "applePay": "Apple Pay", + "applePay": "IAP 支付", "agreeText": "我已同意", "agreement": "充值协议", "agreeFirst": "请先同意充值协议", diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue index 56b9a1c..3baf035 100644 --- a/pages/user/recharge/index.vue +++ b/pages/user/recharge/index.vue @@ -278,10 +278,7 @@ fail: (err) => { console.log('支付错误', err); restoreComplateRequest() - uni.showToast({ - title: '关闭支付弹窗', - icon: 'none' - }) + uni.showToast({ title: t('user.closeWindow'), icon: 'error' }) reject(err); } }); diff --git a/uni_modules/wot-design-uni/components/composables/useUpload.ts b/uni_modules/wot-design-uni/components/composables/useUpload.ts index 86d569d..fa9c98a 100644 --- a/uni_modules/wot-design-uni/components/composables/useUpload.ts +++ b/uni_modules/wot-design-uni/components/composables/useUpload.ts @@ -232,6 +232,19 @@ export function useUpload(): UseUploadReturn { extension }: ChooseFileOption): Promise { return new Promise((resolve, reject) => { + if(uni.getSystemInfoSync().platform === 'ios') { + uni.chooseImage({ + count: multiple ? maxCount : 1, + mediaType: ['image'], + sizeType, + sourceType, + extension, + success: (res) => resolve(formatImage(res)), + fail: reject + }) + return + } + console.log('-9-9-9-'); switch (accept) { case 'image': // #ifdef MP-WEIXIN