From f9cad8d740f89c65e04b2917c99d2f245c3a4bc3 Mon Sep 17 00:00:00 2001
From: fuchao <2577131060@qq.com>
Date: Thu, 27 Nov 2025 14:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/user.ts           | 331 +++++++++++++++++++---------------
 pages.json                    |   8 +-
 pages/user/index.vue          |  28 ++-
 pages/user/recharge/index.vue | 189 +++++++++++++------
 4 files changed, 341 insertions(+), 215 deletions(-)

diff --git a/api/modules/user.ts b/api/modules/user.ts
index a411c7c..e808b46 100644
--- a/api/modules/user.ts
+++ b/api/modules/user.ts
@@ -1,14 +1,14 @@
 // api/modules/user.ts
 import { mainClient } from '@/api/clients/main'
 import type { IApiResponse } from '@/api/types'
-import type { 
-  IUserInfo, 
-  IVipInfo, 
-  IOrder, 
-  IVipPackage, 
-  ITransaction, 
-  IFeedbackForm,
-  IPageData
+import type {
+	IUserInfo,
+	IVipInfo,
+	IOrder,
+	IVipPackage,
+	ITransaction,
+	IFeedbackForm,
+	IPageData
 } from '@/types/user'
 import { SERVICE_MAP } from '@/api/config'
 
@@ -16,22 +16,22 @@ import { SERVICE_MAP } from '@/api/config'
  * 获取用户信息
  */
 export async function getUserInfo() {
-  const res = await mainClient.request<IApiResponse<{ user: IUserInfo }>>({
-    url: 'common/user/getUserInfo',
-    method: 'POST'
-  })
-  return res
+	const res = await mainClient.request<IApiResponse<{ user : IUserInfo }>>({
+		url: 'common/user/getUserInfo',
+		method: 'POST'
+	})
+	return res
 }
 
 /**
  * 获取VIP信息
  */
 export async function getVipInfo() {
-  const res = await mainClient.request<IApiResponse<{ vipInfo: IVipInfo }>>({
-    url: 'bookAbroad/home/getVipInfo',
-    method: 'POST'
-  })
-  return res
+	const res = await mainClient.request<IApiResponse<{ vipInfo : IVipInfo }>>({
+		url: 'bookAbroad/home/getVipInfo',
+		method: 'POST'
+	})
+	return res
 }
 
 /**
@@ -39,64 +39,64 @@ export async function getVipInfo() {
  * @param current 当前页码
  * @param limit 每页数量
  */
-export async function getOrderList(page: number, limit: number, orderStatus: string) {
-  const res = await mainClient.request<IApiResponse<{ orders: IPageData<IOrder> }>>({
-    url: 'common/buyOrder/commonBuyOrderList',
-    method: 'POST',
-    data: { page, limit, orderStatus, come: '10', userId: uni.getStorageSync('userInfo').id }
-  })
-  return res
+export async function getOrderList(page : number, limit : number, orderStatus : string) {
+	const res = await mainClient.request<IApiResponse<{ orders : IPageData<IOrder> }>>({
+		url: 'common/buyOrder/commonBuyOrderList',
+		method: 'POST',
+		data: { page, limit, orderStatus, come: '10', userId: uni.getStorageSync('userInfo').id }
+	})
+	return res
 }
 
 /**
  * 获取VIP套餐列表
  */
 export async function getVipPackages() {
-  const res = await mainClient.request<IApiResponse<{ sysDictDatas: IVipPackage[] }>>({
-    url: 'book/sysdictdata/getData',
-    method: 'POST',
-    data: { dictLabel: 'googleVip' }
-  })
-  return res
+	const res = await mainClient.request<IApiResponse<{ sysDictDatas : IVipPackage[] }>>({
+		url: 'book/sysdictdata/getData',
+		method: 'POST',
+		data: { dictLabel: 'googleVip' }
+	})
+	return res
 }
 
 /**
  * 创建订单
  * @param data 订单数据
  */
-export async function createOrder(data: any) {
-  const res = await mainClient.request<IApiResponse<{ orderSn: string }>>({
-    url: 'bookAbroad/order/placeOrder',
-    method: 'POST',
-    data
-  })
-  return res
+export async function createOrder(data : any) {
+	const res = await mainClient.request<IApiResponse<{ orderSn : string }>>({
+		url: 'bookAbroad/order/placeOrder',
+		method: 'POST',
+		data
+	})
+	return res
 }
 
 /**
  * 获取交易记录列表
  * @param userId 用户ID
  */
-export async function getTransactionList(userId: number) {
-  const res = await mainClient.request<IApiResponse<{ transactionDetailsList: ITransaction[] }>>({
-    url: 'common/transactionDetails/getTransactionDetailsList',
-    method: 'POST',
-    data: { userId }
-  })
-  return res
+export async function getTransactionList(userId : number) {
+	const res = await mainClient.request<IApiResponse<{ transactionDetailsList : ITransaction[] }>>({
+		url: 'common/transactionDetails/getTransactionDetailsList',
+		method: 'POST',
+		data: { userId }
+	})
+	return res
 }
 
 /**
  * 更新用户基本信息
  * @param data 用户信息
  */
-export async function updateUserInfo(data: Partial<IUserInfo>) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'book/user/update',
-    method: 'POST',
-    data
-  })
-  return res
+export async function updateUserInfo(data : Partial<IUserInfo>) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'book/user/update',
+		method: 'POST',
+		data
+	})
+	return res
 }
 
 /**
@@ -105,13 +105,13 @@ export async function updateUserInfo(data: Partial<IUserInfo>) {
  * @param email 邮箱地址
  * @param code 验证码
  */
