diff --git a/.env b/.env
index b67a5b6..7e7b528 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ MALL_VERSION = v1.0.0
MALL_BASE_URL = http://api-dashboard.yudao.iocoder.cn
# 后端接口 - 测试环境(通过 process.env.NODE_ENV = development)
-MALL_DEV_BASE_URL = http://mall-backend-dev.jiandyb.cn:7001
+MALL_DEV_BASE_URL = https://mall-baclend-local.jiandyb9834.xyz
# 后端接口前缀(一般不建议调整)
MALL_API_PATH = /merchant-api
diff --git a/App.vue b/App.vue
index 0832d65..3c8a008 100644
--- a/App.vue
+++ b/App.vue
@@ -3,8 +3,6 @@ import { onLaunch, onShow, onError } from '@dcloudio/uni-app'
import { peachInit } from './peach'
onLaunch(() => {
- // 隐藏原生导航栏 使用自定义底部导航
- uni.hideTabBar()
peachInit()
})
diff --git a/pages.json b/pages.json
index f2eec73..f6750fe 100644
--- a/pages.json
+++ b/pages.json
@@ -8,6 +8,9 @@
},
"pages": [
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/index/redirect"
+ },
{
"path": "pages/order/list",
"style": {
@@ -64,18 +67,17 @@
}
],
"subPackages": [
- {
- "root": "pages/public",
- "pages": [
-
- {
- "path": "error",
- "style": {
- "navigationBarTitleText": "错误页面"
- }
- }
- ]
- }
+ {
+ "root": "pages/public",
+ "pages": [
+ {
+ "path": "error",
+ "style": {
+ "navigationBarTitleText": "错误页面"
+ }
+ }
+ ]
+ }
],
"tabBar": {
"list": [
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6e7c004..9a6400f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,34 +3,38 @@
-
+
- {{ state.merchantInfo.name }}
- {{ state.merchantInfo.description }}
+ {{ merchantInfo.name }}
+ {{ merchantInfo?.contactPhone }}
- {{ `今日收款金额(成功收款${state.statistic.total}笔)` }}
+ {{ `今日收款金额(成功收款${state.statistic.todayPaymentCount}笔)` }}
¥
- {{ state.statistic.income }}
+ {{ state.statistic.todayPaymentAmount || 0 }}
+
+ 总销售额{{ state.statistic.totalSalesAmount }}元 | 成功退款{{ state.statistic.refundCount }}笔 |
+ 退款金额{{ state.statistic.refundAmount }}元
+
基础数据
-
+
{{ item.name }}
{{ item.value }}
- 昨日 {{ item.last }}
+ 昨日 {{ item.last }}
@@ -39,8 +43,11 @@
diff --git a/pages/index/my.vue b/pages/index/my.vue
index 7a2b7c9..578a477 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -3,11 +3,11 @@
-
+
- {{ state.userInfo.name }}
- {{ state.userInfo.description }}
+ {{ userInfo.nickname }}
+ {{ userInfo.mobile }}
@@ -16,17 +16,17 @@
¥
- {{ state.statistic.remain }}
+ {{ remain }}
- 总获取积分{{ state.statistic.cent }}
+ 总获取积分{{ cent }}