From 37b9a4d02ac7028ab4dd72dae0e5d10fc6632252 Mon Sep 17 00:00:00 2001
From: fuchao <2577131060@qq.com>
Date: Wed, 26 Nov 2025 15:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/user.ts           | 12 +++++
 locale/en.json                | 10 +++-
 locale/zh-Hans.json           | 10 +++-
 pages/user/recharge/index.vue | 53 ++++++++++++--------
 pages/user/virtual/index.vue  | 94 +++++++++++++++++++----------------
 5 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/api/modules/user.ts b/api/modules/user.ts
index 8aef89d..a411c7c 100644
--- a/api/modules/user.ts
+++ b/api/modules/user.ts
@@ -253,4 +253,16 @@ export async function getActivityDescription() {
     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
 }
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index 46aff49..709af91 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -207,7 +207,8 @@
     "seasonCard": "Quarterly",
     "yearCard": "Yearly",
     "days": "days",
-    "selectPackage": "Please select a package"
+    "selectPackage": "Please select a package",
+		"consumptionRecord": "Consumption record"
   },
   "book": {
     "title": "My Books",
@@ -471,6 +472,11 @@
     "couponType0": "All Products",
     "couponType1": "Specific Courses",
     "couponType2": "Course Categories",
-    "couponCount": "{count} coupons"
+    "couponCount": "{count} coupons",
+		"rechargeConsumptionList": "Recharge and consumption records",
+		"rechargeAmount": "Recharge amount",
+		"valueAddedServices": "Value-added services",
+		"readAgree": "I have read and agreed",
+		"readAgreeServices": "Please read and agree to the value-added services first"
   }
 }
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 636e3ff..8354bd4 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -208,7 +208,8 @@
     "seasonCard": "季卡",
     "yearCard": "年卡",
     "days": "天",
-    "selectPackage": "请选择套餐"
+    "selectPackage": "请选择套餐",
+		"consumptionRecord": "消费记录"
   },
   "book": {
     "title": "我的书单",
@@ -472,6 +473,11 @@
     "couponType0": "全场通用",
     "couponType1": "指定课程可用",
     "couponType2": "指定课程品类可用",
-    "couponCount": "共 {count} 张"
+    "couponCount": "共 {count} 张",
+		"rechargeConsumptionList": "充值消费记录",
+		"rechargeAmount": "充值金额",
+		"valueAddedServices": "增值服务",
+		"readAgree": "我已阅读并同意",
+		"readAgreeServices": "请先阅读并同意增值服务"
   }
 }
diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue
index da3541a..2146ae6 100644
--- a/pages/user/recharge/index.vue
+++ b/pages/user/recharge/index.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="recharge-page">
 		<!-- 自定义导航栏 -->
-		<nav-bar :title="$t('user.recharge')"></nav-bar>
+		<nav-bar :title="$t('order.recharge')"></nav-bar>
 		<view class="block">
-			<view class="text">充值金额</view>
+			<view class="text">{{$t('order.rechargeAmount')}}</view>
 			<view class="recharge">
 				<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}}天医币</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>
@@ -21,30 +21,30 @@
 			<view v-html="remark.remark"></view>
 		</view>
 		<view class="cha_fangsh">
-			<view class="cf_title PM_font">支付方式</view>
+			<view class="cf_title PM_font">{{$t('user.paymentMethod')}}</view>
 			<view class="cf_radio">
-				<radio-group v-for="item in iosPaylist" @change="choseType(item.id)">
+				<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" style="float: right"></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" @change="radioCheck">
+			<radio-group class="agree" v-for="(item, index) in argee" :key="index" @click="radioCheck">
 				<view>
 					<radio class="agreeRadio" :value="item.id" :checked="state" color="#007bff"></radio>
 				</view>
 			</radio-group>
-			<view>我已阅读并同意<span class="highlight" @click="showAgreement">《增值服务协议》</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">立即充值</button>
+			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
 		</view>
 		<wd-popup v-model="agreemenState" position="bottom" :closeable="true">
 			<view class="agreement">
@@ -61,10 +61,11 @@
 
 <script setup lang="ts">
 	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 } from '@/api/modules/user'