-export async function updateEmail(id: number, email: string, code: string) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/user/updateUserEmail',
-    method: 'POST',
-    data: { id, email, code }
-  })
-  return res
+export async function updateEmail(id : number, email : string, code : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/user/updateUserEmail',
+		method: 'POST',
+		data: { id, email, code }
+	})
+	return res
 }
 
 /**
@@ -119,32 +119,32 @@ export async function updateEmail(id: number, email: string, code: string) {
  * @param id 用户ID
  * @param password 新密码
  */
-export async function updatePassword(id: number, password: string) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/user/setPasswordById',
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-    data: { id, password }
-  })
-  return res
+export async function updatePassword(id : number, password : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/user/setPasswordById',
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		data: { id, password }
+	})
+	return res
 }
 
 /**
  * 发送邮箱验证码
  * @param email 邮箱地址
  */
-export async function sendEmailCode(email: string) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/user/getMailCaptcha',
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-    data: { email }
-  })
-  return res
+export async function sendEmailCode(email : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/user/getMailCaptcha',
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		},
+		data: { email }
+	})
+	return res
 }
 
 /**
@@ -152,40 +152,40 @@ export async function sendEmailCode(email: string) {
  * @param filePath 本地文件路径
  * @returns 图片URL
  */
-export function uploadImage(filePath: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      url: `${SERVICE_MAP.MAIN}oss/fileoss`,
-      filePath,
-      name: 'file',
-      success: (res) => {
-        try {
-          const data = JSON.parse(res.data)
-          if (data.url) {
-            resolve(data.url)
-          } else {
-            reject(new Error('上传失败'))
-          }
-        } catch (error) {
-          reject(error)
-        }
-      },
-      fail: reject
-    })
-  })
+export function uploadImage(filePath : string) : Promise<string> {
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: `${SERVICE_MAP.MAIN}oss/fileoss`,
+			filePath,
+			name: 'file',
+			success: (res) => {
+				try {
+					const data = JSON.parse(res.data)
+					if (data.url) {
+						resolve(data.url)
+					} else {
+						reject(new Error('上传失败'))
+					}
+				} catch (error) {
+					reject(error)
+				}
+			},
+			fail: reject
+		})
+	})
 }
 
 /**
  * 提交问题反馈
  * @param data 反馈表单数据
  */
