|
@@ -1281,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() {
|
|
@@ -1311,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 {
|
|
|
// 从首页进入
|
|
@@ -1363,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 || ''
|