diff --git a/package-lock.json b/package-lock.json
index 014fc57..e8bbe9f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
"pako": "^2.0.2",
"popper.js": "^1.16.0",
"pygmentize-bundled": "^2.3.0",
+ "qs": "^6.11.2",
"swiper": "^6.0.4",
"vue": "^2.5.2",
"vue-awesome-swiper": "^3.1.3",
@@ -2395,7 +2396,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
- "dev": true,
"dependencies": {
"function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2"
@@ -6783,8 +6783,7 @@
"node_modules/function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"node_modules/function.prototype.name": {
"version": "1.1.6",
@@ -6817,7 +6816,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
- "dev": true,
"dependencies": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
@@ -7001,7 +6999,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dev": true,
"dependencies": {
"function-bind": "^1.1.1"
},
@@ -7049,7 +7046,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -7058,7 +7054,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -9474,8 +9469,7 @@
"node_modules/object-inspect": {
"version": "1.12.3",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
- "dev": true
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
},
"node_modules/object-is": {
"version": "1.1.5",
@@ -13196,6 +13190,17 @@
"teleport": ">=0.2.0"
}
},
+ "node_modules/qs": {
+ "version": "6.11.2",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz",
+ "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ }
+ },
"node_modules/query-string": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
@@ -14336,7 +14341,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2",
@@ -16058,18 +16062,6 @@
"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true
},
- "node_modules/url/node_modules/qs": {
- "version": "6.11.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
- "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
- "dev": true,
- "dependencies": {
- "side-channel": "^1.0.4"
- },
- "engines": {
- "node": ">=0.6"
- }
- },
"node_modules/use": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -20066,7 +20058,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
- "dev": true,
"requires": {
"function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2"
@@ -23753,8 +23744,7 @@
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"function.prototype.name": {
"version": "1.1.6",
@@ -23784,7 +23774,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
- "dev": true,
"requires": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
@@ -23936,7 +23925,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dev": true,
"requires": {
"function-bind": "^1.1.1"
}
@@ -23974,14 +23962,12 @@
"has-proto": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
- "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
- "dev": true
+ "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
},
"has-symbols": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
- "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
- "dev": true
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
},
"has-tostringtag": {
"version": "1.0.0",
@@ -25968,8 +25954,7 @@
"object-inspect": {
"version": "1.12.3",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
- "dev": true
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
},
"object-is": {
"version": "1.1.5",
@@ -29052,6 +29037,14 @@
"integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
"dev": true
},
+ "qs": {
+ "version": "6.11.2",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz",
+ "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
+ },
"query-string": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
@@ -30014,7 +30007,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
- "dev": true,
"requires": {
"call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2",
@@ -31426,15 +31418,6 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true
- },
- "qs": {
- "version": "6.11.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
- "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
- "dev": true,
- "requires": {
- "side-channel": "^1.0.4"
- }
}
}
},
diff --git a/package.json b/package.json
index 2083cac..8366ebd 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"pako": "^2.0.2",
"popper.js": "^1.16.0",
"pygmentize-bundled": "^2.3.0",
+ "qs": "^6.11.2",
"swiper": "^6.0.4",
"vue": "^2.5.2",
"vue-awesome-swiper": "^3.1.3",
diff --git a/src/assets/scss/base/_common.scss b/src/assets/scss/base/_common.scss
index c51294e..c865a39 100644
--- a/src/assets/scss/base/_common.scss
+++ b/src/assets/scss/base/_common.scss
@@ -238,11 +238,11 @@ $basew: 24;
@while $i <=$basew {
.w-#{$i}\/#{$basew} {
- width: #{$i/$basew * 100}#{"%"};
+ width: #{calc($i/$basew) * 100}#{"%"};
}
.h-#{$i}\/#{$basew} {
- height: #{$i/$basew * 100}#{"%"};
+ height: #{calc($i/$basew) * 100}#{"%"};
}
$i: $i + 1;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 79780ef..d34d651 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1165,42 +1165,27 @@
"bb1": "Latest price (USD)",
"bb2": "24h increase",
"bb3": "24h trading volume",
- "bb4": "A cryptocurrency exchange worthy of users' trust",
- "bb5": "Buy at AJcoin and trade over 100 cryptocurrencies",
- "bb6": "Strong independent research and development capabilities",
- "bb7": "Independently develop the third generation trading system from 0 to 1",
- "bb8": "Create the ultimate trading experience with excellent performance",
- "bb9": "Global layout",
- "bb10": "Global elite gathering",
- "bb11": "The team is distributed around the world",
- "bb12": "Super spot",
- "bb13": "Exclusive launch of spot cost price function",
- "bb14": "Create a contract-level spot trading experience",
- "bb15": "Top Security",
- "bb16": "Risk Control",
- "bb17": "Double means to protect the safety of your assets",
- "bb18": "Perfect risk control system",
- "bb19": "Double price liquidation protection mechanism",
- "bb20": "Reduce the risk of user liquidation",
- "bb21": "7*24 hours service",
- "bb22": "1 minute response mechanism",
- "bb23": "Serving global users around the clock",
-
- "cc5": "Trade Anywhere",
- "cc8": "Stay informed with our app and desktop client",
- "cc6": "Scan the QR code",
+ "bb4": "Cryptocurrency exchange for everyone",
+ "bb5": "Start trading here and experience a better cryptocurrency journey",
+ "bb6": "Personal",
+ "bb7": "A cryptocurrency exchange for everyone. The most trustworthy leading trading platform with a wide range of currencies",
+ "cc1": "Business",
+ "cc2": "Built for businesses and institutions. Providing crypto solutions to institutional investors and businesses",
+ "cc3": "Developer",
+ "cc4": "Built for developers, for developers to build the tools and APIs of the future of web3",
+ "cc6": "Scan QR code",
"cc7": "Download Android/IOS App",
- "dd1": "Unique trading experience",
- "dd2": "A breakthrough tool for investing in cryptocurrencies",
- "dd3": "Three major stop-profit and stop-loss functions",
- "dd4": "AJcoin provides three modes: take profit and stop loss for all positions, take profit and stop loss for some positions, and take profit and stop loss at trigger price to help users control transaction risks",
- "dd5": "Up to 50 different take profit and stop loss points",
- "dd6": "Users can set take-profit and stop-loss points at any time in positions and pending orders to flexibly control risks; at the same time, it supports setting up to 50 take-profit and stop-loss orders for the same position with different numbers and prices, including limit orders. or market price order to meet users’ different investment strategies.",
- "dd7": "Help Center",
- "ee1": "Global Ranking",
- "ee2": "users trust us",
- "ee3": "Ultra-Low Fees",
- "ee4": "Countries",
- "ee5": "Start your cryptocurrency investment now"
+ "dd1": "Safe and stable with zero accidents",
+ "dd2": "Multiple security strategies and 100% reserve guarantee ensure that no security incidents have occurred since its establishment.",
+ "dd3": "Trade crypto assets simply and conveniently",
+ "dd4": "In CXIsux, the products are easy to understand, the transaction process is convenient, and the one-stop blockchain asset service platform",
+ "dd5": "Derivatives",
+ "dd6": "You can trade contracts on 100+ cryptocurrencies with up to 150x leverage and earn high profits",
+ "ee1": "Multiple terminal support",
+ "ee2": "Trade digital assets anytime, anywhere",
+ "ee3": "Supports a wide range of asset types, with all currency information available",
+ "ee4": "Quickly understand the digital asset trading process",
+ "ee5": "Start your encryption journey",
+ "ee6": "Graphical verification"
}
}
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index f5aade2..6e17741 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -379,7 +379,7 @@ export default {
};
diff --git a/src/views/signUp/agent.vue b/src/views/signUp/agent.vue
index efb4425..dc0d50d 100644
--- a/src/views/signUp/agent.vue
+++ b/src/views/signUp/agent.vue
@@ -567,12 +567,6 @@ export default {
diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue
index 9a5c8dc..930a090 100644
--- a/src/views/wallet/funding.vue
+++ b/src/views/wallet/funding.vue
@@ -189,7 +189,10 @@ export default {
},
getDepositHistories() {
- Wallet.depositHistory().then(data => this.depositHistories = data.data).catch(err => { });
+ Wallet.depositHistory().then(data => {
+ this.depositHistories = data.data;
+ console.log( this.depositHistories, ' this.depositHistories')
+ }).catch(err => { });
},
getRechargeManualLog() {
diff --git a/yarn.lock b/yarn.lock
index ff81964..014f326 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7332,9 +7332,9 @@
"resolved" "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
"version" "1.5.1"
-"qs@^6.11.0":
+"qs@^6.11.0", "qs@^6.11.2":
"integrity" "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA=="
- "resolved" "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"
+ "resolved" "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz"
"version" "6.11.2"
dependencies:
"side-channel" "^1.0.4"