diff --git a/locale/en.json b/locale/en.json index 7a8d9c4..d618002 100644 --- a/locale/en.json +++ b/locale/en.json @@ -211,7 +211,9 @@ "yearCard": "Yearly", "days": "days", "selectPackage": "Please select a package", - "consumptionRecord": "Consumption record" + "consumptionRecord": "Consumption record", + "returnMine": "I'm about to return to my page" + }, "book": { "title": "My Books", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index 25c4fcf..620442c 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -212,7 +212,8 @@ "yearCard": "年卡", "days": "天", "selectPackage": "请选择套餐", - "consumptionRecord": "消费记录" + "consumptionRecord": "消费记录", + "returnMine": "即将返回我的页面" }, "book": { "title": "我的书单", diff --git a/pages/user/index.vue b/pages/user/index.vue index 0ef938e..21d6091 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -425,7 +425,7 @@ border-radius: 50rpx; color: #fffbf6; padding: 10rpx 32rpx; - background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 200%); + background: #007bff; } .assets { diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue index aee74f1..3237fa8 100644 --- a/pages/user/recharge/index.vue +++ b/pages/user/recharge/index.vue @@ -182,7 +182,7 @@ const res = await getPlaceOrder(data) orderSn.value = res.orderSn console.log(orderSn.value, '获取订单号'); - uni.showLoading({ title: '生成订单中...' }) + uni.showLoading({ title: t('order.orderCreating') }) getGooglePay() } catch (error) { console.error('获取订单号失败', error) @@ -249,7 +249,7 @@ } else { console.log('查询失败', e); uni.showToast({ - title: '请求失败,请检查您的网络', + title: t('global.networkConnectionError'), icon: 'error' }) } @@ -274,7 +274,7 @@ console.log(e, 'payAll方法成功返参'); getConsume() } else { - uni.showToast({ title: '支付失败', icon: 'error' }) + uni.showToast({ title: t('user.paymentFailed'), icon: 'error' }) console.log(e, 'e'); // 支付失败 } @@ -293,7 +293,7 @@ (e : any) => { if (e.code == 0) { console.log(e, '确认交易成功'); - uni.showToast({ title: '即将返回我的页面', icon: 'none' }) + uni.showToast({ title: t('user.returnMine'), icon: 'none' }) // 确认成功 googleVerify() } else {