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 }}
+
+
+