|
@@ -1281,6 +1281,8 @@ wepy.page({
|
|
|
this.transYCopy =
|
|
|
windowHeightpx - switchPanelHeight - this.topBarHeight - this.roomPicTop // topBarHeight上顶端的bar
|
|
|
this.windowHeightpx = windowHeightpx
|
|
|
+ console.log(this.routeParams.from, '-----onreD')
|
|
|
+
|
|
|
if (this.routeParams.from === 'FindIt') {
|
|
|
this.moveToBottom = true // 来自找一找, 页面在底部
|
|
|
this.toRoom()
|
|
@@ -1361,11 +1363,9 @@ wepy.page({
|
|
|
return checkUserControl().then(res => {
|
|
|
// isControlSpace 1-租户下无可控;2-租户有可控;3-用户有可控 4-当前空间为常驻空间
|
|
|
this.userControlSpace = res
|
|
|
- if (from === 'FindIt') {
|
|
|
- this.toMapSpace = JSON.parse(JSON.stringify(res))
|
|
|
- }
|
|
|
// 从首页进入 才给空间重新赋值
|
|
|
if (from === 'home') {
|
|
|
+ this.toMapSpace = JSON.parse(JSON.stringify(res))
|
|
|
this.options.spaceId = res.spaceId || ''
|
|
|
}
|
|
|
})
|