修复：上传丢失页面

revert 更新：谷歌支付

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: 'http://192.168.110.100:9300/pb/', // 张川川
-		MAIN: 'https://global.nuttyreading.com/', // 线上
+		// MAIN: 'https://global.nuttyreading.com/', // 线上
 		// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
 		// CDN: 'https://cdn-dev.example.com', // 暂时用不到
   },

api/interceptors/response.ts

@@ -34,7 +34,7 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
   }
 
   // 可能为字符串，尝试解析（原项目也做了类似处理）
-  let httpData: IApiResponse | string = res.data;
+  let httpData: IApiResponse | string = res.data as any;
   if (typeof httpData === 'string') {
     try {
       httpData = JSON.parse(httpData);
@@ -44,20 +44,19 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
   }
 
   // 规范化 message 字段
-  const message = (httpData as IApiResponse).msg || (httpData as IApiResponse).message || (httpData as IApiResponse).errMsg || '';
+  const message = (httpData as any).msg || (httpData as any).message || (httpData as any).errMsg || '';
 
-  const code = (httpData as IApiResponse).code;
+  // 成功判断：与原项目一致的条件
-
+  const successFlag = (httpData as any).success === true || (httpData as any).code === 0;
-  // 成功判断
-  const successFlag = (httpData as IApiResponse).success === true || code === 0;
 
   if (successFlag) {
-    // 返回原始 httpData
+    // 返回原始 httpData（与原项目 dataFactory 返回 Promise.resolve(httpData) 保持一致）
-    // 实际数据每个接口不同，调用者需根据实际情况取 .data 字段
+    // 但大多数调用者更关心 data 字段，这里返回整个 httpData，调用者可取 .data
     return Promise.resolve(httpData);
   }
 
-  // 登录失效或需要强制登录的一些 code
+  // 登录失效或需要强制登录的一些 code（与原项目一致）
+  const code = (httpData as any).code;
   if (code === '401' || code === 401) {
     // 触发登出流程
     handleAuthExpired();
@@ -65,7 +64,7 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
   }
 
   // 原项目还将 1000,1001,1100,402 等视作需要强制登录
-  if (code == 1000 || code == 1001 || code === 1100 || code === 402) {
+  if (code === '1000' || code === '1001' || code === 1000 || code === 1001 || code === 1100 || code === '402' || code === 402) {
     handleAuthExpired();
     return Promise.reject({ statusCode: 0, errMsg: message || t('global.loginExpired'), data: httpData });
   }

api/modules/user.ts

@@ -194,12 +194,11 @@ export async function submitFeedback(data : IFeedbackForm) {
  * @param orderSn 订单号
  * @param productId 产品ID
  */
-export async function verifyGooglePay(productId : number, purchaseToken : string, orderSn : string) {
+export async function verifyGooglePay(purchaseToken: string, orderSn: string, productId: string) {
-	console.log(productId, purchaseToken, orderSn);
   const res = await mainClient.request<IApiResponse>({
     url: 'pay/googlepay/googleVerify',
     method: 'POST',
-		data: { productId, purchaseToken, orderSn }
+    data: { purchaseToken, orderSn, productId }
   })
   return res
 }
@@ -257,13 +256,9 @@ export async function getActivityDescription() {
 }
 
 /**
- * 充值记录列表
+ * 获取充值列表
- * @param current 当前页码
- * @param limit 每页数量
- * @param userId 用户id
- * @return 
  */
-export async function getTransactionDetailsList(current : number, limit : number, userId : string) {
+export async function getTransactionDetailsList(current: number, limit: number, userId: string,) {
   const res = await mainClient.request<IApiResponse>({
     url: 'common/transactionDetails/getTransactionDetailsList',
     method: 'POST',
@@ -271,31 +266,3 @@ export async function getTransactionDetailsList(current : number, limit : number
   })
   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
-}

api/request.ts

@@ -8,7 +8,6 @@ import { t } from '@/utils/i18n'
 export function createRequestClient(cfg: ICreateClientConfig) {
   const baseURL = cfg.baseURL;
   const timeout = cfg.timeout ?? REQUEST_TIMEOUT;
-  let reqCount= 0
 
   async function request<T = any>(options: IRequestOptions): Promise<T> {
     // 组装 final options
@@ -24,18 +23,14 @@ export function createRequestClient(cfg: ICreateClientConfig) {
 
     // 全局处理请求 loading
     const loading = !cfg.loading ? true : cfg.loading  // 接口请求参数不传loading，默认显示loading
-    if (loading) {
+    loading && uni.showLoading()
-      uni.showLoading({ mask: true })
-      reqCount++
-    }
 
     return new Promise((resolve, reject) => {
       uni.request({
         ...intercepted,
         complete() {
           // 请求完成关闭 loading
-          loading && reqCount--
+          loading && uni.hideLoading()
-          reqCount <= 0 && uni.hideLoading()
         },
         success(res: any) {
           // 委托给响应拦截器处理

components/course/ChapterList.vue

@@ -259,8 +259,11 @@ const handleChapterClick = (chapter: IChapter) => {
   border-bottom-left-radius: 40rpx;
   
   .vip-badge {
-    display: inline-block;
+    position: absolute;
+    left: 0;
+    top: 0;
     font-size: 24rpx;
+		display: inline-block;
     background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
     color: #fff;
     padding: 10rpx 20rpx;

components/order/PayWay.vue

@@ -4,7 +4,7 @@
     <view class="payment-item">
       <view class="payment-left">
         <image src="/static/icon/pay_3.png" class="payment-icon" />
-        <text class="">{{ $t('global.coin') }}</text>
+        <text class="">{{ $t('order.virtualCoin') }}</text>
         <text class="text-[#7dc1f0]">
           ({{ $t('order.balance') }}：{{ peanutCoin || 0 }})
         </text>
@@ -25,12 +25,19 @@
         <view class="tip-title">{{ $t('order.paymentTipTitle') }}</view>
         <view class="tip-item">{{ $t('order.paymentTip1') }}</view>
         <view class="tip-item">
-          {{ $t('order.paymentTip2-1') }}
+          {{ $t('order.paymentTip2') }}
-          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">yilujiankangkefu</text>
+          <text class="link-text" @click="makePhoneCall('022-24142321')">022-24142321</text>
-          {{ $t('order.paymentTip2-2') }}
+        </view>
-          <text class="link-text" @click="copyToClipboard('AmazingLimited@163.com')">
+        <view class="tip-item">
-            AmazingLimited@163.com
+          {{ $t('order.paymentTip3') }}
+          <text class="link-text" @click="copyToClipboard('publisher@tmrjournals.com')">
+            publisher@tmrjournals.com
           </text>
+          {{ $t('order.paymentTip3_1') }}
+          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">
+            yilujiankangkefu
+          </text>
+          {{ $t('order.paymentTip3_2') }}
         </view>
       </view>
     </view>
@@ -46,15 +53,6 @@ const props = defineProps({
     default: 0
   }
 })
-
-/**
- * 跳转到充值页面
- */
-const goToRecharge = () => {
-  uni.navigateTo({
-    url: '/pages/user/wallet/recharge/index?source=order'
-  })
-}
 </script>
 
 <style lang="scss" scoped>

pages.json

@@ -79,12 +79,6 @@
 				"navigationBarTitleText": "%user.virtual%",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "pages/user/points/index",
-			"style": {
-				"navigationBarTitleText": "%user.points%",
-				"navigationStyle": "custom"
-			}
 		}, {
 			"path": "pages/user/myBook/index",
 			"style": {

pages/book/detail.vue

@@ -230,44 +230,71 @@ function initScrollHeight() {
 
 // 加载书籍详情
 async function loadBookInfo() {
+  try {
     const res = await bookApi.getBookInfo(bookId.value)
+    
+    if (res.bookInfo) {
       bookInfo.value = res.bookInfo
     }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
+}
 
 // 加载购买商品信息
 async function loadGoodsInfo() {
+  try {
     const res = await bookApi.getBookGoods(bookId.value)
+    if (res.code === 0) {
       goodsList.value = res.productList || []
     }
+  } catch (error) {
+    console.error('Failed to load goods info:', error)
+  }
+}
 
 // 加载统计数据
 async function loadBookCount() {
+  try {
     const res = await bookApi.getBookReadCount(bookId.value)
     if (res.code === 0) {
       readCount.value = res.readCount || 0
       listenCount.value = res.listenCount || 0
       buyCount.value = res.buyCount || 0
     }
+  } catch (error) {
+    console.error('Failed to load book count:', error)
+  }
 }
 
 // 加载评论
 async function loadComments() {
+  try {
     const res = await bookApi.getBookComments(bookId.value, 1, 10)
     if (res.commentsTree && res.commentsTree.length > 0) {
       commentList.value = res.commentsTree
     } else {
       nullText.value = t('common.data_null')
     }
+  } catch (error) {
+    nullText.value = t('common.data_null')
+    console.error('Failed to load comments:', error)
+  }
 }
 
 // 加载推荐书籍
 async function loadRecommendBooks() {
+  try {
     const res = await bookApi.getRecommendBook(bookId.value)
     if (res.bookList && res.bookList.length > 0) {
       relatedBooks.value = res.bookList
     } else {
       nullBookText.value = t('common.data_null')
     }
+  } catch (error) {
+    nullBookText.value = t('common.data_null')
+    console.error('Failed to load recommend books:', error)
+  }
 }
 
 // 显示购买弹窗

pages/book/index.vue

@@ -162,7 +162,7 @@
           >
             <image :src="item.images" />
             <text class="book-text">{{ item.name }}</text>
-            <text class="book-price">{{ item.minPrice }} {{ t('global.coin') }}</text>
+            <text class="book-price">{{ item.minPrice }} 天医币</text>
             <text v-if="formatStats(item)" class="book-flag">{{
               formatStats(item)
             }}</text>
@@ -219,16 +219,21 @@ const vipInfo = ref<IVipInfo | null>(null)
  * 获取VIP信息
  */
 const getVipInfo = async () => {
+  try {
     const res = await homeApi.getVipInfo()
     if (res.vipInfo) {
       vipInfo.value = res.vipInfo
     }
+  } catch (error) {
+    console.error('获取VIP信息失败:', error)
+  }
 }
 
 /**
  * 获取我的书单
  */
 const getMyBooks = async () => {
+  try {
     const res = await homeApi.getMyBooks(1, 10)
     if (res && res.code === 0) {
       showMyBooks.value = true
@@ -241,22 +246,30 @@ const getMyBooks = async () => {
         url: '/pages/login/login'
       })
     }
+  } catch (error) {
+    console.error('获取我的书单失败:', error)
+  }
 }
 
 /**
  * 获取推荐图书
  */
 const getRecommendBooks = async () => {
+  try {
     const res = await homeApi.getRecommendBooks()
     if (res.books && res.books.length > 0) {
       recommendBooksList.value = res.books
     }
+  } catch (error) {
+    console.error('获取推荐图书失败:', error)
+  }
 }
 
 /**
  * 获取活动标签列表
  */
 const getActivityLabels = async () => {
+  try {
     const res = await homeApi.getBookLabelList(1)
     showActivity.value = true
     if (res.lableList && res.lableList.length > 0) {
@@ -264,12 +277,16 @@ const getActivityLabels = async () => {
       // 默认加载第一个标签的图书列表
       await getBooksByLabel(res.lableList[0].id, 'activity')
     }
+  } catch (error) {
+    console.error('获取活动标签失败:', error)
+  }
 }
 
 /**
  * 获取分类标签列表
  */
 const getCategoryLabels = async () => {
+  try {
     const res = await homeApi.getBookLabelList(0)
     showCategory.value = true
     if (res.lableList && res.lableList.length > 0) {
@@ -277,12 +294,16 @@ const getCategoryLabels = async () => {
       // 默认加载第一个标签的二级标签
       await getSubLabels(res.lableList[0].id, 0)
     }
+  } catch (error) {
+    console.error('获取分类标签失败:', error)
+  }
 }
 
 /**
  * 获取二级标签列表
  */
 const getSubLabels = async (pid: number, index: number) => {
+  try {
     const res = await homeApi.getSubLabelList(pid)
     currentLevel1Index.value = index
     if (res.lableList && res.lableList.length > 0) {
@@ -295,6 +316,9 @@ const getSubLabels = async (pid: number, index: number) => {
       categoryLevel2List.value = []
       await getBooksByLabel(pid, 'category')
     }
+  } catch (error) {
+    console.error('获取二级标签失败:', error)
+  }
 }
 
 /**
@@ -304,6 +328,7 @@ const getBooksByLabel = async (
   labelId: number,
   type: 'activity' | 'category'
 ) => {
+  try {
     const res = await homeApi.getBooksByLabel(labelId)
     if (type === 'activity') {
       if (res.bookList && res.bookList.length > 0) {
@@ -318,6 +343,9 @@ const getBooksByLabel = async (
         categoryBookList.value = []
       }
     }
+  } catch (error) {
+    console.error('获取图书列表失败:', error)
+  }
 }
 
 /**

pages/book/listen/index.vue

@@ -117,12 +117,19 @@ function initScrollHeight() {
 
 // 加载书籍信息
 async function loadBookInfo() {
+  try {
     const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
       bookInfo.value = res.bookInfo
     }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
+}
 
 // 加载章节列表
 async function loadChapterList() {
+  try {
     const res = await bookApi.getBookChapter({
       bookId: bookId.value
     })
@@ -132,6 +139,10 @@ async function loadChapterList() {
     } else {
       nullText.value = t('common.data_null')
     }
+  } catch (error) {
+    nullText.value = t('common.data_null')
+    console.error('Failed to load chapter list:', error)
+  }
 }
 
 // 播放章节

pages/book/listen/player.vue

@@ -245,9 +245,15 @@ function initAudioContext() {
 
 // 加载书籍信息
 async function loadBookInfo() {
+  try {
     const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
       bookInfo.value = res.bookInfo
     }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
+}
 
 // 加载章节列表
 async function loadChapterList() {

pages/book/review.vue

@@ -164,10 +164,14 @@ function initScrollHeight() {
 
 // 加载书籍信息
 async function loadBookInfo() {
+  try {
     const res = await bookApi.getBookInfo(bookId.value)
     if (res.bookInfo) {
       bookInfo.value = res.bookInfo
     }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }
 
 // 加载评论列表
@@ -176,6 +180,7 @@ async function loadComments() {
     return
   }
   
+  try {
     const res = await bookApi.getBookComments(bookId.value, page.value.current, page.value.limit)
     
     commentsCount.value = res.commentsCount || 0
@@ -186,6 +191,10 @@ async function loadComments() {
     } else if (commentList.value.length === 0) {
       nullText.value = t('common.data_null')
     }
+  } catch (error) {
+    nullText.value = t('common.data_null')
+    console.error('Failed to load comments:', error)
+  }
 }
 
 // 加载更多
@@ -266,6 +275,7 @@ function handleEmj(i: any) {
 
 // 提交评论
 async function submitComment() {
+  try {
     const content = await getEditorContent()
     
     if (!content || content === '<p><br></p>') {
@@ -289,6 +299,9 @@ async function submitComment() {
       editorCtx.value?.clear()
       resetComments()
     }, 500)
+  } catch (error) {
+    console.error('Failed to submit comment:', error)
+  }
 }
 
 // 点赞/取消点赞
@@ -301,6 +314,7 @@ async function handleLike(comment: IComment) {
     return
   }
   
+  try {
     if (comment.isLike === 0) {
       await bookApi.likeComment(comment.id)
       uni.showToast({
@@ -320,6 +334,9 @@ async function handleLike(comment: IComment) {
     setTimeout(() => {
       resetComments()
     }, 200)
+  } catch (error) {
+    console.error('Failed to like comment:', error)
+  }
 }
 
 // 删除评论
@@ -331,6 +348,7 @@ function handleDelete(comment: IComment) {
     confirmText: t('common.confirm_text'),
     success: async (res) => {
       if (res.confirm) {
+        try {
           await bookApi.deleteComment(comment.id)
           uni.showToast({
             title: t('bookDetails.deleteSuccess'),
@@ -341,6 +359,9 @@ function handleDelete(comment: IComment) {
           setTimeout(() => {
             resetComments()
           }, 500)
+        } catch (error) {
+          console.error('Failed to delete comment:', error)
+        }
       }
     }
   })

pages/book/search.vue

@@ -70,9 +70,15 @@ onLoad((options: any) => {
  * 获取VIP信息
  */
 const getVipInfo = async () => {
+  try {
     const res = await homeApi.getVipInfo()
+    if (res.vipInfo) {
       vipInfo.value = res.vipInfo
     }
+  } catch (error) {
+    console.error('获取VIP信息失败:', error)
+  }
+}
 
 /**
  * 处理搜索
@@ -85,6 +91,7 @@ const handleSearch = async () => {
   loading.value = true
   isEmpty.value = false
 
+  try {
     const res = await homeApi.searchBooks({
       title: keyword.value.trim(),
       page: 1,
@@ -97,8 +104,14 @@ const handleSearch = async () => {
       searchResults.value = []
       isEmpty.value = true
     }
+  } catch (error) {
+    console.error('搜索失败:', error)
+    searchResults.value = []
+    isEmpty.value = true
+  } finally {
     loading.value = false
   }
+}
 
 /**
  * 处理清空

pages/course/details/chapter.vue

@@ -164,6 +164,7 @@ onLoad((options: any) => {
  * 加载章节详情
  */
 const loadChapterDetail = async () => {
+  try {    
     const res = await courseApi.getChapterDetail(chapterId.value)
     if (res.code === 0 && res.data) {
       chapterDetail.value = res.data.detail
@@ -178,6 +179,9 @@ const loadChapterDetail = async () => {
         }
       }
     }
+  } catch (error) {
+    console.error('加载章节详情失败:', error)
+  }
 }
 
 /**

pages/course/index.vue

@@ -257,6 +257,7 @@ const handleFirstLevelClick = (item: string) => {
  * 获取课程分类数据
  */
 const getMedicalTags = async () => {
+  try {
     const res = await courseSubjectClassificationApi.getCourseMedicalTree()
     if (res && res.code === 0) {
       if (res.labels && res.labels.length > 0) {
@@ -277,6 +278,9 @@ const getMedicalTags = async () => {
         curseTagList.value = []
       }
     }
+  } catch (error) {
+    console.error('获取医学课程分类失败:', error)
+  }
 }
 /**
  * 医学
@@ -305,10 +309,14 @@ const curseClick = (item: IMedicalTag, index: number) => {
  */
 const soulCateList = ref<IMedicalTag[]>([])
 const getSoulCateList = async () => {
+  try {
     const res = await courseSubjectClassificationApi.getCourseSoulTree()
     if (res.labels&&res.labels.length>0) {
 			soulCateList.value = res.labels;
 		}
+  } catch (error) {
+    console.error('获取心理学课程分类失败:', error)
+  }
 }
 
 /**
@@ -317,10 +325,14 @@ const getSoulCateList = async () => {
  */
 const sociologyCateList = ref<IMedicalTag[]>([])
 const getSociologyCateList = async () => {
+  try {
     const res = await courseSubjectClassificationApi.getCourseSociologyTree()
     if (res.labels&&res.labels.length>0) {
 			sociologyCateList.value = res.labels;
 		}
+  } catch (error) {
+    console.error('获取国学课程分类失败:', error)
+  }
 }
 
 /**
@@ -357,6 +369,7 @@ const learnList = ref<ICourse[]>([]) // 观看记录列表
  * 获取观看记录
  */
 const getLearnCourse = async () => {
+  try {
     const res = await courseApi.getUserLateCourseList()
     if (res && res.code === 0) {
       if (res.page && res.page.length > 0) {
@@ -365,6 +378,9 @@ const getLearnCourse = async () => {
         learnList.value = []
       }
     }
+  } catch (error) {
+    console.error('获取观看记录失败:', error)
+  }
 }
 
 // 新闻播报
@@ -373,6 +389,7 @@ const newsList = ref<INews[]>([]) // 新闻列表
  * 获取新闻列表
  */
 const getNewsList = async () => {
+  try {
     const res = await commonApi.getMessageList(0, 1, 0)
     if (res && res.code === 0) {
       if (res.messages && res.messages.length > 0) {
@@ -381,6 +398,9 @@ const getNewsList = async () => {
         newsList.value = []
       }
     }
+  } catch (error) {
+    console.error('获取新闻列表失败:', error)
+  }
 }
 /**
  * 新闻点击处理
@@ -403,6 +423,7 @@ const tryListenList = ref<ICourse[]>([]) // 试听课程列表
  * 获取试听课程列表
  */
 const getTryListenList = async () => {
+  try {
     const res = await courseApi.getMarketCourseList({
       page: 1,
       limit: 6,
@@ -415,6 +436,9 @@ const getTryListenList = async () => {
         tryListenList.value = []
       }
     }
+  } catch (error) {
+    console.error('获取试听课程失败:', error)
+  }
 }
 
 /**

pages/course/list/category.vue

@@ -52,6 +52,7 @@ const subCategoryList = ref<ICategory[]>([]) // 子级分类列表
  * 获取分类下的子级分类
  */
 const getSubCategoryList = async () => {
+  try {
     let res: any = null
     switch (subject.value) {
       case '医学':
@@ -73,6 +74,9 @@ const getSubCategoryList = async () => {
         radio_category_id.value = 0
       }
     }
+  } catch (error) {
+    console.error('获取分类下的子级分类失败:', error)
+  }
 }
 
 /**

pages/login/forget.vue

@@ -191,12 +191,16 @@ const getCode = async () => {
   if (!isEmailEmpty()) return
   if (!isEmailVerified(email.value)) return
 
+  try {
     await commonApi.sendMailCaptcha(email.value)
     uni.showToast({
       title: t('login.sendCodeSuccess'),
       icon: 'none'
     })
     getCodeState()
+  } catch (error) {
+    console.error('Send code error:', error)
+  }
 }
 
 /**
@@ -260,6 +264,7 @@ const onSubmit = async () => {
   if (!isConfirmPasswordEmpty()) return
   if (!isPasswordMatch()) return
 
+  try {
     await resetPassword(email.value, code.value, password.value)
     
     uni.showModal({
@@ -270,6 +275,9 @@ const onSubmit = async () => {
         uni.navigateBack()
       }
     })
+  } catch (error) {
+    console.error('Reset password error:', error)
+  }
 }
 </script>
 

pages/login/login.vue

@@ -285,8 +285,13 @@ const verifyCodeLogin = async () => {
 	
 	if (!isCodeEmpty()) return false
 	
+	try {
 		const res = await loginWithCode(email.value, code.value)
-  return res || null
+		return res
+	} catch (error) {
+		console.error('验证码登录失败:', error)
+		return null
+	}
 }
 // 密码登录
 const passwordLogin = async () => {
@@ -296,8 +301,13 @@ const passwordLogin = async () => {
 	
 	if (!isPasswordEmpty()) return false
 	
+	try {
 		const res = await loginWithPassword(phoneEmail.value, password.value)
-  return res || null
+		return res
+	} catch (error) {
+		console.error('密码登录失败:', error)
+		return null
+	}
 }
 // 提交登录
 const onSubmit = async () => {

pages/order/goodsConfirm.vue

@@ -26,8 +26,28 @@
           <!-- 商品信息 -->
           <view class="goods-info">
             <text class="goods-name">{{ item.productName }}</text>
-            <!-- 商品价格组件 -->
+            
-            <GoodsPrice :goods="item" />
+            <!-- 价格信息 -->
+            <view class="price-info">
+              <!-- VIP优惠价 -->
+              <!-- <view v-if="item.isVipPrice === 1 && item.vipPrice" class="price-row">
+                <text class="vip-price">￥{{ item.vipPrice.toFixed(2) }}</text>
+                <text class="vip-label">{{ $t('order.vipPriceLabel') }}</text>
+                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
+              </view> -->
+              
+              <!-- 活动价 -->
+              <!-- <view v-else-if="item.activityPrice && item.activityPrice > 0" class="price-row">
+                <text class="activity-price">￥{{ item.activityPrice.toFixed(2) }}</text>
+                <text class="activity-label">{{ $t('order.activityLabel') }}</text>
+                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
+              </view> -->
+              
+              <!-- 普通价格 -->
+              <view class="price-row">
+                <text class="normal-price">{{ item.price.toFixed(2) }} 天医币</text>
+              </view>
+            </view>
             
             <!-- 数量 -->
             <!-- <view class="quantity-row">
@@ -49,21 +69,26 @@
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { orderApi } from '@/api/modules/order'
-import type { IOrderGoods } from '@/types/order'
 import Confirm from '@/components/order/Confirm.vue';
-import GoodsPrice from '@/components/order/GoodsPrice.vue';
+import type { IOrderGoods } from '@/types/order'
 
 /**
  * 获取用户信息
  */
-const userInfo = ref({})
+const userInfo = ref(null)
 const getUserInfo = async () => {
+  try {
     const res = await orderApi.getUserInfo()
+    if (res.code === 0) {
       userInfo.value = res.result || {}
     }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
+}
 
 /**
  * 获取商品列表
@@ -71,12 +96,16 @@ const getUserInfo = async () => {
 const goodsIds = ref<string>('')
 const goodsList = ref<IOrderGoods[]>([])
 const getGoodsList = async () => {
+  try {
     // 获取商品详情
     const res = await orderApi.getShopProductListByIds(goodsIds.value)
     
-  if (res.shopProductList?.length > 0) {
+    if (res.code === 0 && res.shopProductList?.length > 0) {
       goodsList.value = res.shopProductList
     }
+  } catch (error) {
+    console.error('获取商品列表失败:', error)
+  }
 }
 
 /**
@@ -152,6 +181,43 @@ onLoad(async (options: any) => {
       overflow: hidden;
     }
     
+    .price-info {
+      .price-row {
+        display: flex;
+        align-items: baseline;
+        gap: 10rpx;
+        
+        .vip-price,
+        .activity-price {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #e97512;
+        }
+        
+        .normal-price {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+        }
+        
+        .vip-label {
+          font-size: 22rpx;
+          color: #fa2d12;
+        }
+        
+        .activity-label {
+          font-size: 22rpx;
+          color: #613804;
+        }
+        
+        .original-price {
+          font-size: 24rpx;
+          color: #999;
+          text-decoration: line-through;
+        }
+      }
+    }
+    
     .quantity-row {
       display: flex;
       align-items: center;

pages/user/index.vue

@@ -23,38 +23,41 @@
 		<!-- VIP订阅卡片 -->
 		<view class="vip-card-section">
 			<view class="vip-card">
-				用户VIP功能重写中。。。
+				<view class="vip-card-title">{{ $t('user.vip') }}</view>
-				<!-- <view v-if="vipInfo.id" class="vip-info">
+				<view class="vip-card-content">
-          <text class="label">{{ $t('user.vip') }}</text>
+					<view class="vip-item-list">
-          <text class="value">{{ vipInfo.endTime ? vipInfo.endTime.split(' ')[0] : '' }}</text>
+						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-else>办理课程VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.renewal') }}</wd-button>
+					<wd-button v-else plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+				</view>
+				<view class="vip-card-content">
+					<view class="vip-item-list">
+						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-else>办理电子书VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="!vipInfoEbook.length" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
 				</view>
-        <wd-button 
-          v-else 
-          type="success"
-          size="small"
-          @click="goSubscribe"
-        >
-          {{ $t('user.subscribe') }}
-        </wd-button> -->
 			</view>
 		</view>
 
 		<!-- 我的资产 -->
-		<view class="vip-card-section wallet-section">
+		<view class="assets-card-section wallet-section">
-			<view class="vip-card wallet_l">
+			<view class="assets-card wallet_l">
 				<view class="assets">
 					<view @click="goVirtualList">
 						<view class="assets_row">{{ t('global.coin') }}</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
-					<view @click="goPointsList">
+					<view>
 						<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>
@@ -77,14 +80,15 @@
 <script setup lang="ts">
 	import { ref, computed, onMounted } from 'vue'
 	import { useUserStore } from '@/stores/user'
+	import { useSysStore } from '@/stores/sys'
 	import { getUserInfo, getVipInfo } from '@/api/modules/user'
 	import type { IVipInfo } from '@/types/user'
-	import { useI18n } from 'vue-i18n'
 	import { getNotchHeight } from '@/utils/system'
-	import { onShow } from '@dcloudio/uni-app'
+	import { parseTime } from '@/utils/index'
+	import { t } from '@/utils/i18n'
 
-	const { t } = useI18n()
 	const userStore = useUserStore()
+	const sysStore = useSysStore()
 
 	// 默认头像
 	const defaultAvatar = '/static/home_icon.png'
@@ -93,11 +97,11 @@
 	const userInfo = computed(() => userStore.userInfo)
 
 	// VIP信息
-	const vipInfo = ref<IVipInfo>({
+	const vipInfo = computed(() => userStore.userVips)
-		id: 0,
+	const vipInfoEbook = computed(() => userStore.userEbookVip)
-		endTime: '',
+		
-		vipType: 0
+	// VIP类型字典
-	})
+	const vipTypeDict = sysStore.vipTypeDict
 
 	// 平台信息
 	const platform = ref('')
@@ -148,21 +152,12 @@
 	 * 获取数据
 	 */
 	const getData = async () => {
-		console.log(userInfo.value);
-		try {
 		// 获取用户信息
-			const userRes = await getUserInfo()
+		const userInfoRes = await getUserInfo()
-			console.log(userRes, '-----userRes');
+		if (userInfoRes.result) {
-			if (userRes.result) {
+			userStore.setUserInfo(userInfoRes.result)
-				userStore.setUserInfo(userRes.result)
 		}
-
-		// 获取VIP信息
-		const vipRes = await getVipInfo()
-		if (vipRes.vipInfo) {
-			vipInfo.value = vipRes.vipInfo
 	}
-	}}
 
 	/**
 	 * 跳转到设置页面
@@ -187,7 +182,7 @@
 	 */
 	const goSubscribe = () => {
 		uni.navigateTo({
-			url: '/pages/user/wallet/index'
+			url: '/pages/vip/book'
 		})
 	}
 
@@ -227,21 +222,11 @@
 		})
 	}
 	
-	/**
-	 * 跳转积分列表
-	 */
-	const goPointsList = () => {
-		uni.navigateTo({
-			url: '/pages/user/points/index'
-		})
-	}
 	
-	onShow(() => {
-		getData()
-	})
 	
 	onMounted(() => {
 		getPlatform()
+		getData()
 	})
 </script>
 
@@ -311,12 +296,47 @@
 		}
 	}
 
+	// vip 卡片
 	.vip-card-section {
 		padding: 0 20rpx;
 		margin-bottom: 20rpx;
+
+		.vip-card {
+			background: linear-gradient(135deg, #3E7EF5 0%, #9134EA 100%);
+			border-radius: 15rpx;
+			padding: 26rpx 30rpx 10rpx;
+			box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+			
+			.vip-card-title {
+				font-size: 32rpx;
+				color: #fff;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+			
+			.vip-card-content {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				background-color: rgba(255, 255, 255, 0.2);
+				border-radius: 8px;
+				padding: 30rpx;
+				margin-bottom: 20rpx;
+			}
+			.vip-item-list {
+				font-size: 28rpx;
+				color: #fff;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.assets-card-section {
+		padding: 0 20rpx;
+		margin-bottom: 20rpx;
 	}
 
-	.vip-card {
+	.assets-card {
 		background: #fff;
 		border-radius: 15rpx;
 		padding: 40rpx;
@@ -325,7 +345,7 @@
 		justify-content: space-between;
 		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
 
-		.vip-info {
+		.assets-info {
 			text-align: center;
 
 			.label {
@@ -384,7 +404,7 @@
 		border-radius: 50rpx;
 		color: #fffbf6;
 		padding: 10rpx 32rpx;
-		background-color: #007bff;
+		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 200%);
 	}
 
 	.assets {

pages/user/order/index.vue

@@ -27,7 +27,7 @@
         <ProductInfo v-if="order.orderType === 'abroadBook'" :data="order.bookEntity" :type="order.orderType" />
         <ProductInfo v-if="order.orderType === 'vip'" :data="order.vipBuyConfigEntity" :type="order.orderType" />
         <!-- 三种订单类型商品信息 end -->
-        <view class="order-item-total-price">实付款：{{ order.orderMoney }} {{ t('global.coin') }}</view>
+        <view class="order-item-total-price">实付款：{{ order.orderMoney }} 天医币</view>
 
         <template #footer>
           <view>

pages/user/points/index.vue

@@ -1,135 +0,0 @@
-<template>
-	<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="pointsList" :default-page-size="10">
-		<template #top>
-			<!-- 自定义导航栏 -->
-			<nav-bar :title="$t('user.consumptionRecord')"></nav-bar>
-		</template>
-		<view class="recharge-record" v-if="(bookList && bookList.length > 0)">
-			<view class="go-gecharge" @click="goRecharge">
-				<view>{{$t('order.recharge')}}</view>
-				<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
-			</view>
-			<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
-			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
-				<view class="recharge-record-block-row">{{item.orderType}}<text class="text">{{item.changeAmount}}</text></view>
-				<view class="time">{{item.createTime}}</view>
-			</view>
-		</view>
-	</z-paging>
-</template>
-
-<script setup lang="ts">
-	import { ref } from 'vue'
-	import { useI18n } from 'vue-i18n'
-	import { useUserStore } from '@/stores/user'
-	import { getPointsData } from '@/api/modules/user'
-
-	const { t } = useI18n()
-	const paging = ref<any>()
-	const userStore = useUserStore()
-
-	// 数据状态
-	const bookList = ref([])
-	const loading = ref(false)
-	const firstLoad = ref(true)
-
-	// 充值记录列表
-	async function pointsList(pageNo : number, pageSize : number) {
-		const userId = userStore.userInfo.id
-		loading.value = true
-		try {
-			const res = await getPointsData(pageNo, pageSize, userId)
-			console.log(res, 'res');
-			paging.value.complete(res.transactionDetailsList.records)
-		} catch (error) {
-			paging.value.complete(false)
-			console.error('Failed to load book list:', error)
-		} finally {
-			firstLoad.value = false
-			loading.value = false
-		}
-	}
-	
-	/**
-	 * 跳转充值页面
-	 */
-	const goRecharge = () => {
-		uni.navigateTo({
-			url: '/pages/user/recharge/index'
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.my-book-page {
-		background: #f7faf9;
-		min-height: 100vh;
-
-		.recharge-record {
-			background: #fff;
-			border-radius: 15rpx;
-			overflow: hidden;
-			box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-			// padding: 20rpx;
-			margin: 20rpx;
-			
-			.go-gecharge{
-				//height: 100rpx;
-				background: linear-gradient(to right, #007bff, #17a2b8);
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #fff;
-				padding: 20rpx;
-				margin-bottom: 20rpx;
-				display: flex;justify-content:space-between;align-items:center
-			}
-			
-			.title {
-				font-size: 30rpx;
-				padding-left:20rpx;
-				margin-bottom: 30rpx;
-				color: #007bff;
-				font-weight: bold;
-			}
-
-			.recharge-record-block {
-				border-bottom: 1px solid #e0e0e0;
-				padding: 20rpx;
-				
-				.time{
-					font-size: 20rpx;
-				}
-
-				.recharge-record-block-row {
-					display: flex;
-					justify-content: space-between;
-					margin-bottom: 20rpx;
-					
-					.text{
-						color: #007bff;
-					}
-				}
-			}
-		}
-	}
-	.empty-state {
-	  display: flex;
-	  flex-direction: column;
-	  align-items: center;
-	  justify-content: center;
-	  padding-top: 200rpx;
-	  
-	  image {
-	    width: 400rpx;
-	    height: 300rpx;
-	    margin-bottom: 40rpx;
-	  }
-	  
-	  .empty-text {
-	    font-size: 28rpx;
-	    color: #999;
-	    margin-bottom: 50rpx;
-	  }
-	}
-	
-</style>

pages/user/profile/index.vue

@@ -199,11 +199,15 @@ const avatarUrl = ref('')
  */
 const userInfo = ref<any>({}) // 用户信息
 const getData = async () => {
+  try {
     const res = await getUserInfo()
     if (res.result) {
       userStore.setUserInfo(res.result)
       userInfo.value = res.result
     }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
 }
 
 /**
@@ -320,12 +324,16 @@ const sendCode = async () => {
     return
   }
 
+  try {
     await sendEmailCode(editForm.value.email)
     uni.showToast({
       title: t('user.sendCodeSuccess'),
       icon: 'none'
     })
     startCountdown()
+  } catch (error) {
+    console.error('发送验证码失败:', error)
+  }
 }
 
 /**
@@ -390,6 +398,7 @@ const checkPasswordStrength = () => {
 const handleSubmit = async () => {
   const key = currentField.value?.key
   
+  try {
     // 构建更新数据对象
     let updateData: any = Object.assign({}, userInfo.value)
 
@@ -472,6 +481,9 @@ const handleSubmit = async () => {
     setTimeout(() => {
       getData()
     }, 500)
+  } catch (error) {
+    console.error('更新失败:', error)
+  }
 }
 
 /**

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.realMoney}}</view>
+					<view class="recharge_money">￥{{item.money}}</view>
-					<view>{{item.money}}{{$t('order.virtualCoin')}}</view>
+					<view>{{item.realMoney}}{{$t('order.virtualCoin')}}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>
@@ -23,26 +23,25 @@
 		<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">
+				<radio-group v-for="item in iosPaylist" @click="choseType(item.id)">
 					<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" @click="choseType(item.id)"></radio>
+							<radio :checked="payType === 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">
+			<radio-group class="agree" v-for="(item, index) in argee" :key="index" @click="radioCheck">
 				<view>
-					<radio class="agreeRadio" :value="item.id" :checked="state" @click="radioCheck" color="#007bff"></radio>
+					<radio class="agreeRadio" :value="item.id" :checked="state" color="#007bff"></radio>
 				</view>
 			</radio-group>
-			<view>{{$t('order.readAgree')}}<span class="highlight"
+			<view>{{$t('order.readAgree')}}<span class="highlight" @click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
-					@click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
 		</view>
 		<view class="bottom-button-container">
 			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
@@ -64,13 +63,10 @@
 	import { ref, computed, onMounted, toRefs, reactive } from 'vue'
   import { useI18n } from 'vue-i18n'
 	import { useMessage } from '@/uni_modules/wot-design-uni'
-	import { getBookBuyConfigList, getAgreement, getActivityDescription, verifyGooglePay, getPlaceOrder } from '@/api/modules/user'
+	import { getBookBuyConfigList, getAgreement, getActivityDescription } from '@/api/modules/user'
-	import { onLogin } from '../../../../项目/nuttyreading-hw/config/login';
+	// const googlePay = uni.requireNativePlugin("sn-googlepay5");
-	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([
 		{
@@ -111,9 +107,6 @@
 
 	const remark = ref({})
 	const isConnected = ref(false)
-	const purchaseToken = ref()
-	// 订单编号
-	const orderSn = ref('')
 
 
   /**
@@ -132,31 +125,6 @@
 		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,'金额每项');
@@ -168,6 +136,7 @@
 	 */
 	const radioCheck = () => {
 		state.value = !state.value
+		console.log('点击了', state.value);
 	}
 
 	/**
@@ -185,7 +154,6 @@
 			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
 			// 默认选择第一个金额
 			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
-			
 		} catch (error) {
 			console.error('获取订单列表失败:', error)
 		}
@@ -227,8 +195,7 @@
 		// payType.value = val;
 	}
 
-	const handleRecharge = async () => {
+	const handleRecharge = () => {
-		getPlaceOrderObj()
 		if(!state.value){
 			uni.showToast({
 			  title: t('order.readAgreeServices'),
@@ -236,8 +203,9 @@
 			})
 			return
 		}
-		uni.showLoading({ title: '生成订单中...' })
+		uni.showLoading({ title: '加载中...' })
-		
+		console.log('立即充值');
+		getGooglePay()
 	}
 
 	/**
@@ -250,6 +218,7 @@
 			if (e.code == 0) {
 				isConnected.value = true;
 				getQuerySku()
+				// 初始化成功
 			} else {
 				// 初始化失败
 				isConnected.value = false;
@@ -270,77 +239,33 @@
 		  (e:any) => {
 		    if (e.code == 0) {
 		      // 查询成功.
-					console.log('querySku查询成功', e);
+					console.log('查询成功',e);
-					uni.hideLoading()
+		      // e.list; // 查询结果, array
-					getPayAll()
 		    } else {
-					console.log('查询失败', e);
+					console.log('查询失败');
 		      // 查询失败
 		    }
 		  }
 		)
 		}
 	
-	/**
-	 * 发起支付
-	 */
 	const getPayAll = () =>{
-		console.log(aloneItem.value.priceTypeId, orderSn.value, '发起支付传入产品id,订单id');
 		googlePay.payAll(
 		  {
-				productId: aloneItem.value.priceTypeId, // 产品id
+		    productId: "", // 产品id
-				accountId: orderSn.value // 订单编号
+		
 		  },
-			(e : any) => {
+		  (e) => {
 		    if (e.code == 0) {
-					purchaseToken.value = e.data[0].original.purchaseToken
 		      // 支付成功
-					console.log(e, 'payAll方法成功返参');
+		      e.data; //支付结果, array [ {original:{ }, signature: ''} ]
-					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();