diff --git a/.gitignore b/.gitignore
index b66b732..1863e2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,4 +106,6 @@ dist
# Wechat miniprogram
miniprogram_npm
-.idea
\ No newline at end of file
+.idea
+
+project.private.config.json
diff --git a/components/nav/index.js b/components/nav/index.js
index 752b686..9c5012c 100644
--- a/components/nav/index.js
+++ b/components/nav/index.js
@@ -4,13 +4,10 @@ Component({
},
properties: {
navType: {
- type: 'string',
- value: '',
- },
- titleText: {
- type: 'string',
- value: '',
+ type: String,
+ value: 'title',
},
+ titleText: String,
},
data: {
visible: false,
@@ -66,6 +63,13 @@ Component({
isSidebar: false,
},
],
+ statusHeight: 0,
+ },
+ lifetimes: {
+ ready() {
+ const statusHeight = wx.getWindowInfo().statusBarHeight;
+ this.setData({ statusHeight });
+ },
},
methods: {
openDrawer() {
diff --git a/components/nav/index.json b/components/nav/index.json
index 9683c89..b551b47 100644
--- a/components/nav/index.json
+++ b/components/nav/index.json
@@ -2,7 +2,7 @@
"component": true,
"usingComponents": {
"t-navbar": "tdesign-miniprogram/navbar/navbar",
- "t-button": "tdesign-miniprogram/button/button",
+ "t-icon": "tdesign-miniprogram/icon/icon",
"t-drawer": "tdesign-miniprogram/drawer/drawer",
"t-search": "tdesign-miniprogram/search/search"
}
diff --git a/components/nav/index.less b/components/nav/index.less
index ec01475..9a820e3 100644
--- a/components/nav/index.less
+++ b/components/nav/index.less
@@ -2,14 +2,15 @@
.home-navbar {
.t-navbar {
- --td-navbar-padding-top: @navbar-padding-top;
- --td-navbar-height: calc(@nav-bar-height - @navbar-padding-top) !important;
-
&__left {
- margin: 0;
+ margin-left: 12rpx;
}
}
+ &__icon {
+ padding: 12rpx;
+ }
+
&__left {
display: flex;
align-items: center;
@@ -25,4 +26,5 @@
}
}
}
+ --td-drawer-title-font-size: 48rpx;
}
diff --git a/components/nav/index.wxml b/components/nav/index.wxml
index 9690772..4e7b0f4 100644
--- a/components/nav/index.wxml
+++ b/components/nav/index.wxml
@@ -1,8 +1,8 @@
-
+
-
+
-
+
diff --git a/images/bg_navbar.png b/images/bg_navbar.png
new file mode 100644
index 0000000..0cec6c7
Binary files /dev/null and b/images/bg_navbar.png differ
diff --git a/images/bg_navbar2.png b/images/bg_navbar2.png
new file mode 100644
index 0000000..634e56c
Binary files /dev/null and b/images/bg_navbar2.png differ
diff --git a/images/image@2x(2).png b/images/icon_doc.png
similarity index 100%
rename from images/image@2x(2).png
rename to images/icon_doc.png
diff --git a/images/image@2x(3).png b/images/icon_map.png
similarity index 100%
rename from images/image@2x(3).png
rename to images/icon_map.png
diff --git a/images/image@2x(1).png b/images/icon_qq.png
similarity index 100%
rename from images/image@2x(1).png
rename to images/icon_qq.png
diff --git a/images/image@2x(4).png b/images/icon_td.png
similarity index 100%
rename from images/image@2x(4).png
rename to images/icon_td.png
diff --git a/images/image@2x.png b/images/icon_wx.png
similarity index 100%
rename from images/image@2x.png
rename to images/icon_wx.png
diff --git a/images/image(1).png b/images/image(1).png
deleted file mode 100644
index 4fb133d..0000000
Binary files a/images/image(1).png and /dev/null differ
diff --git a/images/image(2).png b/images/image(2).png
deleted file mode 100644
index 18eefbd..0000000
Binary files a/images/image(2).png and /dev/null differ
diff --git a/images/image(3).png b/images/image(3).png
deleted file mode 100644
index fc24469..0000000
Binary files a/images/image(3).png and /dev/null differ
diff --git a/images/image(4).png b/images/image(4).png
deleted file mode 100644
index 2e4e0c1..0000000
Binary files a/images/image(4).png and /dev/null differ
diff --git a/images/image.png b/images/image.png
deleted file mode 100644
index 2797450..0000000
Binary files a/images/image.png and /dev/null differ
diff --git a/mock/my/getPersonalInfo.js b/mock/my/getPersonalInfo.js
index b7e5c5c..59dc0f8 100644
--- a/mock/my/getPersonalInfo.js
+++ b/mock/my/getPersonalInfo.js
@@ -4,7 +4,7 @@ export default {
code: 200,
message: 'success',
data: {
- image: '/../../images/avatar1.png',
+ image: '/images/avatar1.png',
name: '小小轩',
star: '天枰座',
city: '深圳',
diff --git a/mock/my/getServiceList.js b/mock/my/getServiceList.js
index 1f386cb..12cdf7f 100644
--- a/mock/my/getServiceList.js
+++ b/mock/my/getServiceList.js
@@ -5,14 +5,14 @@ export default {
message: 'success',
data: {
service: [
- { image: '/../images/image.png', name: '微信', type: 'weixin', url: '' },
- { image: '/../images/image(1).png', name: 'QQ', type: 'QQ', url: '' },
- { image: '/../images/image(2).png', name: '腾讯文档', type: 'document', url: '' },
- { image: '/../images/image(3).png', name: '腾讯地图', type: 'map', url: '' },
- { image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
- { image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
- { image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
- { image: '/../images/image(4).png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
+ { image: '/images/icon_wx.png', name: '微信', type: 'weixin', url: '' },
+ { image: '/images/icon_qq.png', name: 'QQ', type: 'QQ', url: '' },
+ { image: '/images/icon_doc.png', name: '腾讯文档', type: 'document', url: '' },
+ { image: '/images/icon_map.png', name: '腾讯地图', type: 'map', url: '' },
+ { image: '/images/icon_td.png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
+ { image: '/images/icon_td.png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
+ { image: '/images/icon_td.png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
+ { image: '/images/icon_td.png', name: '数据中心', type: 'data', url: '/pages/dataCenter/index' },
],
},
},
diff --git a/pages/dataCenter/index.json b/pages/dataCenter/index.json
index a22981a..284b042 100644
--- a/pages/dataCenter/index.json
+++ b/pages/dataCenter/index.json
@@ -1,6 +1,7 @@
{
- "navigationBarTitleText": "数据中心",
+ "navigationStyle": "custom",
"usingComponents": {
+ "t-navbar": "tdesign-miniprogram/navbar/navbar",
"t-progress": "tdesign-miniprogram/progress/progress",
"t-empty": "tdesign-miniprogram/empty/empty"
}
diff --git a/pages/dataCenter/index.wxml b/pages/dataCenter/index.wxml
index ef3e290..a67971d 100644
--- a/pages/dataCenter/index.wxml
+++ b/pages/dataCenter/index.wxml
@@ -1,3 +1,4 @@
+