Merge branch 'main' of https://git.nuttyreading.com/zm/taimed-international-app

api/modules/user.ts

@@ -237,7 +237,6 @@ export async function getBookBuyConfigList(type: string, qudao: string) {
  * @param id 101众妙之门隐私政策
  */
 export async function getAgreement(id: string) {
-	console.log(id, 'id');
   const res = await mainClient.request<IApiResponse>({
     url: '/sys/agreement/getAgreement',
     method: 'POST',

locale/en.json

@@ -498,7 +498,7 @@
 		"readAgreeServices": "Please read and agree to the value-added services first",
     "orderDetails": "Order Details",
 		"pointsRecord": "Points consumption record",
-		"unusable": "The billing service cannot be used on the device",
+		"unusable": "The billing service cannot be used",
 		"give": "give"
   },
   "vip": {

locale/zh-Hans.json

@@ -498,7 +498,7 @@
 		"readAgreeServices": "请先阅读并同意增值服务",
     "orderDetails": "订单详情",
 		"pointsRecord": "积分消费记录",
-		"unusable": "设备上无法使用计费服务",
+		"unusable": "无法用计费服务",
 		"give": "赠"
   },
   "vip": {

pages/user/recharge/index.vue

@@ -223,9 +223,9 @@
 				getQuerySku()
 				// 初始化成功
 			} else {
-				console.log('init失败了');
+				console.log('init失败了/谷歌商店没有登录');
 				uni.showToast({
-					title: '设备上无法使用计费服务',
+					title: t('order.unusable'),
 					icon: 'fail'
 				})
 				// 初始化失败
@@ -251,7 +251,7 @@
 					getPayAll()
 					uni.hideLoading()
 				} else {
-					console.log('查询失败', e);
+					console.log('查询失败\网络连接失败', e);
 					uni.showToast({
 						title: t('global.networkConnectionError'),
 						icon: 'error'