From 912aeccd23b6e4cf5dda4493c731784c88199ca4 Mon Sep 17 00:00:00 2001
From: "[liang]" <[595996918@qq.com]>
Date: Tue, 23 Aug 2022 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=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/KeyValueRow/KeyValueRow.vue | 3 +-
.../entrustOrderList/entrustOrderList.vue | 0
components/navigation/navigation.vue | 2 +-
components/positionList/positionList.vue | 0
components/showMore/showMore.vue | 104 +
components/tabBar/tabBar.vue | 4 +-
components/transaction/transaction.vue | 101 +
pages.json | 80 +-
pages/{index => home}/index.vue | 321 +-
pages/markets/index.vue | 11 +-
pages/markets/trade.vue | 82 +
pages/me/accountInfo.vue | 2 +
pages/me/index.vue | 6 +
pages/me/transfer.vue | 2 +-
pages/mine/mine.vue | 125 +
pages/mine/mineDetails.vue | 233 +
pages/mine/mineRecord.vue | 80 +
pages/recharge/recharge.vue | 527 +
pages/recharge/rechargeRecord.vue | 159 +
pages/withdrawal/addAddress.vue | 352 +
pages/withdrawal/addOrEditBankCard.vue | 138 +
pages/withdrawal/chooseAddress.vue | 289 +
pages/withdrawal/withdrawal.vue | 688 +
pages/withdrawal/withdrawalRecord.vue | 172 +
static/charity/ic_ma_arrow_down.png | Bin 257 -> 345 bytes
static/echarts.js | 97412 ++++++++++++++++
static/maskets/logo.png | Bin 0 -> 4331 bytes
static/mine/Line.png | Bin 0 -> 2703 bytes
static/mine/bg_mine.png | Bin 0 -> 98212 bytes
static/mine/coinLogo.png | Bin 0 -> 7702 bytes
static/mine/img_data.png | Bin 0 -> 74840 bytes
static/mine/img_mine01.png | Bin 0 -> 15110 bytes
static/mine/img_mine02.png | Bin 0 -> 15894 bytes
static/mine/img_mine03.png | Bin 0 -> 15477 bytes
static/mine/img_mine04.png | Bin 0 -> 16427 bytes
static/recharge/ic_copy.png | Bin 0 -> 753 bytes
static/recharge/img_successed.png | Bin 0 -> 22228 bytes
static/recharge/money-recive.png | Bin 0 -> 2248 bytes
static/withdrawal/Checkbox_pr.png | Bin 0 -> 1157 bytes
static/withdrawal/add-circle.png | Bin 0 -> 1298 bytes
static/withdrawal/bg_card.png | Bin 0 -> 18765 bytes
static/withdrawal/money-send.png | Bin 0 -> 1633 bytes
utils/language/en_US.js | 219 +-
43 files changed, 101023 insertions(+), 89 deletions(-)
create mode 100644 components/entrustOrderList/entrustOrderList.vue
create mode 100644 components/positionList/positionList.vue
create mode 100644 components/showMore/showMore.vue
create mode 100644 components/transaction/transaction.vue
rename pages/{index => home}/index.vue (57%)
create mode 100644 pages/markets/trade.vue
create mode 100644 pages/mine/mine.vue
create mode 100644 pages/mine/mineDetails.vue
create mode 100644 pages/mine/mineRecord.vue
create mode 100644 pages/recharge/recharge.vue
create mode 100644 pages/recharge/rechargeRecord.vue
create mode 100644 pages/withdrawal/addAddress.vue
create mode 100644 pages/withdrawal/addOrEditBankCard.vue
create mode 100644 pages/withdrawal/chooseAddress.vue
create mode 100644 pages/withdrawal/withdrawal.vue
create mode 100644 pages/withdrawal/withdrawalRecord.vue
create mode 100644 static/echarts.js
create mode 100644 static/maskets/logo.png
create mode 100644 static/mine/Line.png
create mode 100644 static/mine/bg_mine.png
create mode 100644 static/mine/coinLogo.png
create mode 100644 static/mine/img_data.png
create mode 100644 static/mine/img_mine01.png
create mode 100644 static/mine/img_mine02.png
create mode 100644 static/mine/img_mine03.png
create mode 100644 static/mine/img_mine04.png
create mode 100644 static/recharge/ic_copy.png
create mode 100644 static/recharge/img_successed.png
create mode 100644 static/recharge/money-recive.png
create mode 100644 static/withdrawal/Checkbox_pr.png
create mode 100644 static/withdrawal/add-circle.png
create mode 100644 static/withdrawal/bg_card.png
create mode 100644 static/withdrawal/money-send.png
diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue
index fde355d..b7d1737 100644
--- a/components/KeyValueRow/KeyValueRow.vue
+++ b/components/KeyValueRow/KeyValueRow.vue
@@ -5,7 +5,7 @@
-->
{{ keyName }}
- {{ value }}
+ {{ value }}
@@ -70,6 +70,7 @@ export default {
position: relative;
.keyName {
+ vertical-align: top;
height: 100%;
width: auto;
display: inline-block;
diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
new file mode 100644
index 0000000..e69de29
diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue
index 21c790b..fcbc483 100644
--- a/components/navigation/navigation.vue
+++ b/components/navigation/navigation.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/components/positionList/positionList.vue b/components/positionList/positionList.vue
new file mode 100644
index 0000000..e69de29
diff --git a/components/showMore/showMore.vue b/components/showMore/showMore.vue
new file mode 100644
index 0000000..de8ecd7
--- /dev/null
+++ b/components/showMore/showMore.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 80b139a..15253f2 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -89,10 +89,10 @@ export default {
methods: {
goToPage(num) {
- let url = '/pages/index/index';
+ let url = '/pages/home/index';
switch (+num) {
case 1:
- url = '/pages/index/index';
+ url = '/pages/home/index';
break;
case 2:
url = '/pages/markets/index';
diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue
new file mode 100644
index 0000000..3c4fc70
--- /dev/null
+++ b/components/transaction/transaction.vue
@@ -0,0 +1,101 @@
+
+
+
+ 买入
+ 卖出
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index 580f03a..8618ea3 100644
--- a/pages.json
+++ b/pages.json
@@ -3,8 +3,9 @@
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页
+ // 首页部分
{
- "path": "pages/index/index",
+ "path": "pages/home/index",
"style": {
"navigationStyle": "custom"
}
@@ -22,7 +23,6 @@
"navigationStyle": "custom"
}
},
-
{
"path": "pages/login/register",
"style": {
@@ -30,17 +30,16 @@
}
},
- // 首页部分
+
+ // markets
{
- "path": "pages/index/index",
+ "path": "pages/markets/index",
"style": {
"navigationStyle": "custom"
}
},
-
- // markets
{
- "path": "pages/markets/index",
+ "path": "pages/markets/trade",
"style": {
"navigationStyle": "custom"
}
@@ -146,8 +145,75 @@
"style": {
"navigationStyle": "custom"
}
+ },
+
+ //Recharge充值
+ {
+ "path": "pages/recharge/recharge",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/recharge/rechargeRecord",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+
+ //mine'
+ {
+ "path": "pages/mine/mine",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/mine/mineDetails",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/mine/mineRecord",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ //withdrawal
+ {
+ "path": "pages/withdrawal/withdrawal",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/withdrawal/withdrawalRecord",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/withdrawal/chooseAddress",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/withdrawal/addAddress",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/withdrawal/addOrEditBankCard",
+ "style": {
+ "navigationStyle": "custom"
+ }
}
+
+
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/index/index.vue b/pages/home/index.vue
similarity index 57%
rename from pages/index/index.vue
rename to pages/home/index.vue
index 9976147..9dce638 100644
--- a/pages/index/index.vue
+++ b/pages/home/index.vue
@@ -24,17 +24,17 @@
-
+
{{ i18n.Recharge }}
-
+
{{ i18n.Mine }}
-
+
{{ i18n.Subcription }}
@@ -44,15 +44,23 @@
{{ i18n.TodaySteps }}
-
+
+
{{ i18n.ReceiveEarnings }}
-
-
+
+
+
+
+ {{ item.title }}
+
+
+