diff --git a/pages/account/ledger.vue b/pages/account/ledger.vue
index 1664ee5..d47a8f7 100644
--- a/pages/account/ledger.vue
+++ b/pages/account/ledger.vue
@@ -57,7 +57,7 @@
 				<view v-for="(item, index) in recordList" :key="index" class="record-item" @tap="viewDetail(item)">
 					<view class="record-header">
 						<!-- <text class="record-id">{{ item.senderName }}</text> -->
-						<text class="record-id">{{ item.billCode.split("@")[0] }}</text>
+						<text class="record-id">{{ item.billCode }}</text>
 						<view class="record-amount">
 							<text class="amount-value" :style="{ color: getColor(item.changeBalance) }">
 								{{item.changeBalance>0?'+':''}}{{ item.changeBalance }} (KIP)
diff --git a/pages/account/transactionRecord.vue b/pages/account/transactionRecord.vue
index ee6d155..56b874d 100644
--- a/pages/account/transactionRecord.vue
+++ b/pages/account/transactionRecord.vue
@@ -43,7 +43,7 @@
 				<view v-for="(item, index) in [...recordList]" :key="index" class="record-item" @tap="viewDetail(item)">
 					<view class="record-header">
 						<!-- <text class="record-id">{{ item.senderName }}</text> -->
-						<text class="record-id">{{ item.remark }}</text>
+						<text class="record-id">{{ item.billCode }}</text>
 						<view class="record-amount">
 							<text class="amount-value" :style="{ color: getColor(item.changeBalance) }">
 								{{item.changeBalance>0?'+':''}}{{ item.changeBalance }} (KIP)
@@ -51,7 +51,7 @@
 						</view>
 					</view>
 					<view class="record-content">
-						<text class="record-time">{{ item.time }}</text>
+						<text class="record-time">{{ item.timeFormat }}</text>
 						<uni-tag :inverted="true" :text="item.typeStr" />
 						<!-- <uni-tag :inverted="true" :text="item.typeStr" :type="getStatusText(item.type)" /> -->
 					</view>
@@ -65,19 +65,19 @@
 			</view>
 
 			<!-- 加载状态 -->
-			<view v-if="isLoading && recordList.length > 0" class="loading-more">
+			<!-- <view v-if="isLoading && recordList.length > 0" class="loading-more">
 				<text>{{this.$languageData.settings.loading}}</text>
-			</view>
+			</view> -->
 		</scroll-view>
 
-		<loading ref="loading" :custom="false" :shadeClick="false" :type="1" />
+		<!-- <loading ref="loading" :custom="false" :shadeClick="false" :type="1" /> -->
 	</view>
 </template>
 
 
 <script>
 	import {
-		getRecordList
+		getTransRecord
 	} from '@/api/account/transactionRecord.js'
 	import {
 		getCurrentDate
@@ -87,14 +87,7 @@
 			return {
 				searchText: '',
 				selectedDate: '',
-				recordList: [{
-						remark: 'salary',
-						changeBalance: 4106.32,
-						time: "2025/05/01",
-						typeStr: this.$languageData.settings.reci
-					},
-					{remark: 'McDonald\'s', changeBalance: -106.32, time: "2025/05/11", typeStr: this.$languageData.settings.pay},
-				],
+				recordList: [],
 				isLoading: false,
 				isRefreshing: false,
 				page: 1,
@@ -106,7 +99,7 @@
 					phonenumber: '',
 					key: '',
 					key2: getCurrentDate(), //获取当前年月,
-					type: "1"
+					type: ""
 				},
 			}
 		},
@@ -126,7 +119,6 @@
 					console.error("解析 JSON 失败：", error);
 				}
 			}
