From 76f51efdf7900c9059ab051ce420049e2612b8b8 Mon Sep 17 00:00:00 2001 From: "[liang]" <[595996918@qq.com]> Date: Thu, 25 Aug 2022 09:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A4=E6=98=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/positionList/positionList.vue | 2 +- pages.json | 6 + pages/home/index.vue | 26 +- pages/markets/kLine.vue | 300 +++++++++++++++++++++++ pages/markets/trade.vue | 15 +- pages/mine/mineDetails.vue | 6 +- pages/mine/mineRecord.vue | 3 +- pages/recharge/recharge.vue | 6 +- pages/withdrawal/addAddress.vue | 6 +- pages/withdrawal/withdrawal.vue | 6 +- utils/language/en_US.js | 9 + 11 files changed, 364 insertions(+), 21 deletions(-) create mode 100644 pages/markets/kLine.vue diff --git a/components/positionList/positionList.vue b/components/positionList/positionList.vue index a44a98b..249ca45 100644 --- a/components/positionList/positionList.vue +++ b/components/positionList/positionList.vue @@ -20,7 +20,7 @@ 47823.00 {{ item }} - + diff --git a/pages.json b/pages.json index 8618ea3..440e954 100644 --- a/pages.json +++ b/pages.json @@ -44,6 +44,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/markets/kLine", + "style": { + "navigationStyle": "custom" + } + }, // charity { diff --git a/pages/home/index.vue b/pages/home/index.vue index 9dce638..8aab9ad 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -20,7 +20,10 @@ - {{ i18n.homeMessage }} + + + @@ -96,6 +99,12 @@ export default { langTrue: languageData[0].title || 'English', languageData, popupShow: false, + messageList: [ + `Please contact customer service on the top-left corner for identity verification on your first Please contact customer service on the top-left corner for identity verification on your first...Please contact customer service on the top-left corner for identity verification on your first... `, + `Please contact customer service on the top-left corner for identity verification on your first Please contact customer service on the top-left corner for identity verification on your first...Please contact customer service on the top-left corner for identity verification on your first... `, + `Please contact customer service on the top-left corner for identity verification on your first Please contact customer service on the top-left corner for identity verification on your first...Please contact customer service on the top-left corner for identity verification on your first... `, + `Please contact customer service on the top-left corner for identity verification on your first Please contact customer service on the top-left corner for identity verification on your first...Please contact customer service on the top-left corner for identity verification on your first... `, + ], swiperList: [ 'https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', @@ -206,10 +215,10 @@ export default { /** * 跳转 */ - goto(id) { - // console.log(id); + goto(page) { + // console.log(page); let url = ''; - switch (id) { + switch (page) { case 'recharge': url = '/pages/recharge/recharge' break; @@ -225,7 +234,7 @@ export default { if (url) { this.stopAllVideoPlay() // console.log(url); - if (id === 'subcription') { + if (page === 'subcription') { uni.reLaunch({ url, }) @@ -551,6 +560,7 @@ export default { height: 96rpx; background: #211F32; border-radius: 16rpx; + overflow: hidden; .icon { position: absolute; @@ -558,6 +568,12 @@ export default { left: 20rpx; } + .notice{ + width: 574rpx; + margin-left: 80rpx; + margin-top: 10rpx; + } + .text { position: absolute; top: 18rpx; diff --git a/pages/markets/kLine.vue b/pages/markets/kLine.vue new file mode 100644 index 0000000..3949589 --- /dev/null +++ b/pages/markets/kLine.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/pages/markets/trade.vue b/pages/markets/trade.vue index 37087d7..b75d23c 100644 --- a/pages/markets/trade.vue +++ b/pages/markets/trade.vue @@ -14,8 +14,6 @@ - - @@ -39,6 +37,19 @@ export default { methods: { depthChange(e) { console.log(e); + }, + goto(page) { + let url = ''; + switch (page) { + case 'kLine': + url = '/pages/markets/kLine' + break; + default: + break; + } + uni.navigateTo({ + url, + }); } }, diff --git a/pages/mine/mineDetails.vue b/pages/mine/mineDetails.vue index 81d1875..c51a6e9 100644 --- a/pages/mine/mineDetails.vue +++ b/pages/mine/mineDetails.vue @@ -63,10 +63,10 @@ export default { }, onShow() { }, methods: { - goto(id) { - // console.log(id); + goto(page) { + // console.log(page); let url = ''; - switch (id) { + switch (page) { case 'mineRecord': url = '/pages/mine/mineRecord' break; diff --git a/pages/mine/mineRecord.vue b/pages/mine/mineRecord.vue index 92856ba..3ba63f6 100644 --- a/pages/mine/mineRecord.vue +++ b/pages/mine/mineRecord.vue @@ -5,9 +5,10 @@ + - + diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue index 9d68f55..b960639 100644 --- a/pages/recharge/recharge.vue +++ b/pages/recharge/recharge.vue @@ -137,10 +137,10 @@ export default { }, onShow() { }, methods: { - goto(id) { - // console.log(id); + goto(page) { + // console.log(page); let url = ''; - switch (id) { + switch (page) { case 'rechargeRecord': url = '/pages/recharge/rechargeRecord' break; diff --git a/pages/withdrawal/addAddress.vue b/pages/withdrawal/addAddress.vue index 69eecb2..ff2b925 100644 --- a/pages/withdrawal/addAddress.vue +++ b/pages/withdrawal/addAddress.vue @@ -104,10 +104,10 @@ export default { }, onShow() { }, methods: { - goto(id) { - // console.log(id); + goto(page) { + // console.log(page); let url = ''; - switch (id) { + switch (page) { case 'withdrawalRecord': url = '/pages/withdrawal/withdrawalRecord' break; diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue index aa95125..16ead8e 100644 --- a/pages/withdrawal/withdrawal.vue +++ b/pages/withdrawal/withdrawal.vue @@ -193,10 +193,10 @@ export default { }, onShow() { }, methods: { - goto(id) { - // console.log(id); + goto(page) { + // console.log(page); let url = ''; - switch (id) { + switch (page) { case 'withdrawalRecord': url = '/pages/withdrawal/withdrawalRecord' break; diff --git a/utils/language/en_US.js b/utils/language/en_US.js index e5d573d..d5a5503 100644 --- a/utils/language/en_US.js +++ b/utils/language/en_US.js @@ -113,6 +113,15 @@ export default { ExpectProfit: 'Expect profit ', ExpectLoss: 'Expect loss ', + Highest:'24H Highest', + Lowest:'24H Lowest', + Amount:'24H Amount', + + MarketTrades:'Market Trades', + Quantity:'Quantity', + BuyingPrice:'Buying Price', + SellPrice20:'Sell Price20', + open:'Open', }, // 捐赠页面相关