diff --git a/src/components/TabBar/index.vue b/src/components/TabBar/index.vue
index fe8c85f..6e91521 100644
--- a/src/components/TabBar/index.vue
+++ b/src/components/TabBar/index.vue
@@ -65,14 +65,16 @@ const state = reactive({
text: "统计",
icon: "count.png",
activeIcon: "count_active.png",
- path: "/pagesStatistics/index",
+ // path: "/pagesStatistics/index",
+ path: "/pagesHome/count",
},
{
text: "配置",
icon: "config.png",
activeIcon: "config_active.png",
- path: "/pagesConfig/index",
+ // path: "/pagesConfig/index",
+ path: "/pagesHome/config",
},
{
text: "配置旧",
@@ -84,17 +86,18 @@ const state = reactive({
text: "我的",
icon: "profile.png",
activeIcon: "profile_active.png",
- path: "/pagesLogin/profile/index",
+ // path: "/pagesLogin/profile/index",
+ path: "/pagesHome/profile",
},
],
});
const handleClick = (item: tabBar) => {
- uni.reLaunch({
- url: item.path, // 要跳转到的页面路径
- });
- // uni.switchTab({
+ // uni.reLaunch({
// url: item.path, // 要跳转到的页面路径
// });
+ uni.switchTab({
+ url: item.path, // 要跳转到的页面路径
+ });
};
onLaunch(() => {
diff --git a/src/pages.json b/src/pages.json
index ff06fcc..09c12e1 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -19,6 +19,27 @@
"navigationBarTitleText": "工作台"
}
},
+ {
+ "path": "pagesHome/count",
+ "style": {
+ "navigationStyle": "custom", // 控制头部是否显示
+ "navigationBarTitleText": "统计"
+ }
+ },
+ {
+ "path": "pagesHome/config",
+ "style": {
+ "navigationStyle": "custom", // 控制头部是否显示
+ "navigationBarTitleText": "配置"
+ }
+ },
+ {
+ "path": "pagesHome/profile",
+ "style": {
+ "navigationStyle": "custom", // 控制头部是否显示
+ "navigationBarTitleText": "我的"
+ }
+ },
{
"path": "pagesHome/index1",
"style": {
@@ -56,13 +77,13 @@
"navigationBarTitleText": "消息中心"
}
},
- {
- "path": "profile/index",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "个人中心"
- }
- },
+ // {
+ // "path": "profile/index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // "navigationBarTitleText": "个人中心"
+ // }
+ // },
{
"path": "profile/baseinfo",
"style": {
@@ -72,18 +93,6 @@
}
]
},
- // {
- // "root": "pagesHome",
- // "pages": [
- // {
- // "path": "index",
- // "style": {
- // "navigationStyle": "custom", // 控制头部是否显示
- // "navigationBarTitleText": "工作台"
- // }
- // }
- // ]
- // },
{
"root": "pagesReceive",
"pages": [
@@ -187,13 +196,13 @@
{
"root": "pagesStatistics",
"pages": [
- {
- "path": "index",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "数据统计"
- }
- },
+ // {
+ // "path": "index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // "navigationBarTitleText": "数据统计"
+ // }
+ // },
{
"path": "receivePanel",
"style": {
@@ -259,13 +268,13 @@
{
"root": "pagesConfig",
"pages": [
- {
- "path": "index",
- "style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "配置"
- }
- },
+ // {
+ // "path": "index",
+ // "style": {
+ // "navigationStyle": "custom",
+ // "navigationBarTitleText": "配置"
+ // }
+ // },
{
"path": "printTemplate",
"style": {
@@ -489,39 +498,34 @@
}
]
}
- // {
- // "root": "uni_modules",
- // "pages": [
- // {
- // "path": "lime-echart/components/l-echart/l-echart",
- // "style": {
- // "navigationBarTitleText": "echart"
- // }
- // }
- // ]
- // }
],
- "tabbar": {
+ "tabBar": {
+ "color": "#7A7E83",
+ "selectedColor": "#00D2E3",
"custom": true, //隐藏官方选项卡
+ "height": "0px",
"list": [
{
- "pagePath": "/pagesHome/index",
+ "pagePath": "pagesHome/index",
+ // 不能用网络图片
+ // "iconPath": "https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/110/tabBar/home.png",
+ // "selectedIconPath": "https://backend-common.obs.cn-east-3.myhuaweicloud.com/static/110/tabBar/home_active.png",
"text": "工作台"
},
{
- "pagePath": "/pagesStatistics/index",
+ "pagePath": "pagesHome/count",
"text": "统计"
},
{
- "pagePath": "/pagesConfig/index",
+ "pagePath": "pagesHome/config",
"text": "配置"
},
{
- "pagePath": "/pagesHome/index1",
+ "pagePath": "pagesHome/index1",
"text": "配置旧"
},
{
- "pagePath": "/pagesLogin/profile/index",
+ "pagePath": "pagesHome/profile",
"text": "我的"
}
]
diff --git a/src/pagesHome/config.vue b/src/pagesHome/config.vue
new file mode 100644
index 0000000..48a7769
--- /dev/null
+++ b/src/pagesHome/config.vue
@@ -0,0 +1,246 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ child.title
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesHome/count.vue b/src/pagesHome/count.vue
new file mode 100644
index 0000000..99b1128
--- /dev/null
+++ b/src/pagesHome/count.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ child.title
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesHome/profile.vue b/src/pagesHome/profile.vue
new file mode 100644
index 0000000..6d17ac4
--- /dev/null
+++ b/src/pagesHome/profile.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ profile.name || "-" }}
+
+
+ {{ profile.phone || "-" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {handleModal(v)}"
+ @handleOk="handleOk()"
+ />
+
+
+
diff --git a/src/uni.scss b/src/uni.scss
index e00724f..2cff5ce 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -22,7 +22,7 @@ $u-primary: #00D2E3 !important;
$uni-color-primary: #00D2E3; // #007aff
$uni-color-success: #4cd964;
$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
+$uni-color-error: #302423;
/* 文字基本颜色 */
$uni-text-color: #333; // 基本色