diff --git a/README.md b/README.md
index 487c0eb..f65b22e 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,6 @@
"iconPath": "images/home/information.png",
"selectedIconPath": "images/home/informationSelected.png"
},
-
- wx.navigateTo({
- url: `/subpages/home/pages/webview/webview?url=${global.WEBROOT()}&token=${token}&deptName=${this.data.street}&gridId=${this.data.departmentId}`
- })
2a43afb52996723c6517edb048de6c79 小程序密钥
15554200534
diff --git a/app.js b/app.js
index d68ced8..9830a9e 100644
--- a/app.js
+++ b/app.js
@@ -20,6 +20,7 @@ App({
this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2
}
})
+ wx.hideTabBar()
},
globalData: {
userInfo: null,
diff --git a/app.json b/app.json
index 1a4aee7..b431063 100644
--- a/app.json
+++ b/app.json
@@ -44,7 +44,11 @@
"root": "subpages/communitySelfInsp",
"name": "communitySelfInsp",
"pages": [
- "pages/historyQuery/historyQuery"
+ "pages/historyQuery/historyQuery",
+ "pages/synthesis/synthesis",
+ "pages/dissatisfactionDetails/dissatisfactionDetails",
+ "pages/followUpList/followUpList",
+ "pages/followUpDetail/followUpDetail"
]
},
{
diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js
new file mode 100644
index 0000000..9a1cc36
--- /dev/null
+++ b/components/custom-tab-bar/index.js
@@ -0,0 +1,50 @@
+const app = getApp()
+Component({
+ data: {
+ selected: 0,
+ color: "#999",
+ selectedColor: "#3A80E7",
+ "list": [
+ {
+ "pagePath": "/pages/index/index",
+ "text": "消息",
+ "iconPath": "/images/home/message.png",
+ "selectedIconPath": "/images/home/messageSelected.png"
+ },
+ {
+ "pagePath": "/pages/work/work",
+ "text": "工作",
+ "iconPath": "/images/home/work.png",
+ "selectedIconPath": "/images/home/workSelected.png"
+ },
+ {
+ "pagePath": "/pages/statistics/statistics",
+ "text": "统计",
+ "iconPath": "/images/home/information.png",
+ "selectedIconPath": "/images/home/informationSelected.png"
+ },
+ {
+ "pagePath": "/pages/mine/mine",
+ "text": "我的",
+ "iconPath": "/images/home/mine.png",
+ "selectedIconPath": "/images/home/mineSelected.png"
+ }
+ ]
+ },
+ attached() {
+ },
+ ready: function() {
+ this.setData({
+ selected: app.globalData.selected
+ })
+ },
+ methods: {
+ switchTab(e) {
+ console.log(e);
+ const data = e.currentTarget.dataset;
+ const url = data.path;
+ app.globalData.selected = data.index;
+ wx.switchTab({url})
+ }
+ }
+})
\ No newline at end of file
diff --git a/components/custom-tab-bar/index.json b/components/custom-tab-bar/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/components/custom-tab-bar/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/custom-tab-bar/index.wxml b/components/custom-tab-bar/index.wxml
new file mode 100644
index 0000000..560dfa5
--- /dev/null
+++ b/components/custom-tab-bar/index.wxml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
+
\ No newline at end of file
diff --git a/components/custom-tab-bar/index.wxss b/components/custom-tab-bar/index.wxss
new file mode 100644
index 0000000..387a5c8
--- /dev/null
+++ b/components/custom-tab-bar/index.wxss
@@ -0,0 +1,38 @@
+.tab-bar {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: auto;
+ background: white;
+ display: flex;
+ box-shadow: 0px 6rpx 18rpx 0px rgba(216,216,216,0.66);
+ }
+ .isIPhoneXRegexBottom {
+ padding-bottom: constant(safe-area-inset-bottom); /*兼容 IOS<11.2*/
+ padding-bottom: env(safe-area-inset-bottom); /*兼容 IOS>11.2*/
+ }
+
+ .tab-bar-item {
+ flex: 1;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+ padding-top: 10rpx;
+ }
+
+ .tab-bar-item image {
+ width: 54rpx;
+ height: 54rpx;
+ }
+ /* .tab-bar-item image.bigicon{
+ width: 70rpx;
+ height: 70rpx;
+ } */
+ .tab-bar-item view {
+ font-size: 22rpx;
+ color:#999999
+ }
+
\ No newline at end of file
diff --git a/images/home/message.png b/images/home/message.png
index 2992d37..57a93ad 100644
Binary files a/images/home/message.png and b/images/home/message.png differ
diff --git a/images/work/bg.png b/images/work/bg.png
new file mode 100644
index 0000000..9d8a642
Binary files /dev/null and b/images/work/bg.png differ
diff --git a/images/work/messageBg.png b/images/work/messageBg.png
new file mode 100644
index 0000000..1ab5b4d
Binary files /dev/null and b/images/work/messageBg.png differ
diff --git a/images/work/rightCri.png b/images/work/rightCri.png
new file mode 100644
index 0000000..98ae819
Binary files /dev/null and b/images/work/rightCri.png differ
diff --git a/pages/index/index.json b/pages/index/index.json
index bd4e225..9e077c1 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -2,6 +2,7 @@
"navigationStyle": "custom",
"usingComponents": {
"load-more": "../../components/loadMore/loadMore",
- "no-data": "../../components/noData/nodata"
+ "no-data": "../../components/noData/nodata",
+ "custom-tab-bar":"../../components/custom-tab-bar"
}
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 483a76f..665af4f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -36,5 +36,5 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index d1b86f7..a4cde51 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -81,5 +81,10 @@ Page({
wx.navigateTo({
url: '/subpages/gatherInformation/pages/gatherInformation/gatherInformation',
})
+ },
+ toFollowUpList(){
+ wx.navigateTo({
+ url: '/subpages/communitySelfInsp/pages/followUpList/followUpList',
+ })
}
})
\ No newline at end of file
diff --git a/pages/mine/mine.json b/pages/mine/mine.json
index 7af8b0a..c9cb9bb 100644
--- a/pages/mine/mine.json
+++ b/pages/mine/mine.json
@@ -1,4 +1,6 @@
{
- "usingComponents": {},
+ "usingComponents": {
+ "custom-tab-bar":"../../components/custom-tab-bar"
+ },
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index b5ff901..509ccb7 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -23,7 +23,7 @@
-
+
我的回访记录
@@ -46,3 +46,4 @@
+
diff --git a/pages/statistics/statistics.json b/pages/statistics/statistics.json
index 6fe2293..5368563 100644
--- a/pages/statistics/statistics.json
+++ b/pages/statistics/statistics.json
@@ -7,5 +7,6 @@
"HotlineComplaints": "./modules/HotlineComplaints/HotlineComplaints",
"EventPrediction": "./modules/EventPrediction/EventPrediction",
"CrowdPortrait": "./modules/CrowdPortrait/CrowdPortrait"
- }
+ "custom-tab-bar":"../../components/custom-tab-bar"
+ }
}
\ No newline at end of file
diff --git a/pages/statistics/statistics.wxml b/pages/statistics/statistics.wxml
index 7ed2778..3bb7258 100644
--- a/pages/statistics/statistics.wxml
+++ b/pages/statistics/statistics.wxml
@@ -1,4 +1,5 @@