-			this.selectRecordList();
 		},
 		methods: {
 			downloadEmptyFile() {
@@ -162,19 +154,29 @@
 				}
 			},
 			selectRecordList() {
-				if (false) {
-					this.$nextTick(() => {
-						this.$refs.loading.open();
-					})
-					getRecordList(this.params).then(res => {
-						this.recordList = res.rows
-						setTimeout(() => {
-							this.$refs.loading.close();
-						}, 700)
-					}).catch(e => {
-						this.$refs.loading.close();
+				getTransRecord(this.params).then(res => {
+					this.recordList = res.data;
+					this.recordList.forEach(item => {
+						item.billCode = item.billCode.split("@")[0];
+						if (item.billCode == "BTR") {
+							item.billCode = this.$languageData.tmp.transferAccounts; //转账
+						} else if (item.billCode == "BPY") {
+							item.billCode = this.$languageData.tmp.proxyPayment; //代缴
+						} else if (item.billCode == "BPT") {
+							item.billCode = this.$languageData.tmp.payment; //付款
+						} else if (item.billCode == "BRT") {
+							item.billCode = this.$languageData.tmp.receivePayment; //收款
+						} else if (item.billCode == "BWL") {
+							item.billCode = this.$languageData.tmp.withdrawal; //提现
+						} else if (item.billCode == "BRE") {
+							item.billCode = this.$languageData.tmp.recharge; //充值
+						} else {
+							item.billCode = this.$languageData.tmp.other; //其他
+						}
 					})
-				}
+				}).catch(e => {
+					//this.$refs.loading.close();
+				})
 			},
 			mockrecordList() {
 				const statuses = ['success', 'pending', 'failed']
@@ -244,6 +246,7 @@
 			uni.setNavigationBarTitle({
 				title: this.$languageData.navBar.transactionRecord
 			});
+			this.selectRecordList();
 		},
 		watch: {
 			languageData() {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index f3551b4..afa537b 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,730 +1,738 @@
 <template>
-  <view class="app-container" style="background-color: white;">
-    <view :style="{ height: statusBarHeight + 'px' }"></view>
-    <!-- 顶部hello -->
-    <view style="display: flex; height: 65px; justify-content: space-between; align-items: center; padding: 12px;">
-      <view @click="goUser" style="display: flex; align-items: center; width: 100%;">
-        <view style="margin-right: 12px;">
-          <u-avatar size="40" :src="user.avatar"></u-avatar>
-        </view>
-        <view style="display: flex; flex-direction: column;">
-          <p style="font-size: 15px; margin-bottom: 5px;">{{languageData.home.hello}}，
-            <span v-if="isLogin" style="cursor: pointerl">
+	<view class="app-container" style="background-color: white;">
+		<view :style="{ height: statusBarHeight + 'px' }"></view>
+		<!-- 顶部hello -->
+		<view style="display: flex; height: 65px; justify-content: space-between; align-items: center; padding: 12px;">
+			<view @click="goUser" style="display: flex; align-items: center; width: 100%;">
+				<view style="margin-right: 12px;">
+					<u-avatar size="40" :src="user.avatar"></u-avatar>
+				</view>
+				<view style="display: flex; flex-direction: column;">
+					<p style="font-size: 15px; margin-bottom: 5px;">{{languageData.home.hello}}，
+						<span v-if="isLogin" style="cursor: pointerl">
 							<span v-if="user.name">{{ user.nickName }}</span>
 							<span v-else><a href="#"
-                              @click.stop.prevent="goAuth">{{ languageData.home.need2Auth }}</a></span>
+									@click.stop.prevent="goAuth">{{ languageData.home.need2Auth }}</a></span>
 						</span>
-            <span v-else>{{languageData.home.guest}}</span>
-          </p>
-          <p style="color: #8E8E8E; font-size: 11px;">{{languageData.home.bless}}~</p>
-        </view>
-      </view>
-
-      <view class="" style="position: relative;margin-right: 40rpx;" @click.stop="navigatetoMessage()">
-        <u-icon name="bell" size="25"></u-icon>
-        <view>
-          <u-badge type="error" absolute :offset="[2,0]" isDot></u-badge>
-        </view>
-      </view>
-      <view class="">
-        <u--image :showLoading="true" :src="languageIconUrl" width="40px" height="40px" shape="circle"
-                  @click="languageShow = true"></u--image>
-      </view>
-    </view>
-    <!-- 账户卡片 -->
-    <view>
-      <view class="account-card">
-        <view class="account-info">
-          <view
-              style="border-radius:12px; padding: 15px; background: radial-gradient(ellipse at center, #134F9B 35%, rgba(19, 79, 155, 0)) 100%; ">
-            <text class="balance-label" style="font-size: 12px;">{{languageData.home.accountBalance}}</text>
-            <view class="balance-amount" style="font-size: 26px;" @click.stop="navigate('wallet')">
-              {{ formatNumber(userAmount) }}&nbsp;KIP
-            </view>
-          </view>
-          <view class="button-group">
-            <uni-button size="mini" class="action-button" @click.stop="navigate('topUp')">
-              {{languageData.home.recharge}}
-            </uni-button>
-            <uni-button style="padding: 0 10px;" size="mini" class="action-button"
-                        @click.stop="navigate('transactionRecord')">
-              {{languageData.home.billQuery}}
-            </uni-button>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 主要内容区域 -->
-    <view class="content-area">
-      <!-- 功能区域 -->
-      <view class="features-grid">
-        <view class="feature-item" v-for="(item, index) in features" :key="index"
-              @click.stop="navigate(item.path)">
-          <view class="feature-icon">
-            <uni-icons :type="item.icon" size="24" color="#1B6EF3" />
-          </view>
-          <view class="feature-name">
-            <text>{{ item.name }}</text>
-          </view>
-        </view>
-      </view>
-
-      <!-- 广告banner -->
-      <view style="margin-top: 17rpx;">
-        <u-notice-bar color="#1B6EF3" bgColor="rgba(171, 146, 231, 0.1)"
-                      :text="languageData.home.ads"></u-notice-bar>
-      </view>
-
-      <view
-          style="width: 100%; top: 13; padding: 15px; display: grid; grid-template-columns: repeat(4, 1fr); gap: 42rpx 32rpx; background-color: white; height: 250px; margin-top: 20rpx; border-radius: 12px;">
-        <view class="feature-item" @click="navigateTo(item.url)" v-for="(item, index) in funItem" :key="index">
-          <view class="feature-icon">
-            <!-- <u-avatar style="text-align: center;" color font-size="10" text="Coming soon"></u-avatar> -->
-            <view v-if="!item.url" style="font-size: 12px; word-break: break-word; text-align: center;">
-              <view v-if="languageData.tmp.jqqd.length==4">
-                {{languageData.tmp.jqqd.substring(0,2)}}<br>{{languageData.tmp.jqqd.substring(2)}}
-              </view>
-              <view v-if="languageData.tmp.jqqd.length==11">{{languageData.tmp.jqqd}}</view>
-              <view v-if="languageData.tmp.jqqd.length==15">{{languageData.tmp.jqqd}}</view>
-            </view>
-            <u-icon v-if="index < 3 && item.url" size="25" :name="item.icon" color="#1C6EF3"></u-icon>
-            <!-- <uni-icons :type="item.icon" size="24" color="#1B6EF3" /> -->
-          </view>
-          <view class="feature-name">
-            <text>{{ item.name }}</text>
-          </view>
-        </view>
-      </view>
-
-
-      <!-- 最近交易记录 -->
-      <view class="transactions-section" v-if="false">
-        <view class="section-header">
-          <text class="section-title">{{languageData.home.latelyTran}}</text>
-          <text class="view-all">{{languageData.home.selectAll}} ></text>
-        </view>
-        <view class="transaction-list">
-          <view class="transaction-item" v-for="(transaction, index) in transactions" :key="index">
-            <view class="transaction-left">
-              <view class="transaction-icon">
-                <uni-icons :type="transaction.icon" size="20" color="#666666" />
-              </view>
-              <view class="transaction-info">
-                <text class="transaction-title">{{ transaction.title }}</text>
-                <text class="transaction-time">{{ transaction.time }}</text>
-              </view>
-            </view>
-            <text :class="['transaction-amount', transaction.type === 'income' ? 'income' : 'expense']">
-              {{ transaction.amount }}
-            </text>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <scanTheCode v-if="showScan" ref="scanCode"></scanTheCode>
-
-    <view>
-      <u-popup :show="languageShow" @close="close" @open="open" mode="top" safeAreaInsetTop>
-        <view class="text-center">
-          <view v-for="item in languageType" @click="overBtn(item)" class="language-list languageIcon">
-            <view class="">
-              <image style="width: 40rpx;" :src="item.imgUrl" mode="widthFix">
-              </image>
-            </view>
-            <view class="padding-left-xs">{{ item.value + ' (' + item.lable + ')'}}</view>
-          </view>
-        </view>
-      </u-popup>
-    </view>
-  </view>
+						<span v-else>{{languageData.home.guest}}</span>
+					</p>
+					<p style="color: #8E8E8E; font-size: 11px;">{{languageData.home.bless}}~</p>
+				</view>
+			</view>
+
+			<view class="" style="position: relative;margin-right: 40rpx;" @click.stop="navigatetoMessage()">
+				<u-icon name="bell" size="25"></u-icon>
+				<view>
+					<u-badge type="error" absolute :offset="[2,0]" isDot></u-badge>
+				</view>
+			</view>
+			<view class="">
+				<u--image :showLoading="true" :src="languageIconUrl" width="40px" height="40px" shape="circle"
+					@click="languageShow = true"></u--image>
+			</view>
+		</view>
+		<!-- 账户卡片 -->
+		<view>
+			<view class="account-card">
+				<view class="account-info">
+					<view
+						style="border-radius:12px; padding: 15px; background: radial-gradient(ellipse at center, #134F9B 35%, rgba(19, 79, 155, 0)) 100%; ">
+						<text class="balance-label" style="font-size: 12px;">{{languageData.home.accountBalance}}</text>
+						<view class="balance-amount" style="font-size: 26px;" @click.stop="navigate('wallet')">
+							{{ formatNumber(userAmount) }}&nbsp;KIP
+						</view>
+					</view>
+					<view class="button-group">
+						<uni-button size="mini" class="action-button" @click.stop="navigate('topUp')">
+							{{languageData.home.recharge}}
+						</uni-button>
+						<uni-button style="padding: 0 10px;" size="mini" class="action-button"
+							@click.stop="navigate('transactionRecord')">
+							{{languageData.home.billQuery}}
+						</uni-button>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 主要内容区域 -->
+		<view class="content-area">
+			<!-- 功能区域 -->
+			<view class="features-grid">
+				<view class="feature-item" v-for="(item, index) in features" :key="index"
+					@click.stop="navigate(item.path)">
+					<view class="feature-icon">
+						<uni-icons :type="item.icon" size="24" color="#1B6EF3" />
+					</view>
+					<view class="feature-name">
+						<text>{{ item.name }}</text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 广告banner -->
+			<view style="margin-top: 17rpx;">
+				<u-notice-bar color="#1B6EF3" bgColor="rgba(171, 146, 231, 0.1)"
+					:text="languageData.home.ads"></u-notice-bar>
+			</view>
+
+			<view
+				style="width: 100%; top: 13; padding: 15px; display: grid; grid-template-columns: repeat(4, 1fr); gap: 42rpx 32rpx; background-color: white; height: 250px; margin-top: 20rpx; border-radius: 12px;">
+				<view class="feature-item" @click="navigateTo(item.url)" v-for="(item, index) in funItem" :key="index">
+					<view class="feature-icon">
+						<!-- <u-avatar style="text-align: center;" color font-size="10" text="Coming soon"></u-avatar> -->
+						<view v-if="!item.url" style="font-size: 12px; word-break: break-word; text-align: center;">
+							<view v-if="languageData.tmp.jqqd.length==4">
+								{{languageData.tmp.jqqd.substring(0,2)}}<br>{{languageData.tmp.jqqd.substring(2)}}
+							</view>
+							<view v-if="languageData.tmp.jqqd.length==11">{{languageData.tmp.jqqd}}</view>
+							<view v-if="languageData.tmp.jqqd.length==15">{{languageData.tmp.jqqd}}</view>
+						</view>
+						<u-icon v-if="index < 3 && item.url" size="25" :name="item.icon" color="#1C6EF3"></u-icon>
+						<!-- <uni-icons :type="item.icon" size="24" color="#1B6EF3" /> -->
+					</view>
+					<view class="feature-name">
+						<text>{{ item.name }}</text>
+					</view>
+				</view>
+			</view>
+
+
+			<!-- 最近交易记录 -->
+			<view class="transactions-section" v-if="false">
+				<view class="section-header">
+					<text class="section-title">{{languageData.home.latelyTran}}</text>
+					<text class="view-all">{{languageData.home.selectAll}} ></text>
+				</view>
+				<view class="transaction-list">
+					<view class="transaction-item" v-for="(transaction, index) in transactions" :key="index">
+						<view class="transaction-left">
+							<view class="transaction-icon">
+								<uni-icons :type="transaction.icon" size="20" color="#666666" />
+							</view>
+							<view class="transaction-info">
+								<text class="transaction-title">{{ transaction.title }}</text>
+								<text class="transaction-time">{{ transaction.time }}</text>
+							</view>
+						</view>
+						<text :class="['transaction-amount', transaction.type === 'income' ? 'income' : 'expense']">
+							{{ transaction.amount }}
+						</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<scanTheCode v-if="showScan" ref="scanCode"></scanTheCode>
+
+		<view>
+			<u-popup :show="languageShow" @close="close" @open="open" mode="top" safeAreaInsetTop>
+				<view class="text-center">
+					<view v-for="item in languageType" @click="overBtn(item)" class="language-list languageIcon">
+						<view class="">
+							<image style="width: 40rpx;" :src="item.imgUrl" mode="widthFix">
+							</image>
+						</view>
+						<view class="padding-left-xs">{{ item.value + ' (' + item.lable + ')'}}</view>
+					</view>
+				</view>
+			</u-popup>
+		</view>
+	</view>
 </template>
 
 <script>
-import {
-  getAmount
-} from '@/api/account/transactionRecord.js'
-import scanTheCode from '@/components/scan/scanTheCode.vue'
-import {
-  getToken
-} from '@/utils/auth'
-import {
-  showConfirm
-} from '@/utils/common'
-export default {
-  components: {
-    scanTheCode
-  },
-  computed: {
-    user() {
-      return this.$store.state.user
-    },
-    isPerson() {
-      return this.$store.state.user.userType === 1
-    },
-    isLogin() {
-      return this.$store.state.user.token && this.$store.state.user.token.length > 0
-    },
-  },
-  data() {
-    return {
-      languageIconUrl: "/static/languageIcon/USA.jpg", //默认语言显示图片路径
-      languageShow: false, // 切换语言
-      onTabItemTapRenovate: true, // 刷新语言
-      currentLanguage: uni.getStorageSync("LANGUAGE-CODE"), // 当前语言
-      languageType: [],
-      showScan: false,
-      statusBarHeight: uni.getSystemInfoSync().statusBarHeight, // 获取状态栏高度
-      originalBrightness: null, // 存储屏幕亮度
-      screen: "true",
-      features: [],
-      languageData: this.$languageData, //翻译
-      funItem: [{
-        icon: require('@/static/img/shjf.png'),
-        name: this.$languageData.home.utilityPayments,
-        url: '/pages/functions/utilityPayment'
-      },
-        {
-          icon: this.$store.state.user.userCate == '2' ? 'man-add' : 'more-dot-fill',
-          name: this.$store.state.user.userCate == '2' ? this.$languageData.home.proxyPayment : this.$languageData.home.tbc,
-          url: this.$store.state.user.userCate == '2' ? '/pages/functions/proxyPayment' : undefined
-        },
-        {
-          icon: this.$store.state.user.userCate != '0' ? 'order' : 'more-dot-fill',
-          name: this.$store.state.user.userCate != '0' ? this.$languageData.home.businessData : this.$languageData.home.tbc,
-          url: this.$store.state.user.userCate != '0' ? '/pages/mchManage/index' : undefined
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        }
-
-      ],
-      transactions: [{
-        title: '转账给王小明',
-        time: '2024-01-20 14:30',
-        amount: '-￥2,000.00',
-        type: 'expense',
-        icon: 'right'
-      },
-        {
-          title: '收款自李志伟',
-          time: '2024-01-20 10:15',
-          amount: '+￥3,500.00',
-          type: 'income',
-          icon: 'left'
-        },
-        {
-          title: '商城购物',
-          time: '2024-01-19 16:45',
-          amount: '-￥1,280.00',
-          type: 'expense',
-          icon: 'cart'
-        },
-      ],
-
-      userAmount: 0,
-      userId: this.$store.state.user.userId,
-    }
-  },
-  created() {
-    this.languageType = this.$languageType;
-    this.languageType.forEach(item => {
-      if (item.lable === uni.getStorageSync("LANGUAGE-CODE"))
-        this.languageIconUrl = item.imgUrl
-    })
-    this.originalBrightness = uni.getStorageSync("originalBrightness");
-    if (uni.canIUse('getScreenBrightness')) {
-      this.getAndSetBrightness();
-    } else {
-      console.log("Hbuilder 端不能调节亮度")
-    }
-  },
-  watch: {
-    languageData() {
-      this.funItem = [{
-        icon: require('@/static/img/shjf.png'),
-        name: this.$languageData.home.utilityPayments,
-        url: '/pages/functions/utilityPayment'
-      },
-        {
-          icon: this.$store.state.user.userCate == '2' ? 'man-add' : 'more-dot-fill',
-          name: this.$store.state.user.userCate == '2' ? this.$languageData.home.proxyPayment : this.$languageData.home.tbc,
-          url: this.$store.state.user.userCate == '2' ? '/pages/functions/proxyPayment' : undefined
-        },
-        {
-          icon: this.$store.state.user.userCate != '0' ? 'order' : 'more-dot-fill',
-          name: this.$store.state.user.userCate != '0' ? this.$languageData.home.businessData : this.$languageData.home.tbc,
-          url: this.$store.state.user.userCate != '0' ? '/pages/mchManage/index' : undefined
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        },
-        {
-          icon: 'more-dot-fill',
-          name: this.$languageData.home.tbc
-        }
-
-      ]
-    }
-  },
-
-  onLoad() {
-    this.languageData = this.$languageData;
-    // 切换TabBar标题
-    this.setTabBarTabBar(this.languageData.tabbar);
-    if (getToken()) {
-      this.selectAmount();
-      // this.delItem();
-    }else{
-      //不登录的时候不展示
-      this.funItem.splice(1,2)
-    }
-
-  },
-  onShow() {
-    this.languageData = this.$languageData;
-    this.getScan();
-  },
-  methods: {
-    open() {
-      // console.log('open');
-    },
-    close() {
-      this.languageShow = false
-      // console.log('close');
-    },
-    goUser() {
-      uni.switchTab({
-        url: '/pages/mine/index'
-      })
-    },
-    goAuth() {
-      if(this.$store.state.user.userCate == '1'){
-        uni.navigateTo({url:'/pages/mine/info/merchant/edit'})
-      }else if(this.$store.state.user.userCate == '2'){
-        uni.navigateTo({url:'/pages/mine/info/proxy/edit'})
-      }else{
-        this.$tab.navigateTo('/pages/mine/info/edit')
-      }
-    },
-    selectAmount() {
-      getAmount(this.userId).then(res => {
-        this.userAmount = res.data.accountAmount
-      })
-
-    },
-    //处理功能显示
-    delItem() {
-      let userInfo = uni.getStorageSync("storage_data");
-      if (userInfo.vuex_userCate === '0') {
-        //如果登录用户是个人0
-        this.funItem.splice(1,2)
-      }else if(userInfo.vuex_userCate === '1'){
-        //如果登录用户是商户1
-        this.funItem.splice(1,1)
-      } else if(userInfo.vuex_userCate === '2'){
-        //如果登录用户是代理2
-        this.funItem.splice(2,1)
-      }
-
-
-
-
-
-
-    },
-    navigate(page) {
-      if (this.isNotAuthed()) return;
-      if (page == 'scan') {
-        if (!getToken()) {
-          uni.reLaunch({
-            url: '/pages/login'
-          })
-        } else {
-          this.showScan = true
-          this.$nextTick(() => {
-            this.$refs.scanCode.scanQRCode();
-          })
-        }
-      } else if (page == 'wallet') {
-        uni.navigateTo({
-          url: "/pages/mine/wallet/index"
-        })
-      } else {
-        uni.navigateTo({
-          url: "/pages/account/" + page
-        })
-      }
-    },
-    navigatetoMessage() {
-      uni.navigateTo({
-        url: "/pages/message/index"
-      })
-    },
-    navigateTo(url) {
-      //if (this.isNotAuthed()) return;
-      if (url && url.length > 0)
-        uni.navigateTo({
-          url: url
-        })
-    },
-    // 获取屏幕亮度
-    getAndSetBrightness() {
-      uni.getScreenBrightness({
-        success: (res) => {
-          uni.setStorageSync("originalBrightness", res.value); // 存储当前亮度
-          uni.setStorageSync("screen", "false");
-          console.log("当前页面亮度为：")
-          console.log(uni.getStorageSync("originalBrightness"))
-        },
-        fail: () => {
-          console.log("获取屏幕亮度失败");
-        }
-      });
-    },
-    getScan() {
-      this.features = [{
-        name: this.languageData.home.scan,
-        icon: 'scan',
-        path: 'scan'
-      },
-        {
-          name: this.languageData.home.receiveAndPay,
-          icon: 'wallet',
-          path: 'receiptPayment'
-        },
-        {
-          name: this.languageData.home.transfer,
-          icon: 'redo',
-          path: 'transferAccounts'
-        },
-        {
-          name: this.languageData.home.withdrawal,
-          icon: 'download',
-          path: 'withdrawDeposit'
-        }
-      ]
-    },
-    overBtn(data) {
-      if (data.lable === 'Chinese') uni.setLocale("zh-Hans")
-      else if (data.lable === 'English') uni.setLocale("en")
-      else uni.setLocale("laos")
-      this.currentLanguage = data.lable;
-      this.languageIconUrl = data.imgUrl;
-      uni.setStorageSync("LANGUAGE-CODE", data.lable);
-      this.$LGC_swich();
-      this.languageData = this.$languageData;
-      // 切换TabBar标题
-      this.setTabBarTabBar(this.languageData.tabbar);
-      //关闭语言切换
-      this.languageShow = false;
-      //重新赋值
-      this.getScan();
-    },
-    isNotAuthed() {
-      let rs = this.isLogin && !this.user.name
-      if (rs) this.$modal.msg(this.languageData.home.need2AuthPh)
-      return rs
-    }
-  }
-}
+	import {
+		getAmount
+	} from '@/api/account/transactionRecord.js'
+	import scanTheCode from '@/components/scan/scanTheCode.vue'
+	import {
+		getToken
+	} from '@/utils/auth'
+	import {
+		showConfirm
+	} from '@/utils/common'
+	export default {
+		components: {
+			scanTheCode
+		},
+		computed: {
+			user() {
+				return this.$store.state.user
+			},
+			isPerson() {
+				return this.$store.state.user.userType === 1
+			},
+			isLogin() {
+				return this.$store.state.user.token && this.$store.state.user.token.length > 0
+			},
+		},
+		data() {
+			return {
+				languageIconUrl: "/static/languageIcon/USA.jpg", //默认语言显示图片路径
+				languageShow: false, // 切换语言
+				onTabItemTapRenovate: true, // 刷新语言
+				currentLanguage: uni.getStorageSync("LANGUAGE-CODE"), // 当前语言
+				languageType: [],
+				showScan: false,
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight, // 获取状态栏高度
+				originalBrightness: null, // 存储屏幕亮度
+				screen: "true",
+				features: [],
+				languageData: this.$languageData, //翻译
+				funItem: [{
+						icon: require('@/static/img/shjf.png'),
+						name: this.$languageData.home.utilityPayments,
+						url: '/pages/functions/utilityPayment'
+					},
+					{
+						icon: this.$store.state.user.userCate == '2' ? 'man-add' : 'more-dot-fill',
+						name: this.$store.state.user.userCate == '2' ? this.$languageData.home.proxyPayment : this
+							.$languageData.home.tbc,
+						url: this.$store.state.user.userCate == '2' ? '/pages/functions/proxyPayment' : undefined
+					},
+					{
+						icon: this.$store.state.user.userCate != '0' ? 'order' : 'more-dot-fill',
+						name: this.$store.state.user.userCate != '0' ? this.$languageData.home.businessData : this
+							.$languageData.home.tbc,
+						url: this.$store.state.user.userCate != '0' ? '/pages/mchManage/index' : undefined
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					}
+
+				],
+				transactions: [{
+						title: '转账给王小明',
+						time: '2024-01-20 14:30',
+						amount: '-￥2,000.00',
+						type: 'expense',
+						icon: 'right'
+					},
+					{
+						title: '收款自李志伟',
+						time: '2024-01-20 10:15',
+						amount: '+￥3,500.00',
+						type: 'income',
+						icon: 'left'
+					},
+					{
+						title: '商城购物',
+						time: '2024-01-19 16:45',
+						amount: '-￥1,280.00',
+						type: 'expense',
+						icon: 'cart'
+					},
+				],
+
+				userAmount: 0,
+				userId: this.$store.state.user.userId,
+			}
+		},
+		created() {
+			this.languageType = this.$languageType;
+			this.languageType.forEach(item => {
+				if (item.lable === uni.getStorageSync("LANGUAGE-CODE"))
+					this.languageIconUrl = item.imgUrl
+			})
+			this.originalBrightness = uni.getStorageSync("originalBrightness");
+			if (uni.canIUse('getScreenBrightness')) {
+				this.getAndSetBrightness();
+			} else {
+				console.log("Hbuilder 端不能调节亮度")
+			}
+		},
+		watch: {
+			languageData() {
+				this.funItem = [{
+						icon: require('@/static/img/shjf.png'),
+						name: this.$languageData.home.utilityPayments,
+						url: '/pages/functions/utilityPayment'
+					},
+					{
+						icon: this.$store.state.user.userCate == '2' ? 'man-add' : 'more-dot-fill',
+						name: this.$store.state.user.userCate == '2' ? this.$languageData.home.proxyPayment : this
+							.$languageData.home.tbc,
+						url: this.$store.state.user.userCate == '2' ? '/pages/functions/proxyPayment' : undefined
+					},
+					{
+						icon: this.$store.state.user.userCate != '0' ? 'order' : 'more-dot-fill',
+						name: this.$store.state.user.userCate != '0' ? this.$languageData.home.businessData : this
+							.$languageData.home.tbc,
+						url: this.$store.state.user.userCate != '0' ? '/pages/mchManage/index' : undefined
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					},
+					{
+						icon: 'more-dot-fill',
+						name: this.$languageData.home.tbc
+					}
+
+				]
+			}
+		},
+
+		onLoad() {
+			this.languageData = this.$languageData;
+			// 切换TabBar标题
+			this.setTabBarTabBar(this.languageData.tabbar);
+		},
+		onShow() {
+			this.languageData = this.$languageData;
+			if (getToken()) {
+				this.user;
+				this.selectAmount();
+				// this.delItem();
+			} else {
+				//不登录的时候不展示
+				this.funItem.splice(1, 2)
+			}
+			this.getScan();
+		},
+		methods: {
+			open() {
+				// console.log('open');
+			},
+			close() {
+				this.languageShow = false
+				// console.log('close');
+			},
+			goUser() {
+				uni.switchTab({
+					url: '/pages/mine/index'
+				})
+			},
+			goAuth() {
+				if (this.$store.state.user.userCate == '1') {
+					uni.navigateTo({
+						url: '/pages/mine/info/merchant/edit'
+					})
+				} else if (this.$store.state.user.userCate == '2') {
+					uni.navigateTo({
+						url: '/pages/mine/info/proxy/edit'
+					})
+				} else {
+					this.$tab.navigateTo('/pages/mine/info/edit')
+				}
+			},
+			selectAmount() {
+				getAmount(this.userId).then(res => {
+					this.userAmount = res.data.accountAmount
+				})
+
+			},
+			//处理功能显示
+			delItem() {
+				let userInfo = uni.getStorageSync("storage_data");
+				if (userInfo.vuex_userCate === '0') {
+					//如果登录用户是个人0
+					this.funItem.splice(1, 2)
+				} else if (userInfo.vuex_userCate === '1') {
+					//如果登录用户是商户1
+					this.funItem.splice(1, 1)
+				} else if (userInfo.vuex_userCate === '2') {
+					//如果登录用户是代理2
+					this.funItem.splice(2, 1)
+				}
+
+
+
+
+
+
+			},
+			navigate(page) {
+				if (this.isNotAuthed()) return;
+				if (page == 'scan') {
+					if (!getToken()) {
+						uni.reLaunch({
+							url: '/pages/login'
+						})
+					} else {
+						this.showScan = true
+						this.$nextTick(() => {
+							this.$refs.scanCode.scanQRCode();
+						})
+					}
+				} else if (page == 'wallet') {
+					uni.navigateTo({
+						url: "/pages/mine/wallet/index"
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/account/" + page
+					})
+				}
+			},
+			navigatetoMessage() {
+				uni.navigateTo({
+					url: "/pages/message/index"
+				})
+			},
+			navigateTo(url) {
+				//if (this.isNotAuthed()) return;
+				if (url && url.length > 0)
+					uni.navigateTo({
+						url: url
+					})
+			},
+			// 获取屏幕亮度
+			getAndSetBrightness() {
+				uni.getScreenBrightness({
+					success: (res) => {
+						uni.setStorageSync("originalBrightness", res.value); // 存储当前亮度
+						uni.setStorageSync("screen", "false");
+						console.log("当前页面亮度为：")
+						console.log(uni.getStorageSync("originalBrightness"))
+					},
+					fail: () => {
+						console.log("获取屏幕亮度失败");
+					}
+				});
+			},
+			getScan() {
+				this.features = [{
+						name: this.languageData.home.scan,
+						icon: 'scan',
+						path: 'scan'
+					},
+					{
+						name: this.languageData.home.receiveAndPay,
+						icon: 'wallet',
+						path: 'receiptPayment'
+					},
+					{
+						name: this.languageData.home.transfer,
+						icon: 'redo',
+						path: 'transferAccounts'
+					},
+					{
+						name: this.languageData.home.withdrawal,
+						icon: 'download',
+						path: 'withdrawDeposit'
+					}
+				]
+			},
+			overBtn(data) {
+				if (data.lable === 'Chinese') uni.setLocale("zh-Hans")
+				else if (data.lable === 'English') uni.setLocale("en")
+				else uni.setLocale("laos")
+				this.currentLanguage = data.lable;
+				this.languageIconUrl = data.imgUrl;
+				uni.setStorageSync("LANGUAGE-CODE", data.lable);
+				this.$LGC_swich();
+				this.languageData = this.$languageData;
+				// 切换TabBar标题
+				this.setTabBarTabBar(this.languageData.tabbar);
+				//关闭语言切换
+				this.languageShow = false;
+				//重新赋值
+				this.getScan();
+			},
+			isNotAuthed() {
+				let rs = this.isLogin && !this.user.name
+				if (rs) this.$modal.msg(this.languageData.home.need2AuthPh)
+				return rs
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-page {
-  height: 100%;
-  width: 100%;
-  background-color: #f5f5f5;
-}
-
-body {
-  overflow: hidden;
-}
-
-.language-list {
-  padding: 40rpx;
-  border: 1rpx solid #ffffff;
-  background-color: #fafafa;
-}
-
-.account-title {
-  display: flex;
-  justify-content: center;
-  font-size: 36rpx;
-  color: white;
-  position: relative;
-}
-
-.app-container {
-  width: 100%;
-  height: 100vh;
-  overflow: hidden;
-}
-
-.nav-bar {
-  height: 88rpx;
-  background-color: #ffffff;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 32rpx;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
-}
-
-.text-lg {
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.nav-right {
-  display: flex;
-  align-items: center;
-  position: absolute;
-  right: 0;
-
-}
-
-.content-area {
-  // padding: 32rpx 32rpx 70rpx;
-  padding: 32rpx 0;
-  padding-top: 19rpx;
-}
-
-
-.account-card {
-  background-image: url('/static/svgs/lines.svg');
-  background-size: cover;
-  background-position: center;
-  background-color: #144F9B;
-  border-radius: 12px;
-  padding: 32rpx;
-  width: 95%;
-  margin: 0 auto;
-  min-height: 240rpx;
-  display: flex;
-  align-items: center;
-}
-
-.account-info {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-}
-
-.balance-label {
-  font-size: 14px;
-  color: rgba(255, 255, 255, 0.9);
-}
-
-.balance-amount {
-  font-size: 23px;
-  color: #ffffff;
-  font-weight: 700;
-  margin-top: 12rpx;
-}
-
-.button-group {
-  display: flex;
-  flex-direction: column;
-  gap: 16rpx;
-}
-
-.action-button {
-  background-color: rgba(255, 255, 255, 0.2) !important;
-  border: none !important;
-  color: #ffffff !important;
-  font-size: 14px !important;
-}
-
-.features-grid {
-  background: white;
-  padding: 10px;
-  border-radius: 12px;
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  gap: 32rpx;
-  // margin-bottom: -48rpx;
-  // position: relative;
-  // top: -70rpx;
-  top: 13rpx;
-}
-
-.feature-item {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.feature-icon {
-  width: 96rpx;
-  height: 96rpx;
-  background-color: rgba(171, 146, 231, 0.1);
-  // background-color: rgba(255, 242, 229, 0.1);
-  border-radius: 48rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 16rpx;
-}
-
-.feature-name {
-  font-size: 14px;
-  color: #333333;
-  text-align: center;
-  height: 2em;
-  display: flex;
-  align-items: center;
-  font-weight: 500;
-}
-
-.promotion-banner {
-  background-color: rgba(255, 125, 0, 0.05);
-  border: 1px solid rgba(255, 125, 0, 0.1);
-  border-radius: 16rpx;
-  padding: 12rpx;
-  display: flex;
-  align-items: center;
-  // margin-bottom: 48rpx;
-}
-
-.promotion-text {
-  font-size: 14px;
-  color: #666666;
-  margin-left: 24rpx;
-}
-
-.section-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 32rpx;
-}
-
-.section-title {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333333;
-}
-
-.view-all {
-  font-size: 14px;
-  color: #999999;
-}
-
-.transaction-list {
-  display: flex;
-  flex-direction: column;
-  gap: 32rpx;
-}
-
-.transaction-item {
-  background-color: #ffffff;
-  border-radius: 16rpx;
-  padding: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.transaction-left {
-  display: flex;
-  align-items: center;
-}
-
-.transaction-icon {
-  width: 80rpx;
-  height: 80rpx;
-  background-color: #f5f5f5;
-  border-radius: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 24rpx;
-}
-
-.transaction-info {
-  display: flex;
-  flex-direction: column;
-}
-
-.transaction-title {
-  font-size: 14px;
-  color: #333333;
-  font-weight: 500;
-}
-
-.transaction-time {
-  font-size: 12px;
-  color: #999999;
-  margin-top: 8rpx;
-}
-
-.transaction-amount {
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.income {
-  color: #00b578;
-}
-
-.expense {
-  color: #ff4d4f;
-}
-
-
-.tab-text {
-  font-size: 12px;
-  color: #999999;
-  margin-top: 8rpx;
-}
-
-.active-text {
-  color: #1B6EF3;
-}
-
-.languageIcon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.c {
-  display: flex;
-  justify-content: left;
-  align-items: center;
-}
+	page {
+		height: 100%;
+		width: 100%;
+		background-color: #f5f5f5;
+	}
+
+	body {
+		overflow: hidden;
+	}
+
+	.language-list {
+		padding: 40rpx;
+		border: 1rpx solid #ffffff;
+		background-color: #fafafa;
+	}
+
+	.account-title {
+		display: flex;
+		justify-content: center;
+		font-size: 36rpx;
+		color: white;
+		position: relative;
+	}
+
+	.app-container {
+		width: 100%;
+		height: 100vh;
+		overflow: hidden;
+	}
+
+	.nav-bar {
+		height: 88rpx;
+		background-color: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 32rpx;
+		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+	}
+
+	.text-lg {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.nav-right {
+		display: flex;
+		align-items: center;
+		position: absolute;
+		right: 0;
+
+	}
+
+	.content-area {
+		// padding: 32rpx 32rpx 70rpx;
+		padding: 32rpx 0;
+		padding-top: 19rpx;
+	}
+
+
+	.account-card {
+		background-image: url('/static/svgs/lines.svg');
+		background-size: cover;
+		background-position: center;
+		background-color: #144F9B;
+		border-radius: 12px;
+		padding: 32rpx;
+		width: 95%;
+		margin: 0 auto;
+		min-height: 240rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.account-info {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: relative;
+	}
+
+	.balance-label {
+		font-size: 14px;
+		color: rgba(255, 255, 255, 0.9);
+	}
+
+	.balance-amount {
+		font-size: 23px;
+		color: #ffffff;
+		font-weight: 700;
+		margin-top: 12rpx;
+	}
+
+	.button-group {
+		display: flex;
+		flex-direction: column;
+		gap: 16rpx;
+	}
+
+	.action-button {
+		background-color: rgba(255, 255, 255, 0.2) !important;
+		border: none !important;
+		color: #ffffff !important;
+		font-size: 14px !important;
+	}
+
+	.features-grid {
+		background: white;
+		padding: 10px;
+		border-radius: 12px;
+		display: grid;
+		grid-template-columns: repeat(4, 1fr);
+		gap: 32rpx;
+		// margin-bottom: -48rpx;
+		// position: relative;
+		// top: -70rpx;
+		top: 13rpx;
+	}
+
+	.feature-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.feature-icon {
+		width: 96rpx;
+		height: 96rpx;
+		background-color: rgba(171, 146, 231, 0.1);
+		// background-color: rgba(255, 242, 229, 0.1);
+		border-radius: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-bottom: 16rpx;
+	}
+
+	.feature-name {
+		font-size: 14px;
+		color: #333333;
+		text-align: center;
+		height: 2em;
+		display: flex;
+		align-items: center;
+		font-weight: 500;
+	}
+
+	.promotion-banner {
+		background-color: rgba(255, 125, 0, 0.05);
+		border: 1px solid rgba(255, 125, 0, 0.1);
+		border-radius: 16rpx;
+		padding: 12rpx;
+		display: flex;
+		align-items: center;
+		// margin-bottom: 48rpx;
+	}
+
+	.promotion-text {
+		font-size: 14px;
+		color: #666666;
+		margin-left: 24rpx;
+	}
+
+	.section-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 32rpx;
+	}
+
+	.section-title {
+		font-size: 16px;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.view-all {
+		font-size: 14px;
+		color: #999999;
+	}
+
+	.transaction-list {
+		display: flex;
+		flex-direction: column;
+		gap: 32rpx;
+	}
+
+	.transaction-item {
+		background-color: #ffffff;
+		border-radius: 16rpx;
+		padding: 32rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.transaction-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.transaction-icon {
+		width: 80rpx;
+		height: 80rpx;
+		background-color: #f5f5f5;
+		border-radius: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 24rpx;
+	}
+
+	.transaction-info {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.transaction-title {
+		font-size: 14px;
+		color: #333333;
+		font-weight: 500;
+	}
+
+	.transaction-time {
+		font-size: 12px;
+		color: #999999;
+		margin-top: 8rpx;
+	}
+
+	.transaction-amount {
+		font-size: 14px;
+		font-weight: 500;
+	}
+
+	.income {
+		color: #00b578;
+	}
+
+	.expense {
+		color: #ff4d4f;
+	}
+
+
+	.tab-text {
+		font-size: 12px;
+		color: #999999;
+		margin-top: 8rpx;
+	}
+
+	.active-text {
+		color: #1B6EF3;
+	}
+
+	.languageIcon {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.c {
+		display: flex;
+		justify-content: left;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/mine/wallet/index.vue b/pages/mine/wallet/index.vue
index a9cd789..b7f70d9 100644
--- a/pages/mine/wallet/index.vue
+++ b/pages/mine/wallet/index.vue
@@ -1,328 +1,368 @@
 <template>
-  <view class="wallet-page container-with-lines full-height-with-titile">
-    <!-- 余额卡片 -->
-    <view class="balance-card">
-      <view class="balance-header">
-        <view class="balance-label">
-			<view style="display: flex; align-items: center; font-size: 16px;">
-				<view>e</view>
-				<view>-KIP</view>
+	<view class="wallet-page container-with-lines full-height-with-titile">
+		<!-- 余额卡片 -->
+		<view class="balance-card">
+			<view class="balance-header">
+				<view class="balance-label">
+					<view style="display: flex; align-items: center; font-size: 16px;">
+						<view>e</view>
+						<view>-KIP</view>
+					</view>
+				</view>
+				<view class="safety-tag">
+					<uni-icons type="info-filled" size="14" color="#FF9500"></uni-icons>
+					<text>{{languageData.account.quota + '(' + quota +')'}}</text>
+					<!-- <text>{{languageData.wallet.moneySafe}}</text> -->
+				</view>
 			</view>
-        </view>
-        <view class="safety-tag">
-          <uni-icons type="info-filled" size="14" color="#FF9500"></uni-icons>
-          <text>{{languageData.account.quota + '(' + quota +')'}}</text>
-          <!-- <text>{{languageData.wallet.moneySafe}}</text> -->
-        </view>
-      </view>
-      <view class="balance-amount">
-		  <view style="font-size: 29px;">{{accountId}}</view>
-		  <view class="balance-label" style="margin-top: 20px;">
-		    <text>{{languageData.wallet.availableBalance}} (KIP)</text>
-		    <uni-icons :type="showDetail ? 'eye-filled' : 'eye-slash-filled'"  
-		     @click="showDetail = !showDetail" size="20" color="#333333"></uni-icons>
-		  </view>
-        <view style="">{{ showDetail ? formatNumber(userAmount) : '*****' }}</view>
-      </view>
-      <view class="action-buttons">
-        <button class="withdraw-btn" @click.stop="navigatoCashOut()">{{languageData.wallet.withdrawal}}</button>
-        <button class="recharge-btn" @click.stop="navigatoTopUp()">{{languageData.wallet.toUp}}</button>
-      </view>
-    </view>
-    <!-- 交易记录 -->
-	<view class="list-background">
-		<view class="transaction-list">
-		  <view class="list-header">
-		    <text>{{languageData.wallet.balanceChangeRecord}}</text>
-		    <view class="view-all" @click.stop="navigatoRecord">
-		      <text>{{languageData.wallet.all}}</text>
-		      <uni-icons type="right" size="14" color="#999999"></uni-icons>
-		    </view>
-		  </view>
-		  
-			<scroll-view class="message-list" scroll-y :refresher-triggered="triggered" @scrolltolower="onLoadMore">
-			  <view class="list-main" v-for="(item, index) in recordList" :key="index">
-				<view class="transaction-item">
-				  <view class="transaction-info">
-					<text class="transaction-type">{{ item.timeStr }}</text>
-					<text class="transaction-remark ellipsis-200">{{ item.remark }}</text>
-					<text class="transaction-time">{{ item.time }}</text>
-				  </view>
-				  <view class="transaction-amount padding-right-xs">
-					<text class="amount positive" :class="{'negative' : item.changeBalance < 0 }">
-						{{ item.changeBalance > 0 ? '+' : '' }}{{ item.changeBalance }}
-					</text>
-					<view class="amount2">
-						<text class="balance">
-							{{languageData.wallet.balance}}：{{item.currentBalance == '' || item.currentBalance == null ? '-': formatNumber(item.currentBalance)}}
-						</text>
+			<view class="balance-amount">
+				<view style="font-size: 29px;">{{accountId}}</view>
+				<view class="balance-label" style="margin-top: 20px;">
+					<text>{{languageData.wallet.availableBalance}} (KIP)</text>
+					<uni-icons :type="showDetail ? 'eye-filled' : 'eye-slash-filled'" @click="showDetail = !showDetail"
+						size="20" color="#333333"></uni-icons>
+				</view>
+				<view style="">{{ showDetail ? formatNumber(userAmount) : '*****' }}</view>
+			</view>
+			<view class="action-buttons">
+				<button class="withdraw-btn" @click.stop="navigatoCashOut()">{{languageData.wallet.withdrawal}}</button>
+				<button class="recharge-btn" @click.stop="navigatoTopUp()">{{languageData.wallet.toUp}}</button>
+			</view>
+		</view>
+		<!-- 交易记录 -->
+		<view class="list-background">
+			<view class="transaction-list">
+				<view class="list-header">
+					<text>{{languageData.wallet.balanceChangeRecord}}</text>
+					<view class="view-all" @click.stop="navigatoRecord">
+						<text>{{languageData.wallet.all}}</text>
+						<uni-icons type="right" size="14" color="#999999"></uni-icons>
 					</view>
-				  </view>
 				</view>
-			  </view>
-			</scroll-view>
-			
+
+				<scroll-view class="message-list" scroll-y :refresher-triggered="triggered" @scrolltolower="onLoadMore">
+					<view class="list-main" v-for="(item, index) in recordList.splice(0,2)" :key="index">
+						<view class="transaction-item">
+							<view class="transaction-info">
+								<text class="transaction-type">{{ item.timeStr }}</text>
+								<text class="transaction-remark ellipsis-200">{{ item.billCode }}</text>
+								<text class="transaction-time">{{ item.time }}</text>
+							</view>
+							<view class="transaction-amount padding-right-xs">
+								<text class="amount positive" :class="{'negative' : item.changeBalance < 0 }">
+									{{ item.changeBalance > 0 ? '+' : '' }}{{ item.changeBalance }}
+								</text>
+								<view class="amount2">
+									<text class="balance">
+										{{languageData.wallet.balance}}：{{item.currentBalance == '' || item.currentBalance == null ? '-': formatNumber(item.currentBalance)}}
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+			</view>
 		</view>
-	</view>
 
-  </view>
+	</view>
 </template>
 
 <script>
-import { getRecordList,getAmount } from '@/api/account/transactionRecord.js'
-
-export default {
-  data() {
-    return {
-		accountId: '',
-		languageData:{},
-		params:{
-			id:this.$store.state.user.userId,
-			userId:this.$store.state.user.userId,
-			pageNum: 1,
-			pageSize: 10,
-			phonenumber:'',
-			key:'',
-			type:'1',
+	import {
+		getTransRecord,
+		getAmount
+	} from '@/api/account/transactionRecord.js'
+
+	export default {
+		data() {
+			return {
+				accountId: '',
+				languageData: {},
+				params: {
+					id: this.$store.state.user.userId,
+					userId: this.$store.state.user.userId,
+					pageNum: 1,
+					pageSize: 10,
+					phonenumber: '',
+					key: '',
+					type: '1',
+				},
+				showDetail: false,
+				triggered: false,
+				userAmount: 5322200,
+				quota: 0,
+				recordList: [{
+						senderName: 'senderName1',
+						senderAccount: '22540212',
+						changeBalance: '250000',
+						time: '2025-01-22 21:05:33',
+						title: '',
+						remark: '',
+						currentBalance: ''
+					},
+					{
+						senderName: 'senderName2',
+						senderAccount: '22540212',
+						changeBalance: '-250000',
+						time: '2025-01-24 21:05:33',
+						title: '',
+						remark: '',
+						currentBalance: ''
+					}
+				]
+			}
+		},
+		created() {
+			this.selectRecordList();
 		},
-		showDetail: false,
-		triggered: false,
-		userAmount:5322200,
-		quota: 0,
-		recordList:[
-			{
-			  senderName: 'senderName1',
-			  senderAccount: '22540212',
-			  changeBalance: '250000',
-			  time: '2025-01-22 21:05:33',
-			  title:'',
-			  remark:'',
-			  currentBalance:''
+		onLoad() {
+			//TODO
+			if (false)
+				this.loadRecordList();
+			this.selectAmount();
+			this.languageData = this.$languageData;
+			uni.setNavigationBarTitle({
+				title: this.$languageData.navBar.wallet
+			});
+		},
+		methods: {
+			navigatoCashOut() {
+				this.$tab.navigateTo('/pages/account/withdrawDeposit')
+
 			},
-			{
-			  senderName: 'senderName2',
-			  senderAccount: '22540212',
-			  changeBalance: '-250000',
-			  time: '2025-01-24 21:05:33',
-			  title:'',
-			  remark:'',
-			  currentBalance:''
-			}
-		]
-    }
-  },
-  onLoad() {
-	//TODO
-	if(false)
-		this.loadRecordList();
-	this.selectAmount();
-	this.languageData = this.$languageData;
-	uni.setNavigationBarTitle({
-		title: this.$languageData.navBar.wallet
-	});
-  },
-  methods: {
-	navigatoCashOut(){
-		this.$tab.navigateTo('/pages/account/withdrawDeposit')
-		
-	},
-	navigatoTopUp(){
-		this.$tab.navigateTo('/pages/account/topUp')
-		
-	},
-	navigatoRecord(){
-		this.$tab.navigateTo('/pages/account/transactionRecord')
-	},
-	loadRecordList(){
-		getRecordList(this.params).then(res=>{
-			this.recordList = res.rows
-		})
-	},
-	selectAmount(){
-		getAmount(this.params.userId).then(res=>{
-			this.userAmount = res.data.accountAmount
-			this.accountId = res.data.accountId
-			this.quota = res.data.walletLimit || 0
-		})
-	},
-    onLoadMore() {
-    	// console.log("----懒加载----")
-		this.params.pageSize = this.params.pageSize + 10
-		this.loadRecordList();
-    },
-  }
-}
+			navigatoTopUp() {
+				this.$tab.navigateTo('/pages/account/topUp')
+
+			},
+			navigatoRecord() {
+				this.$tab.navigateTo('/pages/account/transactionRecord')
+			},
+			loadRecordList() {
+				getRecordList(this.params).then(res => {
+					this.recordList = res.rows
+				})
+			},
+			selectAmount() {
+				getAmount(this.params.userId).then(res => {
+					this.userAmount = res.data.accountAmount
+					this.accountId = res.data.accountId
+					this.quota = res.data.walletLimit || 0
+				})
+			},
+			onLoadMore() {
+				// console.log("----懒加载----")
+				this.params.pageSize = this.params.pageSize + 10
+				this.loadRecordList();
+			},
+			selectRecordList() {
+				getTransRecord(this.params).then(res => {
+					this.recordList = res.data;
+					this.recordList.forEach(item => {
+						item.billCode = item.billCode.split("@")[0];
+						if (item.billCode == "BTR") {
+							item.billCode = this.$languageData.tmp.transferAccounts; //转账
+						} else if (item.billCode == "BPY") {
+							item.billCode = this.$languageData.tmp.proxyPayment; //代缴
+						} else if (item.billCode == "BPT") {
+							item.billCode = this.$languageData.tmp.payment; //付款
+						} else if (item.billCode == "BRT") {
+							item.billCode = this.$languageData.tmp.receivePayment; //收款
+						} else if (item.billCode == "BWL") {
+							item.billCode = this.$languageData.tmp.withdrawal; //提现
+						} else if (item.billCode == "BRE") {
+							item.billCode = this.$languageData.tmp.recharge; //充值
+						} else {
+							item.billCode = this.$languageData.tmp.other; //其他
+						}
+					})
+				}).catch(e => {
+					//this.$refs.loading.close();
+				})
+				//this.$refs.loading.close();
+				//TODO
+				if (false) {
+					this.$nextTick(() => {
+						this.$refs.loading.open();
+					})
+
+				}
+			},
+		}
+	}
 </script>
 
 
 <style lang="scss" scoped>
-  page {
-    height: 100%;
-  }
-  .amount2{
-	  display: flex;
-	  align-items: flex-start;
-  }
-  .wallet-page {
-    // min-height: 100%;
-    // background: linear-gradient(180deg, #FEE1A8 0%, #f9f8f8 30%);
-    // background-color: #2C53CA;
-	// background-image: url('/static/svgs/lines.svg');
-	// background-size: 200%;
-	// background-position: center;
-  }
-  
-  .list-background{
-	  background:rgba(248, 247, 246, 0);
-	  // min-height: 500px;
-  }
-  
-  .balance-card {
-	margin-bottom: 20rpx;
-	margin-left: 32rpx;
-	margin-right: 32rpx;
-    padding: 32rpx;
-    background: #FFFFFF;
-    border-radius: 16rpx;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
-  }
-  
-  .balance-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  
-  .balance-label {
-    display: flex;
-    align-items: center;
-    gap: 8rpx;
-    font-size: 14px;
-    color: #666666;
-  }
-  
-  .safety-tag {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    font-size: 12px;
-    color: #FF9500;
-  }
-  
-  .balance-amount {
-    margin: 32rpx 0;
-    font-size: 76rpx;
-    font-weight: 600;
-    color: #333333;
-  }
-  
-  .action-buttons {
-    display: flex;
-    gap: 100rpx;
-  }
-  
-  .withdraw-btn,
-  .recharge-btn {
-    flex: 1;
-    height: 80rpx;
-    line-height: 80rpx;
-    border-radius: 8rpx;
-    font-size: 14px;
-  }
-  
-  .withdraw-btn {
-    background: #F5F5F5;
-    color: #333333;
-  }
-  
-  .recharge-btn {
-    background: #FFE4BA;
-    color: #333333;
-  }
-  
-  .transaction-list {
-    margin: 32rpx;
-    padding: 32rpx;
-    background: #FFFFFF;
-    border-radius: 16rpx;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
-	min-height: 270px;
-  }
-  
-  .list-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 88rpx;
-    font-size: 30rpx;
-	font-weight: 600;
-    margin-top: -16rpx;
-	border-bottom: 1px solid #F5F5F5;
-  }
-  
-  .view-all {
-    display: flex;
-    align-items: center;
-    color: #999999;
-  }
-  
-  .transaction-item {
-    display: flex;
-    justify-content: space-between;
-    padding: 24rpx 0;
-    border-bottom: 1px solid #eaeaea;
-  }
-  
-  // .transaction-item:last-child {
-  //   border-bottom: none;
-  // }
-  
-  .transaction-info {
-    display: flex;
-    flex-direction: column;
-    gap: 8rpx;
-  }
-  
-  .transaction-type {
-    font-size: 30rpx;
-	font-weight: bold;
-    color: #333333;
-  }
-  
-  .transaction-time {
-    font-size: 24rpx;
-    color: #999999;
-  }
-  
-  .transaction-remark {
-	// width: 85%;
-    font-size: 28rpx;
-    color: #999999;
-  }
-  
-  .transaction-amount {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-    gap: 8rpx;
-  }
-  
-  .amount {
-    font-size: 14px;
-    font-weight: 500;
-  }
-  
-  .positive {
-    color: #07C160;
-  }
-  
-  .negative {
-    color: #c73d3d;
-  }
-  
-  .balance {
-    font-size: 12px;
-    color: #999999;
-	float: left;
-  }
-</style>
+	page {
+		height: 100%;
+	}
+
+	.amount2 {
+		display: flex;
+		align-items: flex-start;
+	}
+
+	.wallet-page {
+		// min-height: 100%;
+		// background: linear-gradient(180deg, #FEE1A8 0%, #f9f8f8 30%);
+		// background-color: #2C53CA;
+		// background-image: url('/static/svgs/lines.svg');
+		// background-size: 200%;
+		// background-position: center;
+	}
+
+	.list-background {
+		background: rgba(248, 247, 246, 0);
+		// min-height: 500px;
+	}
+
+	.balance-card {
+		margin-bottom: 20rpx;
+		margin-left: 32rpx;
+		margin-right: 32rpx;
+		padding: 32rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+	}
+
+	.balance-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.balance-label {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		font-size: 14px;
+		color: #666666;
+	}
+
+	.safety-tag {
+		display: flex;
+		align-items: center;
+		gap: 4rpx;
+		font-size: 12px;
+		color: #FF9500;
+	}
+
+	.balance-amount {
+		margin: 32rpx 0;
+		font-size: 76rpx;
+		font-weight: 600;
+		color: #333333;
+	}
+
+	.action-buttons {
+		display: flex;
+		gap: 100rpx;
+	}
+
+	.withdraw-btn,
+	.recharge-btn {
+		flex: 1;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 8rpx;
+		font-size: 14px;
+	}
+
+	.withdraw-btn {
+		background: #F5F5F5;
+		color: #333333;
+	}
+
+	.recharge-btn {
+		background: #FFE4BA;
+		color: #333333;
+	}
+
+	.transaction-list {
+		margin: 32rpx;
+		padding: 32rpx;
+		background: #FFFFFF;
+		border-radius: 16rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
+		min-height: 270px;
+	}
+
+	.list-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 88rpx;
+		font-size: 30rpx;
+		font-weight: 600;
+		margin-top: -16rpx;
+		border-bottom: 1px solid #F5F5F5;
+	}
+
+	.view-all {
+		display: flex;
+		align-items: center;
+		color: #999999;
+	}
+
+	.transaction-item {
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx 0;
+		border-bottom: 1px solid #eaeaea;
+	}
+
+	// .transaction-item:last-child {
+	//   border-bottom: none;
+	// }
+
+	.transaction-info {
+		display: flex;
+		flex-direction: column;
+		gap: 8rpx;
+	}
+
+	.transaction-type {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+
+	.transaction-time {
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.transaction-remark {
+		// width: 85%;
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.transaction-amount {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-end;
+		gap: 8rpx;
+	}
+
+	.amount {
+		font-size: 14px;
+		font-weight: 500;
+	}
+
+	.positive {
+		color: #07C160;
+	}
+
+	.negative {
+		color: #c73d3d;
+	}
+
+	.balance {
+		font-size: 12px;
+		color: #999999;
+		float: left;
+	}
+</style>
\ No newline at end of file