-export async function submitFeedback(data: IFeedbackForm) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/sysFeedback/addSysFeedback',
-    method: 'POST',
-    data
-  })
-  return res
+export async function submitFeedback(data : IFeedbackForm) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/sysFeedback/addSysFeedback',
+		method: 'POST',
+		data
+	})
+	return res
 }
 
 /**
@@ -194,26 +194,27 @@ export async function submitFeedback(data: IFeedbackForm) {
  * @param orderSn 订单号
  * @param productId 产品ID
  */
-export async function verifyGooglePay(purchaseToken: string, orderSn: string, productId: string) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'pay/googlepay/googleVerify',
-    method: 'POST',
-    data: { purchaseToken, orderSn, productId }
-  })
-  return res
+export async function verifyGooglePay(productId : number, purchaseToken : string, orderSn : string) {
+	console.log(productId, purchaseToken, orderSn);
+	const res = await mainClient.request<IApiResponse>({
+		url: 'pay/googlepay/googleVerify',
+		method: 'POST',
+		data: { productId, purchaseToken, orderSn }
+	})
+	return res
 }
 
 /**
  * 验证IAP支付
  * @param data 支付数据
  */
-export async function verifyIAP(data: any) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'Ipa/veri',
-    method: 'POST',
-    data
-  })
-  return res
+export async function verifyIAP(data : any) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'Ipa/veri',
+		method: 'POST',
+		data
+	})
+	return res
 }
 
 /**
@@ -221,48 +222,80 @@ export async function verifyIAP(data: any) {
  * @param type 固定值 point
  * @param qudao 支付类型 
  */
-export async function getBookBuyConfigList(type: string, qudao: string) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/bookBuyConfig/getBookBuyConfigList',
-    method: 'POST',
-    data: {type, qudao}
-  })
-  return res
+export async function getBookBuyConfigList(type : string, qudao : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/bookBuyConfig/getBookBuyConfigList',
+		method: 'POST',
+		data: { type, qudao }
+	})
+	return res
 }
 
 /**
  * 获取隐私协议
  * @param id 101众妙之门隐私政策
  */
