Browse Source

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-weChat

chenzhen2 1 year ago
parent
commit
3265574bb1
1 changed files with 6 additions and 7 deletions
  1. 6 7
      src/packagesEnv/pages/officehome/index.wpy

+ 6 - 7
src/packagesEnv/pages/officehome/index.wpy

@@ -1218,7 +1218,6 @@ wepy.page({
       projectId: state => state.user.userInfo.projectId,
       handPopHight: state => state.officehome.handPopHight
     }),
-    ...mapActions(['setIsApprovalProject']),
     hasMeetingScene() {
             // 是否展示会议室场景
       let meetingScene =
@@ -1282,9 +1281,9 @@ wepy.page({
     this.transYCopy =
             windowHeightpx - switchPanelHeight - this.topBarHeight - this.roomPicTop // topBarHeight上顶端的bar
     this.windowHeightpx = windowHeightpx
-    if (this.routeParams.showmap == 'true') {
-      this.transY = this.transYCopy
-            // console.log('onready');
+    if (this.routeParams.from === 'FindIt') {
+      this.moveToBottom = true  // 来自找一找, 页面在底部
+      this.toRoom()
     }
   },
   onHide() {
@@ -1312,8 +1311,6 @@ wepy.page({
         this.getCurrentSpace('FindIt')
         this.toMapSpace = JSON.parse(JSON.stringify(this.routeParams))
         this.options.spaceId = this.routeParams.spaceId
-        this.moveToBottom = true  // 来自找一找, 页面在底部
-        this.toRoom()
         this.getData() // 获取数据
       } else {
         // 从首页进入
@@ -1364,7 +1361,9 @@ wepy.page({
       return checkUserControl().then(res => {
         // isControlSpace 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
         this.userControlSpace = res
-        this.toMapSpace = JSON.parse(JSON.stringify(res))
+        if (from === 'FindIt') {
+          this.toMapSpace = JSON.parse(JSON.stringify(res))
+        }
         // 从首页进入 才给空间重新赋值
         if (from === 'home') {
           this.options.spaceId = res.spaceId || ''