zpj 10 mesi fa
parent
commit
80cc4bd017

+ 3 - 0
src/assets/css/common.css

@@ -61,6 +61,9 @@
 .fc-755C82{
 	color: #755C82;
 }
+.fc-FFEB3B{
+	color: #FFEB3B;
+}
 
 .bg-c-EEF4FF{
 	background-color: #EEF4FF;

+ 1 - 1
src/locales/en.json

@@ -137,7 +137,7 @@
 			"text1":"My balance",
 			"text2":"Today's booking revenue",
 			"text3":"Today's team gains",
-			"text4":"Total revenue from ticket booking",
+			"text4":"Total revenue from booking",
 			"text5":"Total team revenue",
 			"text6":"Recharge Record",
 			"text7":"Withdrawal Record",

+ 1 - 1
src/views/Forestage/Me/mod/msg.vue

@@ -82,7 +82,7 @@
 						})
 						tools.success(res.msg)
 					}else{
-						this.isAJAX = fasle;
+						this.isAJAX = false;
 						tools.error(res.msg)
 					}
 				})

+ 7 - 5
src/views/Forestage/Me/mod/my-money.vue

@@ -21,7 +21,7 @@
 						<img class="img-1" src="@/assets/img/me/money.png" alt="" />
 						<div class="fs-16 fw-400">{{$t('home6.index1.text2')}}(USDT)</div>
 					</div>
-					<div class="fs-14 fw-700">{{userInfo.day_yield||''}}</div>
+					<div class="fs-14 fw-700">{{userInfo.day_yield}}</div>
 				</div>
 				<div class="box-4 justify-content-space-between align-items-center bgc-755C82 box-sizing-border-box">
 					<div class="align-items-center">
@@ -98,10 +98,12 @@
 					<div class="fs-12 fw-400 w10030 text-align-right">{{$t('home6.index1.text10')}}</div>
 				 </div>
 				 <div class="justify-content-space-between box-8 align-items-center" v-for="(item,i) in list" :key="i">
-				 	<div class="fs-12 fw-400 w280">111111</div>
-				 	<div class="fs-12 fw-400 w10020 text-align-center">200</div>
-					<div class="fs-12 fw-400 w10020 text-align-center">111</div>
-				 	<div class="fs-12 fw-400 w10030 text-align-right">2025.01.01 15:02:25</div>
+				 	<div class="fs-12 fw-400 w280">{{item.address}}</div>
+				 	<div class="fs-12 fw-400 w10020 text-align-center">{{item.withdraw_money}}</div>
+					<div v-if="item.status == 1" class="fc-c7ab7b fs-12 fw-400 w10020 text-align-center">{{item.status_str}}</div>
+					<div v-else-if="item.status == 2" class="fc-FFEB3B fs-12 fw-400 w10020 text-align-center">{{item.status_str}}</div>
+					<div v-else class="fc-f fs-12 fw-400 w10020 text-align-center">{{item.status_str}}</div>
+				 	<div class="fs-12 fw-400 w10030 text-align-right">{{item.created_at}}</div>
 				 </div>
 				 <div class="justify-right mt-16">
 				 	<div class="box-page fs-12 fw-400 fc-12 hand-cursor" @click="upPage()">{{$t('syy')}}</div>

+ 14 - 13
src/views/Forestage/Me/mod/secure.vue

@@ -33,15 +33,15 @@
 					<input v-model="email" class="input " type="text" disabled />
 				</div>
 				<div class="justify-content-space-between align-items-center mb-16">
-					<div class="fs-14 fw-400 ">{{$t('home6.index4.text5')}}</div>
+					<div class="fs-14 fw-400 w70">{{$t('home6.index4.text5')}}</div>
 					<input v-model="loginData.old_password" class="input " type="password"  />
 				</div>
 				<div class="justify-content-space-between align-items-center mb-16">
-					<div class="fs-14 fw-400 ">{{$t('home6.index4.text6')}}</div>
+					<div class="fs-14 fw-400 w70">{{$t('home6.index4.text6')}}</div>
 					<input v-model="loginData.password" class="input " type="password"  />
 				</div>
 				<div class="justify-content-space-between align-items-center mb-40">
-					<div class="fs-14 fw-400 ">{{$t('home6.index4.text7')}}</div>
+					<div class="fs-14 fw-400 w70">{{$t('home6.index4.text7')}}</div>
 					<input v-model="loginData.pass_two" class="input " type="password"  />
 				</div>
 				<div class="b-buttom hand-cursor" @click="save(1)">{{$t('home6.index4.text4')}}</div>
@@ -56,12 +56,12 @@
 			<div class="box-input box-sizing-border-box">
 				<div class="justify-content-space-between align-items-center mb-16">
 					<div class="w83 fs-14 fw-400  text-align-right">{{$t('home6.index4.text8')}}</div>
-					<input v-model="payData.pay_pass" class="input " type="text"  />
+					<input v-model="email" disabled class="input " type="text"  />
 				</div>
 				<div class="justify-content-space-between align-items-center mb-16 getCheckCode-f">
 					<div class="w83 fs-14 fw-400  text-align-right">{{$t('home6.index4.text9')}}</div>
 					<input v-model="payData.code" class="input input-1" type="text"  />
-					<getCheckCode v-model="payData.pay_pass" class="getCheckCode" :isColor='true' :type="'register'"></getCheckCode>
+					<getCheckCode v-model="email" class="getCheckCode" :isColor='true' :type="'register'"></getCheckCode>
 				</div>
 				<div class="justify-content-space-between align-items-center mb-16">
 					<div class="w83 fs-14 fw-400  text-align-right">{{$t('home6.index4.text10')}}</div>
@@ -92,15 +92,14 @@
 				setType:0,
 				email:"",
 				loginData:{
-					old_password:'',
-					password:'',
-					pass_two:'',
+					old_password:'',//旧密码
+					password:'',//新密码
+					pass_two:'',//确认密码
 				},
 				payData:{
-					pay_pass:'',
-					password:'',
-					pass_two:'',
-					code:'',
+					pay_pass:'',//密码
+					pass_two:'',//确认密码
+					code:'',//验证码
 				},
 			}
 		},
@@ -148,7 +147,6 @@
 							tools.success(res.msg)
 							this.payData = {
 								pay_pass:'',
-								password:'',
 								pass_two:'',
 								code:'',
 							},
@@ -172,6 +170,9 @@
 		
 		outline: none;
 	}
+	.w70{
+		width: 70px;
+	}
 	.secure-box{
 		width: 100%;
 		min-height: 683px;