Browse Source

no message

DESKTOP-70VPDLK\Administrator 1 year ago
parent
commit
8587262481
3 changed files with 35 additions and 31 deletions
  1. 14 14
      src/locales/en.json
  2. 5 1
      src/utils/request.js
  3. 16 16
      src/views/Forestage/Me/mod/my-money.vue

+ 14 - 14
src/locales/en.json

@@ -1,4 +1,4 @@
-{	
+{
 	"Home":"Home",
 	"Home":"Home",
 	"Tourism":"Travel",
 	"Tourism":"Travel",
 	"Team":"Team",
 	"Team":"Team",
@@ -35,7 +35,7 @@
 		  "qdl":"log In",
 		  "qdl":"log In",
 		  "zc":"Sign Up"
 		  "zc":"Sign Up"
 	},
 	},
-	
+
 	"home":{
 	"home":{
 		  "text1":"Global Merchant Center Internet Platform",
 		  "text1":"Global Merchant Center Internet Platform",
 		  "text2":"Book tickets and browse popular travel attractions around the world",
 		  "text2":"Book tickets and browse popular travel attractions around the world",
@@ -67,7 +67,7 @@
 		  "text28":"Users who Sign up through the invitation code of C team members will become your D-level team members. When they receive income, you will receive additional team income, which will be 20% of the income of your D-level team members",
 		  "text28":"Users who Sign up through the invitation code of C team members will become your D-level team members. When they receive income, you will receive additional team income, which will be 20% of the income of your D-level team members",
 		  "text29":"Users who Sign up through the invitation code of D team members will become your E-level team members. When they receive income, you will receive additional team income, which will be 10% of the income of your E-level team members"
 		  "text29":"Users who Sign up through the invitation code of D team members will become your E-level team members. When they receive income, you will receive additional team income, which will be 10% of the income of your E-level team members"
 	},
 	},
-	
+
 	"home2":{
 	"home2":{
 		  "text1":"Travel Plans"
 		  "text1":"Travel Plans"
 	},
 	},
@@ -89,7 +89,7 @@
 		  "text15":"Your E-Level Team Members",
 		  "text15":"Your E-Level Team Members",
 		  "text16":"Users who register through your team's D-level member invitation code will become your E-level team members. When they earn from booking tickets, you will receive additional team income. The fifth-level team income is 10% of the daily ticket booking income of team B members. For example, user E participates in daily bookings and earns 1,000 USDT. Then you will automatically receive additional team income of 100 USDT"
 		  "text16":"Users who register through your team's D-level member invitation code will become your E-level team members. When they earn from booking tickets, you will receive additional team income. The fifth-level team income is 10% of the daily ticket booking income of team B members. For example, user E participates in daily bookings and earns 1,000 USDT. Then you will automatically receive additional team income of 100 USDT"
 	},
 	},
-	
+
 	"home4":{
 	"home4":{
 		  "text1":"USDT  How to deposit USDT",
 		  "text1":"USDT  How to deposit USDT",
 		  "text2":"Buy USDT",
 		  "text2":"Buy USDT",
@@ -123,7 +123,7 @@
 		  "text18":"Submit",
 		  "text18":"Submit",
 		  "text19":"Please confirm whether the wallet address network for receiving USDT is consistent with the withdrawal network. If the withdrawal information is inconsistent, the deposited assets will be lost and cannot be retrieved. In order to ensure smooth network channels and avoid network congestion, the platform withdrawal adopts the D+1 mode. Any funds withdrawn will be reviewed and approved and completed the next day."
 		  "text19":"Please confirm whether the wallet address network for receiving USDT is consistent with the withdrawal network. If the withdrawal information is inconsistent, the deposited assets will be lost and cannot be retrieved. In order to ensure smooth network channels and avoid network congestion, the platform withdrawal adopts the D+1 mode. Any funds withdrawn will be reviewed and approved and completed the next day."
 	},
 	},
-	
+
 	"home6":{
 	"home6":{
 		"nav0":"Account",
 		"nav0":"Account",
 		"nav1":"Assets",
 		"nav1":"Assets",
@@ -132,13 +132,13 @@
 		"nav4":"Security",
 		"nav4":"Security",
 		"nav5":"Notice",
 		"nav5":"Notice",
 		"nav6":"About Us",
 		"nav6":"About Us",
-		
+
 		"index1":{
 		"index1":{
-			"text1":"My balance(USDT)",
-			"text2":"Today's income (USDT)",
-			"text3":"Today's team income (USDT)",
-			"text4":"Total booking income (USDT)",
-			"text5":"Total team income (USDT)",
+			"text1":"My balance",
+			"text2":"Today's income ",
+			"text3":"Today's team income ",
+			"text4":"Total booking income ",
+			"text5":"Total team income ",
 			"text6":"Deposit history",
 			"text6":"Deposit history",
 			"text7":"Withdrawal history",
 			"text7":"Withdrawal history",
 			"text8":"Wallet Address",
 			"text8":"Wallet Address",
@@ -157,13 +157,13 @@
 		"index3":{
 		"index3":{
 			"text1":"Send"
 			"text1":"Send"
 		},
 		},
-		
+
 		"index5":{
 		"index5":{
 			"text1":"Notice",
 			"text1":"Notice",
 			"text2":"View",
 			"text2":"View",
 			"text3":"Details"
 			"text3":"Details"
 		},
 		},
-		
+
 		"index4":{
 		"index4":{
 			"text1":"Login password",
 			"text1":"Login password",
 			"text2":"Withdrawal password",
 			"text2":"Withdrawal password",
@@ -178,4 +178,4 @@
 			"text11":"Withdrawal password again"
 			"text11":"Withdrawal password again"
 		}
 		}
 	}
 	}
-}
+}