-export async function getAgreement(id: string) {
+export async function getAgreement(id : string) {
 	console.log(id, 'id');
-  const res = await mainClient.request<IApiResponse>({
-    url: '/sys/agreement/getAgreement',
-    method: 'POST',
-    data: {id}
-  })
-  return res
+	const res = await mainClient.request<IApiResponse>({
+		url: '/sys/agreement/getAgreement',
+		method: 'POST',
+		data: { id }
+	})
+	return res
 }
 
 /**
  * 获取活动说明
  */
 export async function getActivityDescription() {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/bookBuyConfig/getRechargeActivity',
-    method: 'POST'
-  })
-  return res
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/bookBuyConfig/getRechargeActivity',
+		method: 'POST'
+	})
+	return res
 }
 
 /**
- * 获取充值列表
- */
-export async function getTransactionDetailsList(current: number, limit: number, userId: string,) {
-  const res = await mainClient.request<IApiResponse>({
-    url: 'common/transactionDetails/getTransactionDetailsList',
-    method: 'POST',
-		data: { current, limit,  userId, }
-  })
-  return res
+ * 充值记录列表
+ * @param current 当前页码
+ * @param limit 每页数量
+ * @param userId 用户id
+ * @return 
+ */ 
+export async function getTransactionDetailsList(current : number, limit : number, userId : string) {
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/transactionDetails/getTransactionDetailsList',
+		method: 'POST',
+		data: { current, limit, userId, }
+	})
+	return res
+}
+
+/**
+ * 获取订单编号
+ * @return 
+ */ 
+export async function getPlaceOrder(data: object) {
+	
+	const res = await mainClient.request<IApiResponse>({
+		url: '/book/buyOrder/placeOrder',
+		method: 'POST',
+		data: data
+	})
+	return res
+}
+
+/**
+ * 获取积分数据
+ * @return 
+ */ 
+export async function getPointsData(current : number, limit : number, userId : string,) {
+	
+	const res = await mainClient.request<IApiResponse>({
+		url: 'common/jfTransactionDetails/getJfTransactionDetailsList',
+		method: 'POST',
+		data: { current, limit, userId, }
+	})
+	return res
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a3e350b..a6d07df 100644
--- a/pages.json
+++ b/pages.json
@@ -79,7 +79,13 @@
 				"navigationBarTitleText": "%user.virtual%",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},{
+			"path": "pages/user/points/index",
+			"style": {
+				"navigationBarTitleText": "%user.points%",
+				"navigationStyle": "custom"
+			}
+		},{
 			"path": "pages/user/myBook/index",
 			"style": {
 				"navigationStyle": "custom",
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 7823570..8ca6958 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -47,14 +47,14 @@
 						<view class="assets_row">天医币</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
-					<view>
+					<view @click="goPointsList">
 						<view class="assets_row">积分</view>
 						<view>{{userInfo.jf ?? 1}}</view>
 					</view>
-					<view>
+					<!-- <view>
 						<view class="assets_row">优惠卷</view>
 						<view>0</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="chong_btn" @click="goRecharge">充 值</view>
 				<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
@@ -81,6 +81,7 @@
 	import type { IVipInfo } from '@/types/user'
 	import { useI18n } from 'vue-i18n'
 	import { getNotchHeight } from '@/utils/system'
+	import { onShow } from '@dcloudio/uni-app'
 
 	const { t } = useI18n()
 	const userStore = useUserStore()
@@ -147,12 +148,13 @@
 	 * 获取数据
 	 */
 	const getData = async () => {
+		console.log(userInfo.value);
 		try {
 			// 获取用户信息
 			const userRes = await getUserInfo()
-			console.log(userRes);
-			if (userRes.user) {
-				userStore.setUserInfo(userRes.user)
+			console.log(userRes, '-----userRes');
+			if (userRes.result) {
+				userStore.setUserInfo(userRes.result)
 			}
 
 			// 获取VIP信息
@@ -228,11 +230,21 @@
 		})
 	}
 	
+	/**
+	 * 跳转积分列表
+	 */
+	const goPointsList = () => {
+		uni.navigateTo({
+			url: '/pages/user/points/index'
+		})
+	}
 	
+	onShow(() => {
+		getData()
+	})
 	
 	onMounted(() => {
 		getPlatform()
-		getData()
 	})
 </script>
 
@@ -375,7 +387,7 @@
 		border-radius: 50rpx;
 		color: #fffbf6;
 		padding: 10rpx 32rpx;
-		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 200%);
+		background-color: #007bff;
 	}
 
 	.assets {
diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue
index 2146ae6..451cdb6 100644
--- a/pages/user/recharge/index.vue
+++ b/pages/user/recharge/index.vue
@@ -8,8 +8,8 @@
 				<view class="recharge_block" @click="chosPric(item)"
 					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
 					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
-					<view class="recharge_money">￥{{item.money}}</view>
-					<view>{{item.realMoney}}{{$t('order.virtualCoin')}}</view>
+					<view class="recharge_money">￥{{item.realMoney}}</view>
+					<view>{{item.money}}{{$t('order.virtualCoin')}}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>
@@ -23,25 +23,26 @@
 		<view class="cha_fangsh">
 			<view class="cf_title PM_font">{{$t('user.paymentMethod')}}</view>
 			<view class="cf_radio">
-				<radio-group v-for="item in iosPaylist" @click="choseType(item.id)">
+				<radio-group v-for="item in iosPaylist">
 					<view style="width: 100%">
 						<view :class="payType == item.id ? 'Tab_xf cf_xuanx' : 'cf_xuanx'">
 							<!-- <image class="pay_item_img" :src="item.imgUrl" mode="aspectFil">
 							</image> -->
 							<text>{{ item.title }}</text>
-							<radio :checked="payType === item.id"></radio>
+							<radio :checked="payType === item.id" @click="choseType(item.id)"></radio>
 						</view>
 					</view>
 				</radio-group>
 			</view>
 		</view>
 		<view class="agree_wo flexbox">
-			<radio-group class="agree" v-for="(item, index) in argee" :key="index" @click="radioCheck">
+			<radio-group class="agree" v-for="(item, index) in argee" :key="index">
 				<view>
-					<radio class="agreeRadio" :value="item.id" :checked="state" color="#007bff"></radio>
+					<radio class="agreeRadio" :value="item.id" :checked="state" @click="radioCheck" color="#007bff"></radio>
 				</view>
 			</radio-group>
-			<view>{{$t('order.readAgree')}}<span class="highlight" @click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
+			<view>{{$t('order.readAgree')}}<span class="highlight"
+					@click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
 		</view>
 		<view class="bottom-button-container">
 			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
@@ -61,12 +62,15 @@
 
 <script setup lang="ts">
 	import { ref, computed, onMounted, toRefs, reactive } from 'vue'
-  import { useI18n } from 'vue-i18n'
+	import { useI18n } from 'vue-i18n'
 	import { useMessage } from '@/uni_modules/wot-design-uni'
-	import { getBookBuyConfigList, getAgreement, getActivityDescription } from '@/api/modules/user'
-	// const googlePay = uni.requireNativePlugin("sn-googlepay5");
+	import { getBookBuyConfigList, getAgreement, getActivityDescription, verifyGooglePay, getPlaceOrder } from '@/api/modules/user'
+	import { onLogin } from '../../../../项目/nuttyreading-hw/config/login';
+	import { useUserStore } from '@/stores/user'
+	const googlePay = uni.requireNativePlugin("sn-googlepay5");
 	const { t } = useI18n()
 	const message = useMessage()
+	const userStore = useUserStore()
 	const payType = ref('1')
 	const iosPaylist = ref([
 		{
@@ -107,13 +111,16 @@
 
 	const remark = ref({})
 	const isConnected = ref(false)
+	const purchaseToken = ref()
+	// 订单编号
+	const orderSn = ref('')
 
 
-  /**
+	/**
 	 * 获取使用环境
 	 */
 	const getDevName = () => {
-		
+
 		if (uni.getSystemInfoSync().platform === "android") {
 			qudao.value = 'Google'
 			isAndroid.value = true;
@@ -125,9 +132,34 @@
 		getData()
 	}
 
+	/**
+	 * 获取订单编号
+	 */
+	const getPlaceOrderObj = async () => {
+		const {priceTypeId, realMoney, money} = toRefs(aloneItem.value)
+		const data = {
+			userId: userStore.userInfo.id, // 用户di
+			paymentMethod: '5', //支付方式4point 5google
+			orderMoney: money.value, //订单金额
+			realMoney: realMoney.value, //实际金额
+			come: '10', //订单来源 2医学吴门医述 10海外读书
+			orderType: 'point', //订单类型, point充值、order课程、书、vip 课vip、abroadVip 书vip、relearn 复读、trainingClass 培训班
+			productId: priceTypeId.value // 商品id
+		}
+		try {
+			const res = await getPlaceOrder(data)
+			orderSn.value = res.orderSn
+			console.log(orderSn.value, '获取订单号');
+			getGooglePay()
+		} catch (error) {
+			console.error('获取订单号失败', error)
+		}
+	}
+
+
 	// 点击金额
 	const chosPric = (item : any) => {
-		console.log(item,'金额每项');
+		console.log(item, '金额每项');
 		aloneItem.value = item;
 	};
 
@@ -136,7 +168,6 @@
 	 */
 	const radioCheck = () => {
 		state.value = !state.value
-		console.log('点击了', state.value);
 	}
 
 	/**
@@ -154,6 +185,7 @@
 			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
 			// 默认选择第一个金额
 			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
+			
 		} catch (error) {
 			console.error('获取订单列表失败:', error)
 		}
@@ -195,17 +227,17 @@
 		// payType.value = val;
 	}
 
-	const handleRecharge = () => {
-		if(!state.value){
+	const handleRecharge = async () => {
+		getPlaceOrderObj()
+		if (!state.value) {
 			uni.showToast({
-			  title: t('order.readAgreeServices'),
-			  icon: 'none'
+				title: t('order.readAgreeServices'),
+				icon: 'none'
 			})
 			return
 		}
-		uni.showLoading({ title: '加载中...' })
-		console.log('立即充值');
-		getGooglePay()
+		uni.showLoading({ title: '生成订单中...' })
+		
 	}
 
 	/**
@@ -213,59 +245,102 @@
 	 */
 	const getGooglePay = () => {
 		googlePay.init({
-		}, (e:any) => {
+		}, (e : any) => {
 			console.log('init', e);
 			if (e.code == 0) {
 				isConnected.value = true;
 				getQuerySku()
-				// 初始化成功
 			} else {
 				// 初始化失败
 				isConnected.value = false;
 			}
 		});
 	}
-	
+
 	/**
 	 * 查询sku
 	 */
-	const getQuerySku = () =>{
+	const getQuerySku = () => {
 		const id = aloneItem.value.priceTypeId
 		console.log(id, '获取每项');
 		googlePay.querySku(
-		  {
-		    inapp: [id], // 与subs二选一, 参数为商品ID（字符串）数组
-		  },
-		  (e:any) => {
-		    if (e.code == 0) {
-		      // 查询成功.
-					console.log('查询成功',e);
-		      // e.list; // 查询结果, array
-		    } else {
-					console.log('查询失败');
-		      // 查询失败
-		    }
-		  }
-		)
-		}
-	
-	const getPayAll = () =>{
-		googlePay.payAll(
-		  {
-		    productId: "", // 产品id
-		
-		  },
-		  (e) => {
-		    if (e.code == 0) {
-		      // 支付成功
-		      e.data; //支付结果, array [ {original:{ }, signature: ''} ]
-		    } else {
-		      // 支付失败
-		    }
-		  },
+			{
+				inapp: [id], // 与subs二选一, 参数为商品ID（字符串）数组
+			},
+			(e : any) => {
+				if (e.code == 0) {
+					// 查询成功.
+					console.log('querySku查询成功', e);
+					uni.hideLoading()
+					getPayAll()
+				} else {
+					console.log('查询失败', e);
+					// 查询失败
+				}
+			}
 		)
 	}
-	
+
+	/**
+	 * 发起支付
+	 */
+	const getPayAll = () => {
+		console.log(aloneItem.value.priceTypeId, orderSn.value, '发起支付传入产品id,订单id');
+		googlePay.payAll(
+			{
+				productId: aloneItem.value.priceTypeId, // 产品id
+				accountId: orderSn.value // 订单编号
+			},
+			(e : any) => {
+				if (e.code == 0) {
+					purchaseToken.value = e.data[0].original.purchaseToken
+					// 支付成功
+					console.log(e, 'payAll方法成功返参');
+					getConsume()
+				} else {
+					uni.showToast({ title: '支付失败', icon: 'success' })
+					console.log(e, 'e');
+					// 支付失败
+				}
+			},
+		)
+	}
+
+	/**
+	 * 消耗品 确认交易
+	 */
+	const getConsume = () => {
+		googlePay.consume(
+			{
+				purchaseToken: purchaseToken.value, // 来自支付结果的original.purchaseToken (或 original.token)
+			},
+			(e : any) => {
+				if (e.code == 0) {
+					console.log(e, '确认交易成功');
+					// 确认成功
+					googleVerify()
+				} else {
+					console.log(e, '确认交易失败');
+					// 确认失败
+				}
+			},
+		);
+	}
+
+	/**
+	 * 校验订单
+	 */
+	const googleVerify = async () => {
+		try {
+			const obj = await verifyGooglePay(aloneItem.value.priceTypeId, purchaseToken.value, orderSn.value)
+			uni.switchTab({
+				url: '/pages/user/index'
+			})
+			console.log(obj, '校验订单');
+		} catch (error) {
+			console.error('校验订单失败:', error)
+		}
+	}
 
 	onMounted(() => {
 		getDevName();
@@ -387,7 +462,7 @@
 				border-bottom: 1px solid #ededed;
 				display: flex;
 				justify-content: space-between;
-				align-items:center;
+				align-items: center;
 
 				image {
 					width: 40rpx;