diff --git a/src/images/md/21.png b/src/images/md/21.png index 8893444..172d0a4 100644 Binary files a/src/images/md/21.png and b/src/images/md/21.png differ diff --git a/src/images/md/30.png b/src/images/md/30.png index 9697894..bc2e6c8 100644 Binary files a/src/images/md/30.png and b/src/images/md/30.png differ diff --git a/src/pages/17/index.scss b/src/pages/17/index.scss index f0071db..eb11f65 100644 --- a/src/pages/17/index.scss +++ b/src/pages/17/index.scss @@ -1,5 +1,6 @@ .page { width: 100vw; + padding-bottom: 100rpx; } .page-click1 { position: absolute; diff --git a/src/pages/18/index.scss b/src/pages/18/index.scss index 7835af1..f439ae9 100644 --- a/src/pages/18/index.scss +++ b/src/pages/18/index.scss @@ -2,6 +2,10 @@ width: 100vw; min-height: 100vh; padding-bottom: 150rpx; + .swiper-item1 { + height: 100vh; + overflow-y: scroll; + } .page-img { width: 100vw; } diff --git a/src/pages/18/index.ts b/src/pages/18/index.ts index 6829d9d..90ac626 100644 --- a/src/pages/18/index.ts +++ b/src/pages/18/index.ts @@ -5,24 +5,19 @@ Page({ current: 0, }, onLoad() {}, - handleTap1() { - if (this.data.current <= 0) { - wx.navigateBack(); - return; - } + handlePage1() { this.setData({ - current: this.data.current - 1, + current: 1, }); }, - handleTap2() { - if (this.data.current >= 2) { - wx.navigateTo({ - url: "/pages/7/index", - }); - return; - } + handlePage2() { this.setData({ - current: this.data.current + 1, + current: 2, + }); + }, + handlePage3() { + this.setData({ + current: 0, }); }, }); diff --git a/src/pages/18/index.wxml b/src/pages/18/index.wxml index 69c5bb7..4e58d3d 100644 --- a/src/pages/18/index.wxml +++ b/src/pages/18/index.wxml @@ -1,13 +1,13 @@ - + - + - + diff --git a/src/pages/24/index.scss b/src/pages/24/index.scss index f0071db..eb11f65 100644 --- a/src/pages/24/index.scss +++ b/src/pages/24/index.scss @@ -1,5 +1,6 @@ .page { width: 100vw; + padding-bottom: 100rpx; } .page-click1 { position: absolute; diff --git a/src/pages/25/index.scss b/src/pages/25/index.scss index 7835af1..fdb7696 100644 --- a/src/pages/25/index.scss +++ b/src/pages/25/index.scss @@ -1,7 +1,10 @@ .page { width: 100vw; min-height: 100vh; - padding-bottom: 150rpx; + .swiper-item1 { + height: 100vh; + overflow-y: scroll; + } .page-img { width: 100vw; } diff --git a/src/pages/25/index.ts b/src/pages/25/index.ts index 6829d9d..90ac626 100644 --- a/src/pages/25/index.ts +++ b/src/pages/25/index.ts @@ -5,24 +5,19 @@ Page({ current: 0, }, onLoad() {}, - handleTap1() { - if (this.data.current <= 0) { - wx.navigateBack(); - return; - } + handlePage1() { this.setData({ - current: this.data.current - 1, + current: 1, }); }, - handleTap2() { - if (this.data.current >= 2) { - wx.navigateTo({ - url: "/pages/7/index", - }); - return; - } + handlePage2() { this.setData({ - current: this.data.current + 1, + current: 2, + }); + }, + handlePage3() { + this.setData({ + current: 0, }); }, }); diff --git a/src/pages/25/index.wxml b/src/pages/25/index.wxml index 5f98e05..eb34756 100644 --- a/src/pages/25/index.wxml +++ b/src/pages/25/index.wxml @@ -1,13 +1,13 @@ - + - + - + diff --git a/src/pages/4/index.scss b/src/pages/4/index.scss index 77d4232..1dac351 100644 --- a/src/pages/4/index.scss +++ b/src/pages/4/index.scss @@ -5,8 +5,13 @@ page { width: 100vw; min-height: 100vh; padding-bottom: 150rpx; + .swiper-item1 { + height: 100vh; + overflow-y: scroll; + } .page-img { width: 100vw; + padding-bottom: 0; } } diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index 8ba42ae..5c3640f 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index 7835af1..d8a0901 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -1,27 +1,30 @@ .page { width: 100vw; min-height: 100vh; - padding-bottom: 150rpx; + .swiper-item1 { + position: relative; + height: 100vh; + overflow-y: scroll; + .page-click1 { + position: absolute; + top: 1386rpx; + left: 0; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; + } + .page-click2 { + position: absolute; + top: 1386rpx; + left: 50vw; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; + } + } .page-img { width: 100vw; } } - -.page-click1 { - position: absolute; - top: 1386rpx; - left: 0; - z-index: 1; - width: 50vw; - height: 120rpx; - background-color: transparent; -} -.page-click2 { - position: absolute; - top: 1386rpx; - left: 50vw; - z-index: 1; - width: 50vw; - height: 120rpx; - background-color: transparent; -} diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts index 6829d9d..dc23015 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -5,6 +5,21 @@ Page({ current: 0, }, onLoad() {}, + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + this.setData({ + current: 2, + }); + }, + handlePage3() { + this.setData({ + current: 0, + }); + }, handleTap1() { if (this.data.current <= 0) { wx.navigateBack(); @@ -15,14 +30,8 @@ Page({ }); }, handleTap2() { - if (this.data.current >= 2) { - wx.navigateTo({ - url: "/pages/7/index", - }); - return; - } - this.setData({ - current: this.data.current + 1, + wx.navigateTo({ + url: "/pages/7/index", }); }, }); diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index 5ee3728..158511c 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,16 +1,19 @@ - + + + - + + + - + + + - - - diff --git a/src/pages/8/index.ts b/src/pages/8/index.ts index 50ea7bc..b15d136 100644 --- a/src/pages/8/index.ts +++ b/src/pages/8/index.ts @@ -5,6 +5,7 @@ Page({ float1: false, }, onLoad() {}, + time: null as any, handleTap1() { wx.navigateBack(); }, @@ -12,8 +13,12 @@ Page({ this.setData({ float1: true, }); + this.time = setTimeout(() => { + this.handleFloat1(); + }, 2000); }, handleFloat1() { + clearInterval(this.time); wx.reLaunch({ url: "/pages/1/index", }); diff --git a/src/utils/page.ts b/src/utils/page.ts index 4ae4789..ed29e57 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -54,14 +54,14 @@ function page(config: WechatMiniprogram.Page.Instance