+ 5 - 1
src/utils/request.js

@@ -87,7 +87,11 @@ function endLoading() {
 
 
 const request = (url, method = 'get', data, isLoading = false) => {
 const request = (url, method = 'get', data, isLoading = false) => {
   const config = {}
   const config = {}
-  data.lang=localStorage.getItem('lang')==='cn'?'zh-Hant':'en';
+  if (!data){
+    data={}
+  }
+  let lang = localStorage.getItem('lang') || 'cn'
+  data.lang=lang==='cn'?'zh-Hant':'en';
   if (data) {
   if (data) {
     if (method === 'get') {
     if (method === 'get') {
       config.params = data
       config.params = data

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

@@ -13,7 +13,7 @@
 			<div class="box-2 bgc-755C82 box-sizing-border-box fw-500 fs-16">{{$t('home6.nav1')}}</div>
 			<div class="box-2 bgc-755C82 box-sizing-border-box fw-500 fs-16">{{$t('home6.nav1')}}</div>
 			<div class="box-3 bgc-755C82 box-sizing-border-box">
 			<div class="box-3 bgc-755C82 box-sizing-border-box">
 				<div class="fs-16 fw-400 mb-16">{{$t('home6.index1.text1')}}(USDT)</div>
 				<div class="fs-16 fw-400 mb-16">{{$t('home6.index1.text1')}}(USDT)</div>
-				<div class="fs-20 fw-700">{{userInfo.money||"0"}}</div>
+				<div class="fs-20 fw-700">{{(userInfo.money*1).toFixed(2)||"0.00"}}</div>
 			</div>
 			</div>
 			<div class="justify-content-space-between">
 			<div class="justify-content-space-between">
 				<div class="box-4 justify-content-space-between align-items-center right-border box-sizing-border-box bgc-755C82">
 				<div class="box-4 justify-content-space-between align-items-center right-border box-sizing-border-box bgc-755C82">
@@ -21,14 +21,14 @@
 						<img class="img-1" src="@/assets/img/me/money.png" alt="" />
 						<img class="img-1" src="@/assets/img/me/money.png" alt="" />
 						<div class="fs-16 fw-400">{{$t('home6.index1.text2')}}(USDT)</div>
 						<div class="fs-16 fw-400">{{$t('home6.index1.text2')}}(USDT)</div>
 					</div>
 					</div>
-					<div class="fs-14 fw-700">{{userInfo.day_yield}}</div>
+					<div class="fs-14 fw-700">{{(userInfo.day_yield*1).toFixed(2)}}</div>
 				</div>
 				</div>
 				<div class="box-4 justify-content-space-between align-items-center bgc-755C82 box-sizing-border-box">
 				<div class="box-4 justify-content-space-between align-items-center bgc-755C82 box-sizing-border-box">
 					<div class="align-items-center">
 					<div class="align-items-center">
 						<img class="img-2" src="@/assets/img/me/user.png" alt="" />
 						<img class="img-2" src="@/assets/img/me/user.png" alt="" />
 						<div class="fs-16 fw-400">{{$t('home6.index1.text3')}}(USDT)</div>
 						<div class="fs-16 fw-400">{{$t('home6.index1.text3')}}(USDT)</div>
 					</div>
 					</div>
-					<div class="fs-14 fw-700">{{userInfo.day_team}}</div>
+					<div class="fs-14 fw-700">{{(userInfo.day_team*1).toFixed(2)}}</div>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="justify-content-space-between">
 			<div class="justify-content-space-between">
@@ -37,14 +37,14 @@
 						<img class="img-1" src="@/assets/img/me/money.png" alt="" />
 						<img class="img-1" src="@/assets/img/me/money.png" alt="" />
 						<div class="fs-16 fw-400">{{$t('home6.index1.text4')}}(USDT)</div>
 						<div class="fs-16 fw-400">{{$t('home6.index1.text4')}}(USDT)</div>
 					</div>
 					</div>
-					<div class="fs-14 fw-700">{{userInfo.order_yield}}</div>
+					<div class="fs-14 fw-700">{{(userInfo.order_yield*1).toFixed(2)}}</div>
 				</div>
 				</div>
 				<div class="box-4 justify-content-space-between align-items-center bgc-755C82 box-sizing-border-box">
 				<div class="box-4 justify-content-space-between align-items-center bgc-755C82 box-sizing-border-box">
 					<div class="align-items-center">
 					<div class="align-items-center">
 						<img class="img-2" src="@/assets/img/me/user.png" alt="" />
 						<img class="img-2" src="@/assets/img/me/user.png" alt="" />
 						<div class="fs-16 fw-400">{{$t('home6.index1.text5')}}(USDT)</div>
 						<div class="fs-16 fw-400">{{$t('home6.index1.text5')}}(USDT)</div>
 					</div>
 					</div>
-					<div class="fs-14 fw-700">{{userInfo.order_team}}</div>
+					<div class="fs-14 fw-700">{{(userInfo.order_team*1).toFixed(2)}}</div>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="justify-content-space-between">
 			<div class="justify-content-space-between">
@@ -58,7 +58,7 @@
 				</div>
 				</div>
 			</div>
 			</div>
 		</div>
 		</div>
-		
+
 		<div v-if="indexType == 1" class="index-card bgc-755C82 wow animate__animated animate__bounceInRight">
 		<div v-if="indexType == 1" class="index-card bgc-755C82 wow animate__animated animate__bounceInRight">
 			<div class="box-6 align-items-center hand-cursor" @click="toIndex(0)">
 			<div class="box-6 align-items-center hand-cursor" @click="toIndex(0)">
 				<img src="@/assets/img/lang-icon.png" alt="" />
 				<img src="@/assets/img/lang-icon.png" alt="" />
@@ -81,9 +81,9 @@
 					<div class="box-page fs-12 fw-400 fc-12 hand-cursor" @click="downPage()">{{$t('xyy')}}</div>
 					<div class="box-page fs-12 fw-400 fc-12 hand-cursor" @click="downPage()">{{$t('xyy')}}</div>
 				 </div>
 				 </div>
 			</div>
 			</div>
-			
+
 		</div>
 		</div>
-		
+
 		<div v-if="indexType == 2" class="index-card bgc-755C82 wow animate__animated animate__bounceInRight">
 		<div v-if="indexType == 2" class="index-card bgc-755C82 wow animate__animated animate__bounceInRight">
 			<div class="box-6 align-items-center hand-cursor" @click="toIndex(0)">
 			<div class="box-6 align-items-center hand-cursor" @click="toIndex(0)">
 				<img src="@/assets/img/lang-icon.png" alt="" />
 				<img src="@/assets/img/lang-icon.png" alt="" />
@@ -111,16 +111,16 @@
 				 </div>
 				 </div>
 			</div>
 			</div>
 		</div>
 		</div>
-				
+
 	</div>
 	</div>
 </template>
 </template>
 
 
 <script>
 <script>
 	import {getchargelist} from '@/api/money.js';
 	import {getchargelist} from '@/api/money.js';
 	import {getwithdrawList} from '@/api/withdraw.js';
 	import {getwithdrawList} from '@/api/withdraw.js';
-	
+
 	import {userInfo} from '@/api/member.js';
 	import {userInfo} from '@/api/member.js';
-	
+
 	import tools from '@/utils/tools.js';
 	import tools from '@/utils/tools.js';
 	export default {
 	export default {
 		name:"my-money",
 		name:"my-money",
@@ -133,7 +133,7 @@
 				userInfo:{},
 				userInfo:{},
 			}
 			}
 		},
 		},
-		mounted() {	
+		mounted() {
 			this.getInfo();
 			this.getInfo();
 		},
 		},
 		methods:{
 		methods:{
@@ -211,7 +211,7 @@
 			width: 100%;
 			width: 100%;
 			min-height: 683px;
 			min-height: 683px;
 		}
 		}
-		
+
 		.box-1{
 		.box-1{
 			width: 100%;
 			width: 100%;
 			height: 140px;
 			height: 140px;
@@ -239,7 +239,7 @@
 			width: 50%;
 			width: 50%;
 			padding: 37px 40px;
 			padding: 37px 40px;
 			border-bottom: 1px solid #C1B5C5;
 			border-bottom: 1px solid #C1B5C5;
-			
+
 		}
 		}
 		.right-border{
 		.right-border{
 			border-right: 1px solid #C1B5C5;
 			border-right: 1px solid #C1B5C5;
@@ -264,7 +264,7 @@
 			width: 50%;
 			width: 50%;
 			padding: 48px 0;
 			padding: 48px 0;
 		}
 		}
-		
+
 		.box-6{
 		.box-6{
 			height: 54px;
 			height: 54px;
 			padding: 0 43px;
 			padding: 0 43px;
@@ -293,4 +293,4 @@
 			border-radius: 2px;
 			border-radius: 2px;
 		}
 		}
 	}
 	}
-</style>
+</style>