|
|
|
@ -139,24 +139,24 @@ Page({ |
|
|
|
const moveY = e.touches[0].clientY; |
|
|
|
const diffY = moveY - this.data.startY; |
|
|
|
|
|
|
|
// 如果移动距离超过20px,视为拖动
|
|
|
|
if (Math.abs(diffY) > 20) { |
|
|
|
this.setData({ |
|
|
|
isDragging: true |
|
|
|
}); |
|
|
|
|
|
|
|
// 更新按钮位置
|
|
|
|
let newTop = this.data.sidebarBtnTop + diffY * 2; // 转换为rpx
|
|
|
|
let newTop = this.data.sidebarBtnTop + diffY * 3; |
|
|
|
|
|
|
|
// 限制按钮在屏幕范围内
|
|
|
|
const screenHeight = wx.getSystemInfoSync().screenHeight * 2; // 转换为rpx
|
|
|
|
const btnHeight = 180; // 按钮高度,单位rpx
|
|
|
|
const boundary = 300; // 边界值,限制拖动范围
|
|
|
|
const systemInfo = wx.getSystemInfoSync(); |
|
|
|
const screenHeight = systemInfo.screenHeight * 2; |
|
|
|
const btnHeight = 90; |
|
|
|
|
|
|
|
const minTop = screenHeight * 0.2; |
|
|
|
const maxTop = screenHeight * 0.6; |
|
|
|
|
|
|
|
if (newTop < boundary) { |
|
|
|
newTop = boundary; |
|
|
|
} else if (newTop > screenHeight - btnHeight - boundary) { |
|
|
|
newTop = screenHeight - btnHeight - boundary; |
|
|
|
if (newTop < minTop) { |
|
|
|
newTop = minTop; |
|
|
|
} else if (newTop > maxTop) { |
|
|
|
newTop = maxTop; |
|
|
|
} |
|
|
|
|
|
|
|
this.setData({ |
|
|
|
@ -193,12 +193,22 @@ Page({ |
|
|
|
console.log('首页初始化') |
|
|
|
const savedBtnTop = wx.getStorageSync('sidebarBtnTop'); |
|
|
|
const savedBtnHidden = wx.getStorageSync('sidebarBtnHidden'); |
|
|
|
if (savedBtnTop !== '') { |
|
|
|
const systemInfo = wx.getSystemInfoSync(); |
|
|
|
const screenHeight = systemInfo.screenHeight * 2; |
|
|
|
|
|
|
|
let defaultTop = screenHeight * 0.5; |
|
|
|
if (savedBtnTop !== '' && savedBtnTop !== -100) { |
|
|
|
const minTop = screenHeight * 0.2; |
|
|
|
const maxTop = screenHeight * 0.6; |
|
|
|
if (savedBtnTop >= minTop && savedBtnTop <= maxTop) { |
|
|
|
defaultTop = savedBtnTop; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
this.setData({ |
|
|
|
sidebarBtnTop: savedBtnTop, |
|
|
|
sidebarBtnTop: defaultTop, |
|
|
|
sidebarBtnHidden: savedBtnHidden || false |
|
|
|
}); |
|
|
|
} |
|
|
|
this.checkAndRestoreLoginStatus() |
|
|
|
this.loadGoods() |
|
|
|
}, |
|
|
|
@ -212,9 +222,21 @@ Page({ |
|
|
|
const app = getApp(); |
|
|
|
app.updateCurrentTab('index'); |
|
|
|
app.globalData.showTabBar = true; |
|
|
|
|
|
|
|
const savedBtnHidden = wx.getStorageSync('sidebarBtnHidden'); |
|
|
|
this.setData({ |
|
|
|
sidebarBtnHidden: savedBtnHidden || false |
|
|
|
}); |
|
|
|
|
|
|
|
this.checkAndRestoreLoginStatus() |
|
|
|
}, |
|
|
|
|
|
|
|
onHide: function () { |
|
|
|
this.setData({ |
|
|
|
sidebarBtnHidden: true |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
onPullDownRefresh: function() { |
|
|
|
this.onRefresh() |
|
|
|
}, |
|
|
|
@ -767,6 +789,9 @@ Page({ |
|
|
|
|
|
|
|
// 跳转到招商合作页面
|
|
|
|
navigateToCooperation: function() { |
|
|
|
this.setData({ |
|
|
|
sidebarBtnHidden: true |
|
|
|
}); |
|
|
|
wx.navigateTo({ |
|
|
|
url: '/pages/cooperation/index' |
|
|
|
}) |
|
|
|
|