diff --git a/pages.json b/pages.json
index febc8aa..6a8eee2 100644
--- a/pages.json
+++ b/pages.json
@@ -12,14 +12,35 @@
"path": "pages/index/redirect"
},
{
- "path": "pages/index/order",
+ "path": "pages/index/index",
"style": {
- "navigationBarTitleText": "订单"
+ "navigationBarTitleText": "首页"
},
"meta": {
"auth": true
}
},
+ {
+ "path": "pages/index/order",
+ "style": {
+ "navigationBarTitleText": "订单",
+ "enablePullDownRefresh": true
+ },
+ "meta": {
+ "auth": true
+ }
+ },
+ {
+ "path": "pages/index/product",
+ "style": {
+ "navigationBarTitleText": "产品",
+ "enablePullDownRefresh": true
+ },
+
+ "meta": {
+ "auth": false
+ }
+ },
{
"path": "pages/index/my",
"style": {
@@ -38,15 +59,6 @@
"auth": false
}
},
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "首页"
- },
- "meta": {
- "auth": true
- }
- },
{
"path": "pages/index/login",
"style": {
@@ -55,15 +67,6 @@
"meta": {
"auth": false
}
- },
- {
- "path": "pages/index/product",
- "style": {
- "navigationBarTitleText": "产品"
- },
- "meta": {
- "auth": false
- }
}
],
"subPackages": [
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 997a5fb..d196ebc 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
-
+
{{ merchantInfo.name }}
@@ -22,8 +22,8 @@
- 总销售额{{ state.statistic.totalSalesAmount }}元 | 成功退款{{ state.statistic.refundCount }}笔 |
- 退款金额{{ state.statistic.refundAmount }}元
+ 总销售额 {{ state.statistic.totalSalesAmount }} 元 | 成功退款 {{ state.statistic.refundCount }} 笔 |
+ 退款金额 {{ state.statistic.refundAmount }} 元
diff --git a/pages/index/my.vue b/pages/index/my.vue
index c73055a..842e8d5 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -1,215 +1,215 @@
-
-
-
-
+
+
+
+
-
- {{ userInfo.nickname }}
- {{ userInfo.mobile }}
-
-
+
+ {{ userInfo.nickname }}
+ {{ userInfo.mobile }}
+
+
-
- 账户余额
-
-
- ¥
- {{ remain }}
-
-
-
- 总获取积分 {{ userInfo.point }}
-
+
+ 账户余额
+
+
+ ¥
+ {{ remain }}
+
+
+
+ 总获取积分 {{ userInfo.point }}
+
-
-
-
-
-
-
+
+
+
+
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 15e08c1..68cd59d 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -124,7 +124,7 @@