xiongzhu 3 yıl önce
ebeveyn
işleme
1872ed1c97

+ 1 - 1
src/components/CommissionItem.vue

@@ -12,7 +12,7 @@
                 <img :src="detail.order.pic[0]" />
                 <img :src="detail.order.pic[0]" />
             </ion-thumbnail>
             </ion-thumbnail>
             <div class="info">
             <div class="info">
-                <div class="name">{{ detail.order.name }}</div>
+                <div class="name">{{ getLocaleString(detail.order.name) }}</div>
                 <div class="price">
                 <div class="price">
                     <div class="value">{{ $t('balance.symbol') }}100</div>
                     <div class="value">{{ $t('balance.symbol') }}100</div>
                     <div class="num">×1</div>
                     <div class="num">×1</div>

+ 215 - 215
src/locales/en.json

@@ -1,222 +1,222 @@
 {
 {
-  "balance": {
-    "availableWidthdrawAmount": "Amount that can be withdrawn",
-    "balance": "Account Balance",
-    "chooseAmount": "select amount",
-    "confirmWithdraw": "Confirm withdrawal",
-    "inputCustomAmount": "Please enter a custom amount",
-    "realReceipt": "Actual account",
-    "recharge": "recharge",
-    "record": {
-      "commission": "commission",
-      "pay": "to pay",
-      "receipt": "collect money",
-      "recharge": "recharge",
-      "withdraw": "withdraw"
+    "balance": {
+        "availableWidthdrawAmount": "Amount that can be withdrawn",
+        "balance": "Account Balance",
+        "chooseAmount": "select amount",
+        "confirmWithdraw": "Confirm withdrawal",
+        "inputCustomAmount": "Please enter a custom amount",
+        "realReceipt": "Actual account",
+        "recharge": "recharge",
+        "record": {
+            "commission": "commission",
+            "pay": "to pay",
+            "receipt": "collect money",
+            "recharge": "recharge",
+            "withdraw": "withdraw"
+        },
+        "symbol": "$",
+        "totalWithdraw": "Cumulative withdrawal",
+        "unit": "Yuan",
+        "withdraw": "withdraw",
+        "withdrawAmount": "Withdrawal Amount",
+        "withdrawAmountError": "Please enter the correct withdrawal amount",
+        "withdrawFee": "Withdrawal fee",
+        "withdrawFeeTip0": "Note: 1/3 of the total transaction fee for the purchase is",
+        "withdrawFeeTip1": ", the excess handling fee",
+        "withdrawInputTip": "Please enter the withdrawal amount",
+        "withdrawModalTitle": "Apply for withdrawal",
+        "withdrawSuccess": "Successful withdrawal",
+        "withdrawing": "Withdrawing",
+        "rechargeMax": "The maximum recharge amount is {value}",
+        "rechargeMin": "The minimum recharge amount is {value}"
     },
     },
-    "symbol": "$",
-    "totalWithdraw": "Cumulative withdrawal",
-    "unit": "Yuan",
-    "withdraw": "withdraw",
-    "withdrawAmount": "Withdrawal Amount",
-    "withdrawAmountError": "Please enter the correct withdrawal amount",
-    "withdrawFee": "Withdrawal fee",
-    "withdrawFeeTip0": "Note: 1/3 of the total transaction fee for the purchase is",
-    "withdrawFeeTip1": ", the excess handling fee",
-    "withdrawInputTip": "Please enter the withdrawal amount",
-    "withdrawModalTitle": "Apply for withdrawal",
-    "withdrawSuccess": "Successful withdrawal",
-    "withdrawing": "Withdrawing",
-    "rechargeMax": "The maximum recharge amount is {value}",
-    "rechargeMin": "The minimum recharge amount is {value}"
-  },
-  "cancel": "Cancel",
-  "common": {
-    "alert": "hint",
     "cancel": "Cancel",
     "cancel": "Cancel",
-    "confirm": "Sure",
-    "eula": "Platform",
-    "guide": "Tutorial",
-    "home": "Home",
-    "loadFinish": "download finished",
-    "loading": "Loading",
-    "mine": "Mine",
-    "more": "More",
-    "news": "News",
-    "pullRefresh": "Pull down to refresh",
-    "rank": "leaderboard",
-    "register": "register",
-    "updateSuccess": "update completed",
-    "profit": "Commission",
-    "noRecords": "No records"
-  },
-  "delegate": {
-    "tip": "The consignment sale has not started yet, it will start today at ${time}",
-    "title": "Consignment",
-    "increase": "mark up",
-    "originalPrice": "original price",
-    "payServiceCharge": "pay processing fees",
-    "sellPrice": "selling price",
-    "tip1": "Note: entrusting the platform to sell services, the maximum price of the product can be increased by {riseRatePercent}% each time, and the platform will charge {serviceCharge}% of the custody service fee"
-  },
-  "distribution": {
-    "commission": "commission",
-    "joinTeamAt": "time to join the team",
-    "myInvitor": "my recommender",
-    "myProfit": "Income",
-    "orderNum": "number of order",
-    "profitDetails": "Revenue Details",
-    "qrCode": "my promo code",
-    "teamNum": "Team size",
-    "totalProfit": "Total revenue",
-    "viewDetail": "view details",
-    "viewTeam": "view team",
-    "saveImg": "save Picture",
-    "empty": "no yet"
-  },
-  "home": {
-    "all": "All"
-  },
-  "login": "Log in",
-  "loginPage": {
-    "agreement": "User Agreement",
-    "codePla": "please enter verification code",
-    "goRegister": "Sign up now",
-    "invitorPla": "Invitation code (optional)",
-    "isRead": "have read and agreed",
-    "loginByCode": "Verification code login",
-    "loginNow": "Already have an account, log in now",
-    "loginPwd": "password login",
-    "loginSuceess": "login successful",
-    "noAcount": "No account yet?",
-    "noAgree": "Please read and agree to the registration agreement",
-    "phone": "phone number",
-    "phoneError": "Wrong format of phone number",
-    "phonePla": "Please enter phone number",
-    "psd": "password",
-    "psdAgainError": "The two passwords entered are inconsistent",
-    "psdAgainPla": "please enter password again",
-    "psdPla": "please enter password",
-    "register": "Register an account",
-    "registerSuccess": "registration success",
-    "sendCode": "Send code",
-    "sended": "Sented"
-  },
-  "mine": {
-    "address": "Address",
-    "avatar": "Avatar",
-    "bankCard": "Bank Card",
-    "bindPhone": "Bind Phone",
-    "female": "Female",
-    "logout": "sign out",
-    "male": "male",
-    "newProfit": "new income",
-    "nickname": "Nick Name",
-    "noBind": "unbound",
-    "noLogin": "not logged in",
-    "noSetting": "not set",
-    "setting": "Setting",
-    "sex": "Gender",
-    "user": "User",
-    "common": "Common Functions",
-    "nickPlac": "Please enter a nickname",
-    "sure": "Confirm the changes"
-  },
-  "news": {
-    "newsNull": "There is no news~"
-  },
-  "order": {
-    "buyNow": "Buy Now",
-    "createSuccess": "Order successfully created",
-    "createdAt": "order time",
-    "detail": "order details",
-    "id": "order number",
-    "my": "My Order",
-    "payInfo": "Payment Information",
-    "payMethod": "payment method",
-    "payMethodName": {
-      "balance": "balance payment"
+    "common": {
+        "alert": "hint",
+        "cancel": "Cancel",
+        "confirm": "Sure",
+        "eula": "Platform",
+        "guide": "Tutorial",
+        "home": "Home",
+        "loadFinish": "download finished",
+        "loading": "Loading",
+        "mine": "Mine",
+        "more": "More",
+        "news": "News",
+        "pullRefresh": "Pull down to refresh",
+        "rank": "leaderboard",
+        "register": "register",
+        "updateSuccess": "update completed",
+        "profit": "Commission",
+        "noRecords": "No records"
     },
     },
-    "payNow": "pay immediately",
-    "processing": "Processing",
-    "status": {
-      "ALL": "all",
-      "CANCELED": "Cancelled",
-      "CONFIRMED": "For Sale",
-      "NOT_CONFIRMED": "Waiting for the seller to confirm receipt",
-      "NOT_PAID": "Pending",
-      "NOT_SHIPPED": "to be delivered",
-      "RECEIVED": "received",
-      "SELLING": "Selling",
-      "SHIPPED": "Shipped",
-      "SOLD": "Sold",
-      "SOLD_NOT_CONFIRMED": "To be confirmed receipt",
-      "SOLD_NOT_PAID": "pending buyer payment"
+    "delegate": {
+        "tip": "The consignment sale has not started yet, it will start today at ${time}",
+        "title": "Consignment",
+        "increase": "mark up",
+        "originalPrice": "original price",
+        "payServiceCharge": "pay processing fees",
+        "sellPrice": "selling price",
+        "tip1": "Note: entrusting the platform to sell services, the maximum price of the product can be increased by {riseRatePercent}% each time, and the platform will charge {serviceCharge}% of the custody service fee"
     },
     },
-    "statusDesc": {
-      "CANCELED": "The order has been cancelled, if you have any questions, please contact customer service",
-      "CONFIRMED": "To be entrusted, it will be put on the shelves within 24 hours after entrusting",
-      "NOT_CONFIRMED": "Waiting for the seller to confirm receipt",
-      "NOT_PAID": "Please pay as soon as possible, overtime unpaid orders will be automatically canceled",
-      "NOT_SHIPPED": "to be delivered",
-      "RECEIVED": "received",
-      "SELLING": "In entrustment, if you have any questions, please contact customer service",
-      "SHIPPED": "Shipped",
-      "SOLD": "Sold, please contact customer service if you have any questions",
-      "SOLD_NOT_CONFIRMED": "To be confirmed receipt",
-      "SOLD_NOT_PAID": "pending buyer payment"
+    "distribution": {
+        "commission": "commission",
+        "joinTeamAt": "time to join the team",
+        "myInvitor": "my recommender",
+        "myProfit": "Income",
+        "orderNum": "number of order",
+        "profitDetails": "Revenue Details",
+        "qrCode": "my promo code",
+        "teamNum": "Team size",
+        "totalProfit": "Total revenue",
+        "viewDetail": "view details",
+        "viewTeam": "view team",
+        "saveImg": "save Picture",
+        "empty": "no yet"
     },
     },
-    "total": "total",
-    "totalPayment": "actual payment",
-    "walletPay": "wallet payment",
-    "applyShip": "Apply for delivery",
-    "confirmReceipt": "confirm the receipt of goods",
-    "countDown": "Automatically cancel the order when the payment countdown expires",
-    "hasProblem": "Encounter problems?",
-    "payAt": "Payment time",
-    "viewOrder": "check order"
-  },
-  "product": {
-    "dailyEarning": "Daily Income",
-    "detail": "Product Details",
-    "hot": "Hot snapping up…",
-    "nowPrice": "Current",
-    "owner": "Product Holder",
-    "search": "search",
-    "searchNo": "No products were found~",
-    "searchPla": "Enter search keywords",
-    "start": "back grab",
-    "tomorrowBuy": "Available",
-    "priceNow": "Current",
-    "riseDesc": "Daily Income",
-    "tag": "Digital Artwork"
-  },
-  "rank": {
-    "inviteNum": "New recruits",
-    "profitInfo": "Earnings information",
-    "rank": "Ranking",
-    "rankByInvite": "Invite Ranking",
-    "rankByProfit": "Revenue Ranking",
-    "userInfo": "User Info",
-    "withdrawRechargeRate": "Recharge revenue ratio"
-  },
-  "settings": {
-    "darkMode": "Dark Mode"
-  },
-  "title": {
-    "balanceRecord": "Transaction details",
-    "distribution": "revenue center",
-    "myTeam": "my team"
-  },
-  "user": {
-    "notLogin": "User is not logged in, do you want to log in now?",
-    "profile": "Edit Information",
-    "wallet": "My purse"
-  },
-  "blf": {
-    "has": "Remaining places",
-    "pic": "illustrate",
-    "tips": "Pledge your balance, and enjoy today's dividends through the platform's overall pledge balance ratio, and the highest daily chemical income can get 1%",
-    "buy": "snap up now"
-  }
+    "home": {
+        "all": "All"
+    },
+    "login": "Log in",
+    "loginPage": {
+        "agreement": "User Agreement",
+        "codePla": "please enter verification code",
+        "goRegister": "Sign up now",
+        "invitorPla": "Invitation code (optional)",
+        "isRead": "have read and agreed",
+        "loginByCode": "Verification code login",
+        "loginNow": "Already have an account, log in now",
+        "loginPwd": "password login",
+        "loginSuceess": "login successful",
+        "noAcount": "No account yet?",
+        "noAgree": "Please read and agree to the registration agreement",
+        "phone": "phone number",
+        "phoneError": "Wrong format of phone number",
+        "phonePla": "Please enter phone number",
+        "psd": "password",
+        "psdAgainError": "The two passwords entered are inconsistent",
+        "psdAgainPla": "please enter password again",
+        "psdPla": "please enter password",
+        "register": "Register an account",
+        "registerSuccess": "registration success",
+        "sendCode": "Send code",
+        "sended": "Sented"
+    },
+    "mine": {
+        "address": "Address",
+        "avatar": "Avatar",
+        "bankCard": "Bank Card",
+        "bindPhone": "Bind Phone",
+        "female": "Female",
+        "logout": "sign out",
+        "male": "male",
+        "newProfit": "new income",
+        "nickname": "Nick Name",
+        "noBind": "unbound",
+        "noLogin": "not logged in",
+        "noSetting": "not set",
+        "setting": "Setting",
+        "sex": "Gender",
+        "user": "User",
+        "common": "Common Functions",
+        "nickPlac": "Please enter a nickname",
+        "sure": "Confirm the changes"
+    },
+    "news": {
+        "newsNull": "There is no news~"
+    },
+    "order": {
+        "buyNow": "Buy Now",
+        "createSuccess": "Order successfully created",
+        "createdAt": "order time",
+        "detail": "order details",
+        "id": "order number",
+        "my": "My Order",
+        "payInfo": "Payment Information",
+        "payMethod": "payment method",
+        "payMethodName": {
+            "balance": "balance payment"
+        },
+        "payNow": "pay immediately",
+        "processing": "Processing",
+        "status": {
+            "ALL": "all",
+            "CANCELED": "Cancelled",
+            "CONFIRMED": "For Sale",
+            "NOT_CONFIRMED": "Waiting for the seller to confirm receipt",
+            "NOT_PAID": "Pending",
+            "NOT_SHIPPED": "to be delivered",
+            "RECEIVED": "received",
+            "SELLING": "Selling",
+            "SHIPPED": "Shipped",
+            "SOLD": "Sold",
+            "SOLD_NOT_CONFIRMED": "To be confirmed receipt",
+            "SOLD_NOT_PAID": "pending buyer payment"
+        },
+        "statusDesc": {
+            "CANCELED": "The order has been cancelled, if you have any questions, please contact customer service",
+            "CONFIRMED": "To be entrusted, it will be put on the shelves within 24 hours after entrusting",
+            "NOT_CONFIRMED": "Waiting for the seller to confirm receipt",
+            "NOT_PAID": "Please pay as soon as possible, overtime unpaid orders will be automatically canceled",
+            "NOT_SHIPPED": "to be delivered",
+            "RECEIVED": "received",
+            "SELLING": "In entrustment, if you have any questions, please contact customer service",
+            "SHIPPED": "Shipped",
+            "SOLD": "Sold, please contact customer service if you have any questions",
+            "SOLD_NOT_CONFIRMED": "To be confirmed receipt",
+            "SOLD_NOT_PAID": "pending buyer payment"
+        },
+        "total": "total",
+        "totalPayment": "actual payment",
+        "walletPay": "wallet payment",
+        "applyShip": "Apply for delivery",
+        "confirmReceipt": "confirm the receipt of goods",
+        "countDown": "Automatically cancel the order when the payment countdown expires",
+        "hasProblem": "Encounter problems?",
+        "payAt": "Payment time",
+        "viewOrder": "check order"
+    },
+    "product": {
+        "dailyEarning": "Daily Income",
+        "detail": "Product Details",
+        "hot": "Hot snapping up…",
+        "nowPrice": "Current",
+        "owner": "Product Holder",
+        "search": "search",
+        "searchNo": "No products were found~",
+        "searchPla": "Enter search keywords",
+        "start": "back grab",
+        "tomorrowBuy": "Available",
+        "priceNow": "Current",
+        "riseDesc": "Daily Income",
+        "tag": "Digital Artwork"
+    },
+    "rank": {
+        "inviteNum": "New recruits",
+        "profitInfo": "Earnings information",
+        "rank": "Ranking",
+        "rankByInvite": "Invite Ranking",
+        "rankByProfit": "Revenue Ranking",
+        "userInfo": "User Info",
+        "withdrawRechargeRate": "Recharge revenue ratio"
+    },
+    "settings": {
+        "darkMode": "Dark Mode"
+    },
+    "title": {
+        "balanceRecord": "Transaction details",
+        "distribution": "revenue center",
+        "myTeam": "my team"
+    },
+    "user": {
+        "notLogin": "User is not logged in, do you want to log in now?",
+        "profile": "Edit Information",
+        "wallet": "My purse"
+    },
+    "blf": {
+        "has": "Remaining places",
+        "pic": "illustrate",
+        "tips": "Pledge your balance, and enjoy today's dividends through the platform's overall pledge balance ratio, and the highest daily chemical income can get 1%",
+        "buy": "snap up now"
+    }
 }
 }