-	const googlePay = uni.requireNativePlugin("sn-googlepay5");
+	// const googlePay = uni.requireNativePlugin("sn-googlepay5");
+	const { t } = useI18n()
 	const message = useMessage()
 	const payType = ref('1')
 	const iosPaylist = ref([
@@ -108,9 +109,11 @@
 	const isConnected = ref(false)
 
 
-
+  /**
+	 * 获取使用环境
+	 */
 	const getDevName = () => {
-		// 获取使用环境
+		
 		if (uni.getSystemInfoSync().platform === "android") {
 			qudao.value = 'Google'
 			isAndroid.value = true;
@@ -132,8 +135,8 @@
 	 * 勾选协议
 	 */
 	const radioCheck = () => {
-		console.log('点击了', state.value);
 		state.value = !state.value
+		console.log('点击了', state.value);
 	}
 
 	/**
@@ -151,7 +154,6 @@
 			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
 			// 默认选择第一个金额
 			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
-			getGooglePay()
 		} catch (error) {
 			console.error('获取订单列表失败:', error)
 		}
@@ -194,7 +196,16 @@
 	}
 
 	const handleRecharge = () => {
+		if(!state.value){
+			uni.showToast({
+			  title: t('order.readAgreeServices'),
+			  icon: 'none'
+			})
+			return
+		}
+		uni.showLoading({ title: '加载中...' })
 		console.log('立即充值');
+		getGooglePay()
 	}
 
 	/**
@@ -202,8 +213,6 @@
 	 */
 	const getGooglePay = () => {
 		googlePay.init({
-			// autoReconnect: true, // 是否自动重连(插件实现)
-			// enableAutoServiceReconnection: true, //是否自动重连（8.0+支持）
 		}, (e:any) => {
 			console.log('init', e);
 			if (e.code == 0) {
@@ -262,9 +271,6 @@
 		getDevName();
 		getActivityDescriptionData()
 		getAgreementData()
-		
-
-
 	})
 </script>
 
@@ -300,7 +306,7 @@
 
 			.recharge_money {
 				font-size: 30rpx;
-				margin-bottom: 30rpx;
+				margin-bottom: 10rpx;
 
 			}
 
@@ -376,9 +382,12 @@
 
 			.cf_xuanx {
 				font-size: 24rpx;
-				padding: 20rpx 0;
+				padding: 10rpx 0;
 				margin-bottom: 20rpx;
 				border-bottom: 1px solid #ededed;
+				display: flex;
+				justify-content: space-between;
+				align-items:center;
 
 				image {
 					width: 40rpx;
diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue
index 3e9cdef..eccb8e7 100644
--- a/pages/user/virtual/index.vue
+++ b/pages/user/virtual/index.vue
@@ -1,65 +1,46 @@
 <template>
-	<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="loadBookList">
+	<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="rechargeList" :default-page-size="10">
 		<template #top>
 			<!-- 自定义导航栏 -->
-			<nav-bar :title="$t('book.myBook')"></nav-bar>
+			<nav-bar :title="$t('user.consumptionRecord')"></nav-bar>
 		</template>
-
-		<!-- 充值列表 -->
-		<!-- <uni-icons fontFamily="CustomFont" :size="26">{{'\uebc6'}}</uni-icons> -->
-		
-		<view class="recharge-record">
-			<view><uni-icons type="right" size="30"></uni-icons></view>
-			<view class="go-gecharge">
-				立即充值
-				<uni-icons type="contact" size="30"></uni-icons>
+		<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">充值消费记录</view>
-			<view class="recharge-record-block" v-for="(item) in 5">
-				<view class="recharge-record-block-row">购买商品<text class="text">90</text></view>
-				<view class="time">2025-10-20</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>
-		<!-- <view v-if="(bookList && bookList.length > 0)" class="book-list">
-      <BookCard 
-        v-for="item in bookList" 
-        :key="item.id"
-        :book="item"
-      />
-    </view> -->
-
-		<!-- 空状态 -->
-		<!-- <view v-else-if="!loading && !firstLoad" class="empty-state">
-      <image src="@/static/null_img.png" mode="aspectFit" />
-      <text class="empty-text">{{ $t('book.nullText') }}</text>
-      <wd-button type="primary" @click="goToBuy">
-        {{ $t('book.choose') }}
-      </wd-button>
-    </view> -->
 	</z-paging>
 </template>
 
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { useI18n } from 'vue-i18n'
-	import { bookApi } from '@/api/modules/book'
-	import type { IBook } from '@/types/book'
-	import BookCard from '@/components/book/BookCard.vue'
+	import { useUserStore } from '@/stores/user'
+	import { getTransactionDetailsList } from '@/api/modules/user'
 
 	const { t } = useI18n()
 	const paging = ref<any>()
+	const userStore = useUserStore()
 
 	// 数据状态
-	const bookList = ref<IBook[]>([])
+	const bookList = ref([])
 	const loading = ref(false)
 	const firstLoad = ref(true)
 
-	// 加载书单列表
-	async function loadBookList(pageNo : number, pageSize : number) {
+	// 充值记录列表
+	async function rechargeList(pageNo : number, pageSize : number) {
+		const userId = userStore.userInfo.id
 		loading.value = true
 		try {
-			const res = await bookApi.getMyBooks(pageNo, pageSize)
-			paging.value.complete(res.page.records)
+			const res = await getTransactionDetailsList(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)
@@ -68,6 +49,15 @@
 			loading.value = false
 		}
 	}
+	
+	/**
+	 * 跳转充值页面
+	 */
+	const goRecharge = () => {
+		uni.navigateTo({
+			url: '/pages/user/recharge/index'
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -86,15 +76,16 @@
 			.go-gecharge{
 				//height: 100rpx;
 				background: linear-gradient(to right, #007bff, #17a2b8);
-				font-size: 40rpx;
+				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: 40rpx;
+				font-size: 30rpx;
 				padding-left:20rpx;
 				margin-bottom: 30rpx;
 				color: #007bff;
@@ -120,6 +111,25 @@
 				}
 			}
 		}
-
 	}
+	.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>
\ No newline at end of file