diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
index 86ad85d..538a3b7 100644
--- a/miniprogram/pages/index/index.js
+++ b/miniprogram/pages/index/index.js
@@ -108,16 +108,16 @@ Page({
path: "/pages/parkRepair/parkRepair"
},
*/
- // {
- // name: "会议预约",
- // img: "/profile/static/index/menu-hyyy.png",
- // path: "/pages/meeting/meetingReservation/meetingReservation"
- // },
{
name: "随手拍",
img: "/profile/static/index/menu-bxfw.png",
path: "/pages/reportRepair/index/index"
},
+ {
+ name: "会议预约",
+ img: "/profile/static/index/menu-hyyy.png",
+ // path: "/pages/meeting/meetingReservation/meetingReservation"
+ },
// {
// name: "展厅预约",
// img: "/profile/static/index/menu-ztyy.png",
@@ -171,7 +171,6 @@ Page({
parkName: app.parkName,
qrcodeParam: null,
infoList: [],
-
},
onLoad(options) {
@@ -246,7 +245,7 @@ Page({
})
} else {
wx.showModal({
- content: '模块暂未开放,敬请期待',
+ content: `"${e.currentTarget.dataset.name}"暂未开放`,
showCancel: false,
})
}
diff --git a/miniprogram/pages/index/index.json b/miniprogram/pages/index/index.json
index 8323de1..32e3f2e 100644
--- a/miniprogram/pages/index/index.json
+++ b/miniprogram/pages/index/index.json
@@ -3,6 +3,7 @@
"navigationStyle": "custom",
"usingComponents": {
"van-notify": "@vant/weapp/notify/index",
- "van-icon": "@vant/weapp/icon/index"
+ "van-icon": "@vant/weapp/icon/index",
+ "van-divider": "@vant/weapp/divider/index"
}
}
\ No newline at end of file
diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
index f542a86..d4d4658 100644
--- a/miniprogram/pages/index/index.wxml
+++ b/miniprogram/pages/index/index.wxml
@@ -30,6 +30,10 @@
消息通知
更多
+
+
+ 暂无消息
+
@@ -37,7 +41,6 @@
{{item.content}}
{{item.createTime}}
-
diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss
index 21c3e59..8490e7b 100644
--- a/miniprogram/pages/index/index.wxss
+++ b/miniprogram/pages/index/index.wxss
@@ -281,4 +281,9 @@
.menuTitle {
font-size: 24rpx;
color: #646466;
+}
+
+
+.loadAllLine {
+ margin-top: 80rpx;
}
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/assign/record/record.js b/miniprogram/pages/reportRepair/assign/record/record.js
index f59188f..e5f4b57 100644
--- a/miniprogram/pages/reportRepair/assign/record/record.js
+++ b/miniprogram/pages/reportRepair/assign/record/record.js
@@ -108,6 +108,22 @@ Page({
}
},
+ // 切换tabbar
+ switchTab(e) {
+ const data = e.currentTarget.dataset
+ console.log('switchTab', data)
+ const url = data.path
+ if (url == '/pages/reportRepair/report/report') {
+ wx.navigateTo({
+ url
+ })
+ } else {
+ wx.switchTab({
+ url
+ })
+ }
+ },
+
// 获取数据
getDataList(transferTabTitle) {
// 获取参数
diff --git a/miniprogram/pages/reportRepair/query/record/record.js b/miniprogram/pages/reportRepair/query/record/record.js
index 9a7c3d9..28ddb1c 100644
--- a/miniprogram/pages/reportRepair/query/record/record.js
+++ b/miniprogram/pages/reportRepair/query/record/record.js
@@ -92,6 +92,22 @@ Page({
let userId = _this.data.userData.id
},
+ // 切换tabbar
+ switchTab(e) {
+ const data = e.currentTarget.dataset
+ console.log('switchTab', data)
+ const url = data.path
+ if (url == '/pages/reportRepair/report/report') {
+ wx.navigateTo({
+ url
+ })
+ } else {
+ wx.switchTab({
+ url
+ })
+ }
+ },
+
// tab 点击切换
tabClickSwitch(event) {
console.log('tabClickSwitch', event);
diff --git a/miniprogram/pages/reportRepair/repair/index/index.js b/miniprogram/pages/reportRepair/repair/index/index.js
index 84ad3dc..08b8714 100644
--- a/miniprogram/pages/reportRepair/repair/index/index.js
+++ b/miniprogram/pages/reportRepair/repair/index/index.js
@@ -82,6 +82,22 @@ Page({
let _this = this;
},
+ // 切换tabbar
+ switchTab(e) {
+ const data = e.currentTarget.dataset
+ console.log('switchTab', data)
+ const url = data.path
+ if (url == '/pages/reportRepair/report/report') {
+ wx.navigateTo({
+ url
+ })
+ } else {
+ wx.switchTab({
+ url
+ })
+ }
+ },
+
back() {
wx.navigateBack()
},