diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index 7f81ee7..a162fb2 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -28,7 +28,6 @@ z-index: 2; width: 100vw; padding-bottom: 20rpx; - background-color: #fff; .tabbar-img { width: 100%; } diff --git a/src/pages/3/index.ts b/src/pages/3/index.ts index b3a4114..b4ca364 100644 --- a/src/pages/3/index.ts +++ b/src/pages/3/index.ts @@ -4,9 +4,7 @@ Page({ data: {}, onLoad() {}, handleTap1() { - wx.navigateTo({ - url: "/pages/1/index", - }); + wx.navigateBack() }, }); diff --git a/src/pages/4/index.scss b/src/pages/4/index.scss index 339a226..e5d9779 100644 --- a/src/pages/4/index.scss +++ b/src/pages/4/index.scss @@ -17,7 +17,6 @@ left: 0; width: 100vw; padding-bottom: 20rpx; - background-color: #fff; .tabbar-img { width: 100%; } diff --git a/src/pages/5/index.scss b/src/pages/5/index.scss index 61eadab..135ee60 100644 --- a/src/pages/5/index.scss +++ b/src/pages/5/index.scss @@ -1,5 +1,6 @@ .page{ width: 100vw; + padding-bottom: 260rpx; } .tabbar { @@ -8,7 +9,6 @@ left: 0; width: 100vw; padding-bottom: 20rpx; - background-color: #fff; .tabbar-img { width: 100%; } diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index 61eadab..1d90ce9 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -8,7 +8,6 @@ left: 0; width: 100vw; padding-bottom: 20rpx; - background-color: #fff; .tabbar-img { width: 100%; } diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts index 1f48398..e16cbf1 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -4,7 +4,9 @@ Page({ data: {}, onLoad() {}, handleTap1() { - wx.navigateBack(); + wx.navigateTo({ + url: "/pages/3/index", + }) }, handleTabbar1() { diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss index 6bf1742..b64135c 100644 --- a/src/pages/7/index.scss +++ b/src/pages/7/index.scss @@ -1,8 +1,16 @@ .page { width: 100vw; min-height: 200vh; - .page-img{ + .page-img { width: 100%; height: 100%; } } + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 2; + width: 100vw; +} diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts index 7cb73c1..16610a9 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -7,6 +7,8 @@ Page({ page2: false, page3: false, page4: false, + + float1: false, }, onLoad() {}, handlePage1() { @@ -16,12 +18,13 @@ Page({ }, handlePage2() { this.setData({ - current: 2, + float1: true, }); }, - handlePage3() { + handleFloat1() { this.setData({ - current: 3, + current: 2, + float1: false, }); }, handlePage4() { diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index c4fed96..2cba032 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -1,5 +1,5 @@ - + @@ -7,9 +7,8 @@ - - - + +