From e144b1e91c4926efd99ef4d62029e3eda67fd72d Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 18:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
subPackage/workbench/views/cshw.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/subPackage/workbench/views/cshw.vue b/subPackage/workbench/views/cshw.vue
index e7db3b2..36c834c 100644
--- a/subPackage/workbench/views/cshw.vue
+++ b/subPackage/workbench/views/cshw.vue
@@ -66,12 +66,14 @@
tabStatus: 1,
keyWord: '',
loadingStatus: 'nomore',
- clickInfo: {}
+ clickInfo: {},
+ currentRole: {}
}
},
onShow() {
this.resetParams()
- this.getSiteList()
+ this.getSiteList()
+ this.currentRole = uni.getStorageSync("activeRole")
},
onReachBottom() {
this.pagingParams.current++
@@ -129,7 +131,11 @@
})
return res
},
- pushPage(placeId, id) {
+ pushPage(placeId, id) {
+ const { roleAlias } = this.currentRole
+ if (roleAlias === "inhabitant") {
+ return
+ }
this.$u.func.globalNavigator(`/subPackage/workbench/views/examine?id=${id}&placeId=${placeId}`)
}
}
@@ -166,7 +172,8 @@
padding: 10rpx 0;
.address {
- width: 65%;
+ width: 65%;
+ text-align: right;
}
}
}
--
Gitblit v1.9.3