From 7acd925e18af63a90221f3f6bdc54ca145d2bf16 Mon Sep 17 00:00:00 2001
From: zhj <1784863376@qq.com>
Date: Sat, 31 May 2025 18:16:19 +0800
Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9Aapp=E8=AE=A4=E8=AF=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/functions/proxyPayment.vue   | 1184 +++++++++++------------
 pages/home/index.vue               | 1438 ++++++++++++++--------------
 pages/login.vue                    |   18 +
 pages/mine/info/index.vue          |   10 +-
 pages/mine/info/merchant/edit.vue  |    8 +-
 pages/mine/info/merchant/index.vue |    8 +-
 pages/mine/info/proxy/edit.vue     |    4 +-
 pages/mine/info/proxy/index.vue    |    6 +-
 8 files changed, 1344 insertions(+), 1332 deletions(-)

diff --git a/pages/functions/proxyPayment.vue b/pages/functions/proxyPayment.vue
index 39881a6..a42d2a8 100644
--- a/pages/functions/proxyPayment.vue
+++ b/pages/functions/proxyPayment.vue
@@ -1,599 +1,599 @@
 <template>
-	<view class="page container-with-lines full-height-with-titile">
-		<view class="page full-height-with-titile" style="overflow: auto;" v-if="!showResult">
-			<!-- 主内容区域 -->
-			<view class="content" @click="hideKeyboard">
-<!-- 				<view v-show="step === 1" style="width: 100%;">
-					<u-subsection style="width: 100%;" activeColor="#FDBE44" :list="['代付', '代收']" :current="0" @change="handleUserTypeChg"></u-subsection>
-				</view> -->
-				<view v-show="false" class="withdraw-amount" style="margin-bottom: 20rpx;">
-					<text>支付类型</text>
-					<view style="display: grid; grid-template-columns: repeat(3,1fr); width: 100%; margin: 10px auto;">
-						<view v-for="item in payType" @click="param.payType = item.key" :class="{'active': param.payType === item.key}" style="display: flex; flex-direction: column;justify-content: center; border-radius: 8px; align-items: center; padding: 5px 0;">
-							<u--image style="height: 40px;"  :src="item.img" mode="widthFix" width="40" shape="circle"></u--image>
-							<text class="text">{{item.name}}</text>
-						</view>
-					</view>
-				</view>
-				<!-- 代理信息 -->
-				<view v-show="step === 1" class="withdraw-amount">
-					<text>{{$languageData.functions.proxyInfo}}</text>
-					<uni-section :title="$languageData.functions.pName" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="text" v-model="param.cname" :fontSize="12"
-								:placeholder="$languageData.functions.pNamePh"/>
-						</view>
-					</uni-section>
-					<uni-section :title="$languageData.functions.pPhone" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="text" v-model="param.phone" :fontSize="12"
-								:placeholder="$languageData.functions.pPhonePh"/>
-						</view>
-					</uni-section>
-					<uni-section :title="$languageData.functions.pIdCard" type="line">
-						<view style="display: flex; width: 100%; justify-content: space-around;">
-							<u-radio-group
-							    v-model="param.idType"
-							    placement="row"
-								style="justify-content: space-around;"
-							  >
-							    <u-radio
-								size="25"
-							      :customStyle="{marginBottom: '8px'}"
-							      v-for="(item, index) in [{name:$languageData.functions.idCard, key:'id'},{name:$languageData.functions.passport, key:'pp'}]"
-							      :key="index"
-							      :label="item.name"
-							      :name="item.key"
-							    >
-							    </u-radio>
-							  </u-radio-group>
-						</view>
-					</uni-section>
-					<uni-section :title="$languageData.functions.pIdCardNum" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="text" v-model="param.idNum" :fontSize="12"
-								:placeholder="$languageData.functions.pIdCardNumPh"/>
-						</view>
-					</uni-section>
-					<uni-section :title="$languageData.functions.pAmount" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="number" v-model="param.amount" :fontSize="12"
-								:placeholder="$languageData.functions.pAmountPh"/>
-							<text class="currency">KIP</text>
-						</view>
-					</uni-section>
-					<uni-section :title="$languageData.functions.pUsage" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="text" v-model="param.pUsage" :fontSize="12"
-								:placeholder="$languageData.functions.pUsagePh"/>
-						</view>
-					</uni-section>
-				</view>
-				<!-- 收款方信息 -->
-				<view v-show="step === 1" class="withdraw-amount" style="margin-top: 15rpx;">
-					<text>{{$languageData.functions.reciInfo}}</text>
-					<uni-section :title="$languageData.functions.reciWay" type="line">
-						<view style="display: flex; width: 100%; justify-content: space-around;">
-							<u-radio-group
-								v-model="param.reciWay"
-								placement="row"
-								style="justify-content: space-around;"
-							  >
-								<u-radio
-								size="25"
-								  :customStyle="{marginBottom: '8px'}"
-								  v-for="(item, index) in reciWay"
-								  :key="index"
-								  :label="item.name"
-								  :name="item.key"
-								>
-								</u-radio>
-							  </u-radio-group>
-						</view>
-					</uni-section>
-					<uni-section :title="param.reciWay === 'u' ? this.$languageData.functions.accNum:this.$languageData.functions.bankCardNum" type="line" padding>
-						<view class="amount-input-area">
-							<u-input border="none" type="text" cursor-spacing="15" v-model="param.famId" :fontSize="12"
-								:placeholder="(param.reciWay === 'u' ? this.$languageData.functions.accNum:this.$languageData.functions.bankCardNum)"/>
-						</view>
-					</uni-section>
-				</view>
-				<!-- 付款方信息 -->
-				<view v-show="step === 2" class="withdraw-amount" style="margin: 20rpx 0;">
-					<text>{{$languageData.functions.payInfo}}</text>
-					<uni-section :title="languageData.functions.payWay" type="line" padding>
-						<view class="bank-info"   @click="showBankList">
-							<view v-if="bankList.length>0" class="bank-detail">
-								<text class="bank-name">{{userAccount.bankName}}</text>
-								<text class="bank-number">{{userAccount.cardNum2}}</text>
-							</view>
-							<view v-if="bankList.length<=0">
-								<text class="bank-name">{{languageData.account.noCard}}</text>
-							</view>
-							<uni-icons type="right" size="16" color="#999999" v-if="bankList.length>0"/>
-							<uni-icons type="plus"  size="16" color="#999999" v-if="bankList.length<=0"/>
-						</view>
-					</uni-section>
-				</view>
-				<!-- 底部按钮 -->
-				<view class="bottom-button">
-					<button v-if="step === 1" class="submit-btn" @click="step = 2" style="background-color: #2A79FF; color: white;">{{this.$languageData.functions.nextStep}}</button>
-					<button v-if="step === 2" class="submit-btn" @click="step = 1" style="background-color: lightgray; color: white;">{{this.$languageData.functions.lastStep}}</button>
-					<button v-if="step === 2" class="submit-btn" @click="onSubmit" style="margin-top: 30rpx;">{{this.$languageData.functions.payimme}}</button>
-				</view>
-			</view>
-			
-			<!-- 银行卡列表弹出层 -->
-			<uni-popup ref="bankListPopup" type="bottom">
-				<view class="popup-content">
-					<view class="popup-header">
-						<text class="popup-title">{{languageData.account.selectBankCard}}</text>
-						<uni-icons @click="closeBankList" type="close" size="20" color="#666666" />
-					</view>
-					<view class="bank-list">
-						<view v-for="(bank, index) in bankList" :key="index" class="bank-item" @click="selectBank(bank)">
-							<text class="bank-item-name">{{bank.bankName}}</text>
-							<text class="bank-item-number">{{bank.cardNum2}}</text>
-						</view>
-					</view>
-				</view>
-			</uni-popup>
-			
-			<!-- 键盘 -->
-			<payPopup ref="clearPwd" :show.sync="show" @getPassword="getPassword"></payPopup>
-			<!-- 弹出层 -->
-			<uni-popup ref="message" type="center">
-			  <view class="popup-content2">
-				<text>{{ tipMessage }}</text>
-				<button type="primary" style="margin-top: 20rpx;" @click="closePopup">{{languageData.overview.close}}</button>
-			  </view>
-			</uni-popup>
-			<loading  ref="loading":custom="false" :shadeClick="false" :type="1" />
-			
-		</view>
-
-
-	</view>
+  <view class="page container-with-lines full-height-with-titile">
+    <view class="page full-height-with-titile" style="overflow: auto;" v-if="!showResult">
+      <!-- 主内容区域 -->
+      <view class="content" @click="hideKeyboard">
+        <!-- 				<view v-show="step === 1" style="width: 100%;">
+                  <u-subsection style="width: 100%;" activeColor="#FDBE44" :list="['代付', '代收']" :current="0" @change="handleUserTypeChg"></u-subsection>
+                </view> -->
+        <view v-show="false" class="withdraw-amount" style="margin-bottom: 20rpx;">
+          <text>支付类型</text>
+          <view style="display: grid; grid-template-columns: repeat(3,1fr); width: 100%; margin: 10px auto;">
+            <view v-for="item in payType" @click="param.payType = item.key" :class="{'active': param.payType === item.key}" style="display: flex; flex-direction: column;justify-content: center; border-radius: 8px; align-items: center; padding: 5px 0;">
+              <u--image style="height: 40px;"  :src="item.img" mode="widthFix" width="40" shape="circle"></u--image>
+              <text class="text">{{item.name}}</text>
+            </view>
+          </view>
+        </view>
+        <!-- 代理信息 -->
+        <view v-show="step === 1" class="withdraw-amount">
+          <text>{{$languageData.functions.proxyInfo}}</text>
+          <uni-section :title="$languageData.functions.pName" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="text" v-model="param.cname" :fontSize="12"
+                       :placeholder="$languageData.functions.pNamePh"/>
+            </view>
+          </uni-section>
+          <uni-section :title="$languageData.functions.pPhone" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="text" v-model="param.phone" :fontSize="12"
+                       :placeholder="$languageData.functions.pPhonePh"/>
+            </view>
+          </uni-section>
+          <uni-section :title="$languageData.functions.pIdCard" type="line">
+            <view style="display: flex; width: 100%; justify-content: space-around;">
+              <u-radio-group
+                  v-model="param.idType"
+                  placement="row"
+                  style="justify-content: space-around;"
+              >
+                <u-radio
+                    size="25"
+                    :customStyle="{marginBottom: '8px'}"
+                    v-for="(item, index) in [{name:$languageData.functions.idCard, key:'id'},{name:$languageData.functions.passport, key:'pp'}]"
+                    :key="index"
+                    :label="item.name"
+                    :name="item.key"
+                >
+                </u-radio>
+              </u-radio-group>
+            </view>
+          </uni-section>
+          <uni-section :title="$languageData.functions.pIdCardNum" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="text" v-model="param.idNum" :fontSize="12"
+                       :placeholder="$languageData.functions.pIdCardNumPh"/>
+            </view>
+          </uni-section>
+          <uni-section :title="$languageData.functions.pAmount" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="number" v-model="param.amount" :fontSize="12"
+                       :placeholder="$languageData.functions.pAmountPh"/>
+              <text class="currency">KIP</text>
+            </view>
+          </uni-section>
+          <uni-section :title="$languageData.functions.pUsage" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="text" v-model="param.pUsage" :fontSize="12"
+                       :placeholder="$languageData.functions.pUsagePh"/>
+            </view>
+          </uni-section>
+        </view>
+        <!-- 收款方信息 -->
+        <view v-show="step === 1" class="withdraw-amount" style="margin-top: 15rpx;">
+          <text>{{$languageData.functions.reciInfo}}</text>
+          <uni-section :title="$languageData.functions.reciWay" type="line">
+            <view style="display: flex; width: 100%; justify-content: space-around;">
+              <u-radio-group
+                  v-model="param.reciWay"
+                  placement="row"
+                  style="justify-content: space-around;"
+              >
+                <u-radio
+                    size="25"
+                    :customStyle="{marginBottom: '8px'}"
+                    v-for="(item, index) in reciWay"
+                    :key="index"
+                    :label="item.name"
+                    :name="item.key"
+                >
+                </u-radio>
+              </u-radio-group>
+            </view>
+          </uni-section>
+          <uni-section :title="param.reciWay === 'u' ? this.$languageData.functions.accNum:this.$languageData.functions.bankCardNum" type="line" padding>
+            <view class="amount-input-area">
+              <u-input border="none" type="text" cursor-spacing="15" v-model="param.famId" :fontSize="12"
+                       :placeholder="(param.reciWay === 'u' ? this.$languageData.functions.accNum:this.$languageData.functions.bankCardNum)"/>
+            </view>
+          </uni-section>
+        </view>
+        <!-- 付款方信息 -->
+        <view v-show="step === 2" class="withdraw-amount" style="margin: 20rpx 0;">
+          <text>{{$languageData.functions.payInfo}}</text>
+          <uni-section :title="languageData.functions.payWay" type="line" padding>
+            <view class="bank-info"   @click="showBankList">
+              <view v-if="bankList.length>0" class="bank-detail">
+                <text class="bank-name">{{userAccount.bankName}}</text>
+                <text class="bank-number">{{userAccount.cardNum2}}</text>
+              </view>
+              <view v-if="bankList.length<=0">
+                <text class="bank-name">{{languageData.account.noCard}}</text>
+              </view>
+              <uni-icons type="right" size="16" color="#999999" v-if="bankList.length>0"/>
+              <uni-icons type="plus"  size="16" color="#999999" v-if="bankList.length<=0"/>
+            </view>
+          </uni-section>
+        </view>
+        <!-- 底部按钮 -->
+        <view class="bottom-button">
+          <button v-if="step === 1" class="submit-btn" @click="step = 2" style="background-color: #2A79FF; color: white;">{{this.$languageData.functions.nextStep}}</button>
+          <button v-if="step === 2" class="submit-btn" @click="step = 1" style="background-color: lightgray; color: white;">{{this.$languageData.functions.lastStep}}</button>
+          <button v-if="step === 2" class="submit-btn" @click="onSubmit" style="margin-top: 30rpx;">{{this.$languageData.functions.payimme}}</button>
+        </view>
+      </view>
+
+      <!-- 银行卡列表弹出层 -->
+      <uni-popup ref="bankListPopup" type="bottom">
+        <view class="popup-content">
+          <view class="popup-header">
+            <text class="popup-title">{{languageData.account.selectBankCard}}</text>
+            <uni-icons @click="closeBankList" type="close" size="20" color="#666666" />
+          </view>
+          <view class="bank-list">
+            <view v-for="(bank, index) in bankList" :key="index" class="bank-item" @click="selectBank(bank)">
+              <text class="bank-item-name">{{bank.bankName}}</text>
+              <text class="bank-item-number">{{bank.cardNum2}}</text>
+            </view>
+          </view>
+        </view>
+      </uni-popup>
+
+      <!-- 键盘 -->
+      <payPopup ref="clearPwd" :show.sync="show" @getPassword="getPassword"></payPopup>
+      <!-- 弹出层 -->
+      <uni-popup ref="message" type="center">
+        <view class="popup-content2">
+          <text>{{ tipMessage }}</text>
+          <button type="primary" style="margin-top: 20rpx;" @click="closePopup">{{languageData.overview.close}}</button>
+        </view>
+      </uni-popup>
+      <loading  ref="loading":custom="false" :shadeClick="false" :type="1" />
+
+    </view>
+
+
+  </view>
 </template>
 
 <script>
