Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 e144b1e91c4926efd99ef4d62029e3eda67fd72d

 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;

         }

      }

   }