|
@@ -132,21 +132,27 @@ Page({
|
|
|
that.setData({
|
|
|
moveFlag: false,
|
|
|
});
|
|
|
- if (!that.data.showPart1 && that.data.showPart2) {
|
|
|
+ if (that.data.showPart1 && that.data.showPart2) {
|
|
|
let ani = wx.createAnimation({
|
|
|
delay: 0,
|
|
|
duration: 1000,
|
|
|
});
|
|
|
- ani.opacity(0.5).step();
|
|
|
- that.setData({
|
|
|
- showPart1: true,
|
|
|
- showPart2: false,
|
|
|
- ani: ani.export()
|
|
|
+ let ani2 = wx.createAnimation({
|
|
|
+ delay: 0,
|
|
|
+ duration: 1000,
|
|
|
});
|
|
|
- ani.opacity(1).step();
|
|
|
+ ani.translateY(0).step();
|
|
|
+ ani2.translateY(0).step();
|
|
|
that.setData({
|
|
|
- ani: ani.export()
|
|
|
+ ani: ani.export(),
|
|
|
+ ani2: ani2.export(),
|
|
|
});
|
|
|
+ setTimeout(() => {
|
|
|
+ that.setData({
|
|
|
+ showPart1: true,
|
|
|
+ showPart2: false,
|
|
|
+ });
|
|
|
+ }, 1100);
|
|
|
}
|
|
|
}
|
|
|
// 上滑
|
|
@@ -156,19 +162,24 @@ Page({
|
|
|
moveFlag: false,
|
|
|
});
|
|
|
if (that.data.showPart1 && !that.data.showPart2) {
|
|
|
+ that.setData({
|
|
|
+ showPart2: true,
|
|
|
+ });
|
|
|
let ani = wx.createAnimation({
|
|
|
delay: 0,
|
|
|
duration: 1000,
|
|
|
});
|
|
|
- ani.opacity(0.5).step();
|
|
|
- that.setData({
|
|
|
- showPart1: false,
|
|
|
- showPart2: true,
|
|
|
- ani: ani.export()
|
|
|
+ let ani2 = wx.createAnimation({
|
|
|
+ delay: 0,
|
|
|
+ duration: 1000,
|
|
|
});
|
|
|
- ani.opacity(1).step();
|
|
|
+ let windowInfo = wx.getWindowInfo();
|
|
|
+ // console.info(windowInfo.screenHeight);
|
|
|
+ ani.translateY(-windowInfo.screenHeight).step();
|
|
|
+ ani2.translateY(-windowInfo.screenHeight).step();
|
|
|
that.setData({
|
|
|
- ani: ani.export()
|
|
|
+ ani: ani.export(),
|
|
|
+ ani2: ani2.export(),
|
|
|
});
|
|
|
}
|
|
|
}
|