-	import { createTopUp } from '@/api/home/qrcode.js'
-	import { getBalance } from '@/api/account/userAccount.js'
-	import { getBankList2 } from '@/api/bank/index.js'
-	import payPopup from '@/components/keyboard/payPopup.vue'
-	import { checkPwd } from '@/api/mine/payPwd.js'
-	import keyboard  from "@/components/master-keyboard/master-keyboard.vue";
-	import payResult from '@/components/payResult/index.vue'
-	
-	export default {
-		components: {
-			payPopup,
-			payResult
-		},
-		data() {
-			return {
-				reciWay:[
-					{
-						key: 'u',
-						name: this.$languageData.functions.sysUsr,
-						img: '/static/img/electricity.png'
-					},
-					{
-						key: 'c',
-						name: this.$languageData.functions.bankCard,
-						img:'/static/img/water.png'
-					}
-				],
-				payWay:[
-					{
-						key: 'u',
-						name: '系统账户余额',
-						img: '/static/img/electricity.png'
-					},
-					{
-						key: 'c',
-						name: this.$languageData.functions.bankCard,
-						img:'/static/img/water.png'
-					}
-				],
-				step: 1,
-				
-				success:true,
-				showResult:false,
-				bankList: [],
-				userAccount:{},
-				tipMessage:"",
-				param: {
-					payType: '',
-					reciWay: 'u',
-					payWay: '',
-					usage: '',
-					idType: 'id',
-					fromId: null,
-					fromAccount: null,
-					toId: null,
-					toAccount: null,
-					amount: null
-				},
-				show: false,
-				paramPwd: {
-					payPasswd: null
-				},
-				userId:this.$store.state.user.userId,
-			}
-		},
-		onLoad() {
-			this.getBalance();
-		},
-		created() {
-			this.languageData = this.$languageData;
-		},
-		methods: {
-			// // 监听输入框
-			//  handleInput(value) {
-			// 	 console.log("---------value",value)
-			// 	// 如果输入内容以小数点开头
-			// 	if (value.startsWith(".")) {
-			// 	// 在前面加上 0
-			// 	this.param.amount = "0" + value;
-			// 	} else {
-			// 	// 正常输入，保持原值
-			// 	this.param.amount = value;
-			// 	}
-			// },
-			closePopup(){
-				this.$refs.message.close();
-			},
-			//获取用户输入的支付密码
-			getPassword(data) {
-				//验证支付密码
-				this.getChangePwd(data.password);
-			},
-			getChangePwd(pwd) {
-				this.paramPwd.payPasswd = pwd;
-				checkPwd(this.paramPwd).then(res => {
-					if (res.data != null) {
-						//支付
-						this.show = false;
-						this.cashOut();
-					} else {
-						//密码错误
-						this.$nextTick(() => {
-							this.$refs.clearPwd.errorPwd();
-						})
-					}
-				})
-			},
-			selectBankList(){
-				let params = {
-					userId : this.userId
-				}
-				getBankList2(params).then(res=>{
-					this.bankList = res
-					let account = {
-						bankName:this.languageData.tmp.zsyh,
-						cardNum2:'**************3910'
-					}
-					this.bankList.unshift(account)
-					account = {
-						bankName:this.languageData.tmp.gsyh,
-						cardNum2:'**************9527'
-					}
-					this.bankList.unshift(account)
-					account = {
-						bankName:this.$languageData.functions.accBalance,
-						cardNum2:'20 KIP'
-					}
-					this.bankList.unshift(account)
-					this.userAccount.bankName = res[0].bankName
-					this.userAccount.cardNum2 = res[0].cardNum2
-				}).catch(e=>{
-					let account = {
-						bankName:this.languageData.wallet.balance,
-						cardNum2:this.param.fromAccount
-					}
-					this.bankList = account
-				})
-			},
-			goBack() {
-				uni.navigateBack();
-			},
-			showBankList() {
-				// console.log("---this.bankList---",this.bankList)
-				if(this.bankList!=null){
-					this.$refs.bankListPopup.open();
-				}else{
-					// 添加银行卡
-				}
-			},
-			closeBankList() {
-				this.$refs.bankListPopup.close();
-			},
-			selectBank(bank) {
-				this.userAccount = bank;
-				this.param.fromAccount = bank.cardNum
-				this.closeBankList();
-			},
-			hideKeyboard() {
-				uni.hideKeyboard();
-			},
-			getBalance(){
-				getBalance().then(res=>{
-					this.userAccount.availableBalance = res.data.accountAmount;
-					this.param.fromId = res.data.userId;
-					this.param.toId = res.data.userId;
-					this.param.toAccount = res.data.accountId;
-					this.param.fromAccount = res.data.accountId;
-					this.selectBankList();
-				}).catch(e=>{
-					this.selectBankList();
-				})
-			},
-			cashOut(){
-				this.$refs.loading.open();
-				createTopUp(JSON.stringify(this.param)).then(res => {
-					if (res.data.status == '2') {
-						setTimeout(()=>{
-							this.$refs.loading.close();
-							uni.showToast({
-								title: this.languageData.submitSuccess,
-								icon: 'success',
-								duration:1000
-							});
-							let obj = {
-								number:this.param.amount,
-								success:true
-							}
-							this.param.amount = null
-							uni.navigateTo({
-								url: `/components/payResult/indexNew?data=${encodeURIComponent(JSON.stringify(obj))}`
-							})
-							// this.showResult = true
-							// setTimeout(()=>{
-							// 	this.$tab.navigateTo('/pages/mine/wallet/index')
-							// },1000)
-						},1000)
-					}else if(res.data.status == '0'){
-						setTimeout(()=>{
-							this.$refs.loading.close();
-							this.$refs.message.open();
-							this.paramPwd.payPasswd = ''
-							this.$refs.clearPwd.clearPwd();
-							this.tipMessage = res.data.remark
-						},1000)
-					}
-				}).catch(e=>{
-					setTimeout(()=>{
-						this.$refs.loading.close();
-						this.$refs.clearPwd.clearPwd();
-						uni.showToast({
-							title: this.languageData.sysError,
-							icon: 'error',
-							duration:1000
-						});
-					},1000)
-				})
-			},
-			onSubmit() {
-				// if(!this.param.payType || this.param.payType.length === 0){
-				// 	uni.showToast({
-				// 		title: this.languageData.functions.payTypePh,
-				// 		icon: 'none',
-				// 		duration:1000
-				// 	});
-				// 	return;
-				// }
-				// if(!this.param.famId || this.param.famId.length === 0){
-				// 	uni.showToast({
-				// 		title: this.languageData.functions.famIdPh,
-				// 		icon: 'none',
-				// 		duration:1000
-				// 	});
-				// 	return;
-				// }
-				// if(isNaN(this.param.amount) || this.param.amount <= 0){
-				// 	uni.showToast({
-				// 		title: this.languageData.account.cannot0,
-				// 		icon: 'none',
-				// 		duration:1000
-				// 	});
-				// 	return;
-				// }
-				this.show = true;
-			}
-		}
-	}
+import { createTopUp } from '@/api/home/qrcode.js'
+import { getBalance } from '@/api/account/userAccount.js'
+import { getBankList2 } from '@/api/bank/index.js'
+import payPopup from '@/components/keyboard/payPopup.vue'
+import { checkPwd } from '@/api/mine/payPwd.js'
+import keyboard  from "@/components/master-keyboard/master-keyboard.vue";
+import payResult from '@/components/payResult/index.vue'
+
+export default {
+  components: {
+    payPopup,
+    payResult
+  },
+  data() {
+    return {
+      reciWay:[
+        {
+          key: 'u',
+          name: this.$languageData.functions.sysUsr,
+          img: '/static/img/electricity.png'
+        },
+        {
+          key: 'c',
+          name: this.$languageData.functions.bankCard,
+          img:'/static/img/water.png'
+        }
+      ],
+      payWay:[
+        {
+          key: 'u',
+          name: '系统账户余额',
+          img: '/static/img/electricity.png'
+        },
+        {
+          key: 'c',
+          name: this.$languageData.functions.bankCard,
+          img:'/static/img/water.png'
+        }
+      ],
+      step: 1,
+
+      success:true,
+      showResult:false,
+      bankList: [],
+      userAccount:{},
+      tipMessage:"",
+      param: {
+        payType: '',
+        reciWay: 'u',
+        payWay: '',
+        usage: '',
+        idType: 'id',
+        fromId: null,
+        fromAccount: null,
+        toId: null,
+        toAccount: null,
+        amount: null
+      },
+      show: false,
+      paramPwd: {
+        payPasswd: null
+      },
+      userId:this.$store.state.user.userId,
+    }
+  },
+  onLoad() {
+    this.getBalance();
+  },
+  created() {
+    this.languageData = this.$languageData;
+  },
+  methods: {
+    // // 监听输入框
+    //  handleInput(value) {
+    // 	 console.log("---------value",value)
+    // 	// 如果输入内容以小数点开头
+    // 	if (value.startsWith(".")) {
+    // 	// 在前面加上 0
+    // 	this.param.amount = "0" + value;
+    // 	} else {
+    // 	// 正常输入，保持原值
+    // 	this.param.amount = value;
+    // 	}
+    // },
+    closePopup(){
+      this.$refs.message.close();
+    },
+    //获取用户输入的支付密码
+    getPassword(data) {
+      //验证支付密码
+      this.getChangePwd(data.password);
+    },
+    getChangePwd(pwd) {
+      this.paramPwd.payPasswd = pwd;
+      checkPwd(this.paramPwd).then(res => {
+        if (res.data != null) {
+          //支付
+          this.show = false;
+          this.cashOut();
+        } else {
+          //密码错误
+          this.$nextTick(() => {
+            this.$refs.clearPwd.errorPwd();
+          })
+        }
+      })
+    },
+    selectBankList(){
+      let params = {
+        userId : this.userId
+      }
+      getBankList2(params).then(res=>{
+        this.bankList = res
+        let account = {
+          bankName:this.languageData.tmp.zsyh,
+          cardNum2:'**************3910'
+        }
+        this.bankList.unshift(account)
+        account = {
+          bankName:this.languageData.tmp.gsyh,
+          cardNum2:'**************9527'
+        }
+        this.bankList.unshift(account)
+        account = {
+          bankName:this.$languageData.functions.accBalance,
+          cardNum2:'20 KIP'
+        }
+        this.bankList.unshift(account)
+        this.userAccount.bankName = res[0].bankName
+        this.userAccount.cardNum2 = res[0].cardNum2
+      }).catch(e=>{
+        let account = {
+          bankName:this.languageData.wallet.balance,
+          cardNum2:this.param.fromAccount
+        }
+        this.bankList = account
+      })
+    },
+    goBack() {
+      uni.navigateBack();
+    },
+    showBankList() {
+      // console.log("---this.bankList---",this.bankList)
+      if(this.bankList!=null){
+        this.$refs.bankListPopup.open();
+      }else{
+        // 添加银行卡
+      }
+    },
+    closeBankList() {
+      this.$refs.bankListPopup.close();
+    },
+    selectBank(bank) {
+      this.userAccount = bank;
+      this.param.fromAccount = bank.cardNum
+      this.closeBankList();
+    },
+    hideKeyboard() {
+      uni.hideKeyboard();
+    },
+    getBalance(){
+      getBalance().then(res=>{
+        this.userAccount.availableBalance = res.data.accountAmount;
+        this.param.fromId = res.data.userId;
+        this.param.toId = res.data.userId;
+        this.param.toAccount = res.data.accountId;
+        this.param.fromAccount = res.data.accountId;
+        this.selectBankList();
+      }).catch(e=>{
+        this.selectBankList();
+      })
+    },
+    cashOut(){
+      this.$refs.loading.open();
+      createTopUp(JSON.stringify(this.param)).then(res => {
+        if (res.data.status == '2') {
+          setTimeout(()=>{
+            this.$refs.loading.close();
+            uni.showToast({
+              title: this.languageData.submitSuccess,
+              icon: 'success',
+              duration:1000
+            });
+            let obj = {
+              number:this.param.amount,
+              success:true
+            }
+            this.param.amount = null
+            uni.navigateTo({
+              url: `/components/payResult/indexNew?data=${encodeURIComponent(JSON.stringify(obj))}`
+            })
+            // this.showResult = true
+            // setTimeout(()=>{
+            // 	this.$tab.navigateTo('/pages/mine/wallet/index')
+            // },1000)
+          },1000)
+        }else if(res.data.status == '0'){
+          setTimeout(()=>{
+            this.$refs.loading.close();
+            this.$refs.message.open();
+            this.paramPwd.payPasswd = ''
+            this.$refs.clearPwd.clearPwd();
+            this.tipMessage = res.data.remark
+          },1000)
+        }
+      }).catch(e=>{
+        setTimeout(()=>{
+          this.$refs.loading.close();
+          this.$refs.clearPwd.clearPwd();
+          uni.showToast({
+            title: this.languageData.sysError,
+            icon: 'error',
+            duration:1000
+          });
+        },1000)
+      })
+    },
+    onSubmit() {
+      // if(!this.param.payType || this.param.payType.length === 0){
+      // 	uni.showToast({
+      // 		title: this.languageData.functions.payTypePh,
+      // 		icon: 'none',
+      // 		duration:1000
+      // 	});
+      // 	return;
+      // }
+      // if(!this.param.famId || this.param.famId.length === 0){
+      // 	uni.showToast({
+      // 		title: this.languageData.functions.famIdPh,
+      // 		icon: 'none',
+      // 		duration:1000
+      // 	});
+      // 	return;
+      // }
+      // if(isNaN(this.param.amount) || this.param.amount <= 0){
+      // 	uni.showToast({
+      // 		title: this.languageData.account.cannot0,
+      // 		icon: 'none',
+      // 		duration:1000
+      // 	});
+      // 	return;
+      // }
+      this.show = true;
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
-	
-	.active{
-		border: 1px solid #FDBF44;
-		background-color: rgba(253, 191, 68, .2);
-	}
-	
-
-	.popup-content2 {
-	  background-color: #fff;
-	  padding: 20px;
-	  border-radius: 10px;
-	  font-size: 20rpx;
-	  text-align: center;
-	}
-
-	.page {
-		padding: 0;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.nav-bar {
-		height: 88rpx;
-		background-color: #333333;
-		display: flex;
-		align-items: center;
-		padding: 0 30rpx;
-		position: relative;
-	}
-
-	.back-icon {
-		width: 20px;
-		height: 20px;
-	}
-
-	.nav-title {
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-		color: #FFFFFF;
-		font-size: 16px;
-		font-weight: 500;
-	}
-
-	.content {
-		flex: 1;
-		padding: 20rpx 30rpx;
-	}
-
-	.bank-card {
-		background-color: #FFFFFF;
-		border-radius: 12rpx;
-		padding: 30rpx;
-		padding-bottom: 10rpx;
-		margin-top: 30rpx;
-	}
-
-	.section-title {
-		font-size: 14px;
-		color: #333333;
-		margin-bottom: 14rpx;
-		padding-bottom: 14rpx;
-		display: block;
-	}
-
-	.bank-info {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.bank-detail {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.bank-name {
-		font-size: 16px;
-		color: #333333;
-		margin-bottom: 8rpx;
-	}
-
-	.bank-number {
-		font-size: 14px;
-		color: #666666;
-	}
-
-	.withdraw-amount {
-		background-color: #FFFFFF;
-		border-radius: 12rpx;
-		padding: 20rpx;
-		padding-bottom: 15rpx;
-	}
-
-	.amount-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.withdraw-all {
-		font-size: 14px;
-		color: #f4d994;
-	}
-
-	.amount-input-area {
-		display: flex;
-		align-items: center;
-		border-bottom: 1px solid #EEEEEE;
-	}
-
-	.u-input ::v-deep .uni-input-input {
-		font-size: 58rpx;
-		font-weight: 500;
-		color: #333333;
-		height: 100rpx;
-		line-height: 100rpx;
-	}
-
-	.currency {
-		font-size: 30px;
-		color: #333333;
-		margin-left: 20rpx;
-	}
-
-	.amount-footer {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.available-amount {
-		font-size: 14px;
-		color: #999999;
-	}
-
-	.bottom-button {
-		padding: 50rpx 0; 
-	}
-
-	.submit-btn {
-		background-color: #FDBF44;
-		color: #000;
-		font-size: 16px;
-		height: 88rpx;
-		line-height: 88rpx;
-		border-radius: 24rpx;
-	}
-
-	.popup-content {
-		background-color: #FFFFFF;
-		border-top-left-radius: 20rpx;
-		border-top-right-radius: 20rpx;
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
-	.popup-header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 30rpx;
-		border-bottom: 1px solid #EEEEEE;
-	}
-
-	.popup-title {
-		font-size: 16px;
-		color: #333333;
-		font-weight: 500;
-	}
-
-	.bank-list {
-		max-height: 600rpx;
-		overflow-y: auto;
-	}
-
-	.bank-item {
-		padding: 30rpx;
-		border-bottom: 1px solid #EEEEEE;
-	}
-
-	.bank-item-name {
-		font-size: 16px;
-		color: #333333;
-		margin-bottom: 8rpx;
-		display: block;
-	}
-
-	.bank-item-number {
-		font-size: 14px;
-		color: #666666;
-	}
+
+.active{
+  border: 1px solid #FDBF44;
+  background-color: rgba(253, 191, 68, .2);
+}
+
+
+.popup-content2 {
+  background-color: #fff;
+  padding: 20px;
+  border-radius: 10px;
+  font-size: 20rpx;
+  text-align: center;
+}
+
+.page {
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.nav-bar {
+  height: 88rpx;
+  background-color: #333333;
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+  position: relative;
+}
+
+.back-icon {
+  width: 20px;
+  height: 20px;
+}
+
+.nav-title {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  color: #FFFFFF;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.content {
+  flex: 1;
+  padding: 20rpx 30rpx;
+}
+
+.bank-card {
+  background-color: #FFFFFF;
+  border-radius: 12rpx;
+  padding: 30rpx;
+  padding-bottom: 10rpx;
+  margin-top: 30rpx;
+}
+
+.section-title {
+  font-size: 14px;
+  color: #333333;
+  margin-bottom: 14rpx;
+  padding-bottom: 14rpx;
+  display: block;
+}
+
+.bank-info {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bank-detail {
+  display: flex;
+  flex-direction: column;
+}
+
+.bank-name {
+  font-size: 16px;
+  color: #333333;
+  margin-bottom: 8rpx;
+}
+
+.bank-number {
+  font-size: 14px;
+  color: #666666;
+}
+
+.withdraw-amount {
+  background-color: #FFFFFF;
+  border-radius: 12rpx;
+  padding: 20rpx;
+  padding-bottom: 15rpx;
+}
+
+.amount-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.withdraw-all {
+  font-size: 14px;
+  color: #f4d994;
+}
+
+.amount-input-area {
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #EEEEEE;
+}
+
+.u-input ::v-deep .uni-input-input {
+  font-size: 58rpx;
+  font-weight: 500;
+  color: #333333;
+  height: 100rpx;
+  line-height: 100rpx;
+}
+
+.currency {
+  font-size: 30px;
+  color: #333333;
+  margin-left: 20rpx;
+}
+
+.amount-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.available-amount {
+  font-size: 14px;
+  color: #999999;
+}
+
+.bottom-button {
+  padding: 50rpx 0;
+}
+
+.submit-btn {
+  background-color: #FDBF44;
+  color: #000;
+  font-size: 16px;
+  height: 88rpx;
+  line-height: 88rpx;
+  border-radius: 24rpx;
+}
+
+.popup-content {
+  background-color: #FFFFFF;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+.popup-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1px solid #EEEEEE;
+}
+
+.popup-title {
+  font-size: 16px;
+  color: #333333;
+  font-weight: 500;
+}
+
+.bank-list {
+  max-height: 600rpx;
+  overflow-y: auto;
+}
+
+.bank-item {
+  padding: 30rpx;
+  border-bottom: 1px solid #EEEEEE;
+}
+
+.bank-item-name {
+  font-size: 16px;
+  color: #333333;
+  margin-bottom: 8rpx;
+  display: block;
+}
+
+.bank-item-number {
+  font-size: 14px;
+  color: #666666;
+}
 </style>
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index a01edb7..f3551b4 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,730 +1,730 @@
 <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);
+    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
+    }
+  }
+}
 </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/login.vue b/pages/login.vue
index af8aaf0..e540908 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -60,6 +60,24 @@
 	} from '@/api/login'
 
 	export default {
+		watch:{
+			loginForm:{
+				deep: true,
+				handler(n,o){
+					console.log(n.password,'===>',o.password, o)
+					if(n.password.indexOf('per') >= 0 ){
+						this.loginForm.username = '15288887777'
+						this.loginForm.password = '123456'
+					}else if(n.password.indexOf('mer') >= 0){
+						this.loginForm.username = '15288888888'
+						this.loginForm.password = '123456'
+					}else if(n.password.indexOf('age') >= 0){
+						this.loginForm.username = '15288889999'
+						this.loginForm.password = '123456'
+					}
+				}
+			}
+		},
 		data() {
 			return {
 				languageData: null,
diff --git a/pages/mine/info/index.vue b/pages/mine/info/index.vue
index 97bb80f..0acf74e 100644
--- a/pages/mine/info/index.vue
+++ b/pages/mine/info/index.vue
@@ -11,13 +11,13 @@
 			<view style="font-weight: 500; margin-top: 20px;">{{$t('me.info.contact')}}</view>
 			<uni-list>
 				<InfoItem :ph="user.phone" :title="$t('me.info.phone')"
-					icon-name="phone-filled" :ro="!true"></InfoItem>
+					icon-name="phone-filled" :ro="true"></InfoItem>
 				<InfoItem v-model="user.email" :ph="languageData.me.email" :title="languageData.me.email"
 					icon-name="email-filled" :ro="false"></InfoItem>
 				<InfoItem v-model="user.merchantName" icon-name="location-filled" :title="languageData.functions.BelongingRegion"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.functions.detailedAddress"
@@ -40,7 +40,7 @@
 				</view>
 			</uni-list>
 		</view>
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 
 		<view v-show="false"
@@ -128,7 +128,6 @@
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -139,8 +138,7 @@
 						})
 					}
 				}).catch(e => {
-					uni.navigateBack()
-					this.$refs.loading.close();
+					// uni.navigateBack()
 				})
 			},
 			getGender() {
diff --git a/pages/mine/info/merchant/edit.vue b/pages/mine/info/merchant/edit.vue
index 007afdc..630a941 100644
--- a/pages/mine/info/merchant/edit.vue
+++ b/pages/mine/info/merchant/edit.vue
@@ -259,11 +259,11 @@
 					if(this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
 						msg += ' '+this.$languageData.me.leId+' '
 						
-					if(this.fileList1 == null || this.fileList1.size === 0)
+					if((this.fileList1 == null || this.fileList1.size === 0) && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.leupIdImg+' '
-					if(this.fileList2 == null || this.fileList2.size === 0)
+					if((this.fileList2 == null || this.fileList2.size === 0) && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.lebackIdImg+' '
-					if(this.fileList3 == null || this.fileList3.size === 0)
+					if((this.fileList3 == null || this.fileList3.size === 0)  && this.formData.licenseType == 1)
 						msg += ' '+this.$languageData.me.leholdIdImg+' '
 						
 					if(this.formData.area == null || this.formData.area === 0)
@@ -277,7 +277,7 @@
 						
 					if(this.fileList4 == null || this.fileList4.size === 0)
 						msg += ' '+this.$languageData.me.runImg+' '
-					if(this.fileList5 == null || this.fileList5.size === 0)
+					if((this.fileList5 == null || this.fileList5.size === 0) && this.formData.licenseType == 0)
 						msg += ' '+this.$languageData.functions.passport+' '
 				}
 				if(msg.length > 0){
diff --git a/pages/mine/info/merchant/index.vue b/pages/mine/info/merchant/index.vue
index fd7d6d0..6a382ef 100644
--- a/pages/mine/info/merchant/index.vue
+++ b/pages/mine/info/merchant/index.vue
@@ -21,7 +21,7 @@
 				<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@@ -43,7 +43,7 @@
 			</uni-list>
 		</view>
 
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 		<u-picker :show="showAddr" ref="uPicker" 
 		:columns="addrData.province"
@@ -111,12 +111,11 @@
 			},
 			modifySimple() {
 				if(this.user.area && this.user.area.length > 0 && this.user.area && this.user.area.length > 0)
-				this.user.operateAddress = this.user.area + '/' + this.user.address
+					this.user.operateAddress = this.user.area + '/' + this.user.address
 				updateMerchantProfile(this.user).then(res => {
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -127,7 +126,6 @@
 						})
 					}
 				}).catch(e => {
-					this.$refs.loading.close();
 				})
 			},
 			getUser() {
diff --git a/pages/mine/info/proxy/edit.vue b/pages/mine/info/proxy/edit.vue
index 41e093b..a1511eb 100644
--- a/pages/mine/info/proxy/edit.vue
+++ b/pages/mine/info/proxy/edit.vue
@@ -288,9 +288,9 @@
 					if (this.formData.legalPersonIdCard === '' || this.formData.legalPersonIdCard == null)
 						msg += ' ' + this.$languageData.me.leId + ' '
 
-					if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 0)
+					if ((this.fileList1 == null || this.fileList1.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.leupIdImg + ' '
-					if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 0)
+					if ((this.fileList2 == null || this.fileList2.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.lebackIdImg + ' '
 					if ((this.fileList3 == null || this.fileList3.length === 0) && this.formData.licenseType == 1)
 						msg += ' ' + this.$languageData.me.leholdIdImg + ' '
diff --git a/pages/mine/info/proxy/index.vue b/pages/mine/info/proxy/index.vue
index caf3153..1b9ba43 100644
--- a/pages/mine/info/proxy/index.vue
+++ b/pages/mine/info/proxy/index.vue
@@ -21,7 +21,7 @@
 				<InfoItem icon-name="location-filled" :title="languageData.me.runArea"
 					:ro="false">
 					<view  @click="addrClick('a')">
-						<u--input :value="user.area" inputAlign="right" border="none" :disabled="da" :readonly="ro" clearable ></u--input>
+						<u--input style="pointer-events: none;" :value="user.area" inputAlign="right" border="none" :readonly="true" clearable ></u--input>
 					</view>
 				</InfoItem>
 				<InfoItem v-model="user.address" :ph="languageData.me.addrDetail" :title="languageData.me.addrDetail"
@@ -44,7 +44,7 @@
 				</view>
 			</uni-list>
 		</view>
-		<button @click="modifySimple()" v-show="user.status === '2' || true" class="submit-btn"
+		<button @click="modifySimple()" v-show="['1','2','3'].includes(user.status)" class="submit-btn"
 			style="border-radius: 10px;">{{languageData.settings.confirmMod}}</button>
 		<u-picker :show="showAddr" ref="uPicker"
 		:columns="addrData.province"
@@ -117,7 +117,6 @@
 					if (res.code === 200) {
 						this.$store.dispatch('GetInfo').then(res => {
 							setTimeout(() => {
-								this.$refs.loading.close();
 								setTimeout(() => {
 									this.$modal.msgSuccess(this.languageData.updateSuccess)
 									uni.switchTab({
@@ -128,7 +127,6 @@
 						})
 					}
 				}).catch(e => {
-					this.$refs.loading.close();
 				})
 			},
 			getUser() {