+ 1 - 1
src/views/RankPage.vue

@@ -107,7 +107,7 @@ function getRank() {
 
 
 const router = useRouter()
 const router = useRouter()
 function goInvite() {
 function goInvite() {
-    router.push({ path: '/distribution1', query: { showShare: true } })
+    router.replace({ path: '/distribution1', query: { showShare: true } })
 }
 }
 </script>
 </script>
 
 

+ 5 - 2
src/views/TabsPage.vue

@@ -81,6 +81,9 @@ ion-tab-bar {
 ion-tab-button {
 ion-tab-button {
     --color: var(--ion-color-step-400);
     --color: var(--ion-color-step-400);
     --color-selected: #42f4bc;
     --color-selected: #42f4bc;
+    ion-label {
+        font-size: 10px;
+    }
 }
 }
 // .bigTab {
 // .bigTab {
 //     height: 60px;
 //     height: 60px;
@@ -95,8 +98,8 @@ ion-icon {
     height: 49px;
     height: 49px;
 }
 }
 .tab-icon1 {
 .tab-icon1 {
-    width: 28px;
-    height: 28px;
+    width: 24px;
+    height: 24px;
 }
 }
 // :deep(.tab-selected) {
 // :deep(.tab-selected) {
 //     ion-label {
 //     ion-label {