diff --git a/project.private.config.json b/project.private.config.json index d8816bf..d2863c6 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -32,4 +32,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/app.json b/src/app.json index e3212de..fe22e4d 100644 --- a/src/app.json +++ b/src/app.json @@ -1,5 +1,6 @@ { "pages": [ + "pages/0/index", "pages/1/index", "pages/2/index", "pages/3/index", diff --git a/src/images/class/1.png b/src/images/class/1.png new file mode 100644 index 0000000..167b57d Binary files /dev/null and b/src/images/class/1.png differ diff --git a/src/images/class/10.png b/src/images/class/10.png new file mode 100644 index 0000000..71ce454 Binary files /dev/null and b/src/images/class/10.png differ diff --git a/src/images/class/11.png b/src/images/class/11.png new file mode 100644 index 0000000..28f3068 Binary files /dev/null and b/src/images/class/11.png differ diff --git a/src/images/class/12.png b/src/images/class/12.png new file mode 100644 index 0000000..f71f3d9 Binary files /dev/null and b/src/images/class/12.png differ diff --git a/src/images/class/13.png b/src/images/class/13.png new file mode 100644 index 0000000..b0c64a0 Binary files /dev/null and b/src/images/class/13.png differ diff --git a/src/images/class/14.png b/src/images/class/14.png new file mode 100644 index 0000000..45075ae Binary files /dev/null and b/src/images/class/14.png differ diff --git a/src/images/class/15.png b/src/images/class/15.png new file mode 100644 index 0000000..405ddc3 Binary files /dev/null and b/src/images/class/15.png differ diff --git a/src/images/class/16.png b/src/images/class/16.png new file mode 100644 index 0000000..0bde379 Binary files /dev/null and b/src/images/class/16.png differ diff --git a/src/images/class/17.png b/src/images/class/17.png new file mode 100644 index 0000000..137976e Binary files /dev/null and b/src/images/class/17.png differ diff --git a/src/images/class/18.jpg b/src/images/class/18.jpg new file mode 100644 index 0000000..d4c5501 Binary files /dev/null and b/src/images/class/18.jpg differ diff --git a/src/images/class/19.png b/src/images/class/19.png new file mode 100644 index 0000000..d9134af Binary files /dev/null and b/src/images/class/19.png differ diff --git a/src/images/class/2.png b/src/images/class/2.png new file mode 100644 index 0000000..112cfdb Binary files /dev/null and b/src/images/class/2.png differ diff --git a/src/images/class/20.png b/src/images/class/20.png new file mode 100644 index 0000000..ebc8926 Binary files /dev/null and b/src/images/class/20.png differ diff --git a/src/images/class/21.png b/src/images/class/21.png new file mode 100644 index 0000000..b4c7326 Binary files /dev/null and b/src/images/class/21.png differ diff --git a/src/images/class/22.png b/src/images/class/22.png new file mode 100644 index 0000000..3018641 Binary files /dev/null and b/src/images/class/22.png differ diff --git a/src/images/class/23.png b/src/images/class/23.png new file mode 100644 index 0000000..dc0072b Binary files /dev/null and b/src/images/class/23.png differ diff --git a/src/images/class/24.png b/src/images/class/24.png new file mode 100644 index 0000000..9fed86e Binary files /dev/null and b/src/images/class/24.png differ diff --git a/src/images/class/25.png b/src/images/class/25.png new file mode 100644 index 0000000..c2b24c6 Binary files /dev/null and b/src/images/class/25.png differ diff --git a/src/images/class/26.png b/src/images/class/26.png new file mode 100644 index 0000000..b61aba1 Binary files /dev/null and b/src/images/class/26.png differ diff --git a/src/images/class/27.png b/src/images/class/27.png new file mode 100644 index 0000000..024d707 Binary files /dev/null and b/src/images/class/27.png differ diff --git a/src/images/class/28.png b/src/images/class/28.png new file mode 100644 index 0000000..ddc95e4 Binary files /dev/null and b/src/images/class/28.png differ diff --git a/src/images/class/3.png b/src/images/class/3.png new file mode 100644 index 0000000..54a6d7f Binary files /dev/null and b/src/images/class/3.png differ diff --git a/src/images/class/4.png b/src/images/class/4.png new file mode 100644 index 0000000..455417d Binary files /dev/null and b/src/images/class/4.png differ diff --git a/src/images/class/5.png b/src/images/class/5.png new file mode 100644 index 0000000..5430a84 Binary files /dev/null and b/src/images/class/5.png differ diff --git a/src/images/class/6.png b/src/images/class/6.png new file mode 100644 index 0000000..d9b043a Binary files /dev/null and b/src/images/class/6.png differ diff --git a/src/images/class/7.jpg b/src/images/class/7.jpg new file mode 100644 index 0000000..3dcf409 Binary files /dev/null and b/src/images/class/7.jpg differ diff --git a/src/images/class/8.png b/src/images/class/8.png new file mode 100644 index 0000000..9aaf357 Binary files /dev/null and b/src/images/class/8.png differ diff --git a/src/images/class/9.png b/src/images/class/9.png new file mode 100644 index 0000000..3082e61 Binary files /dev/null and b/src/images/class/9.png differ diff --git a/src/images/class/tabbar1.png b/src/images/class/tabbar1.png new file mode 100644 index 0000000..7b1f1fa Binary files /dev/null and b/src/images/class/tabbar1.png differ diff --git a/src/images/class/tabbar2.png b/src/images/class/tabbar2.png new file mode 100644 index 0000000..18a812a Binary files /dev/null and b/src/images/class/tabbar2.png differ diff --git a/src/images/class/tabbar3.png b/src/images/class/tabbar3.png new file mode 100644 index 0000000..4fe028e Binary files /dev/null and b/src/images/class/tabbar3.png differ diff --git a/src/images/class/tabbar4.png b/src/images/class/tabbar4.png new file mode 100644 index 0000000..db30a56 Binary files /dev/null and b/src/images/class/tabbar4.png differ diff --git a/src/images/qs/图片(2)/图片/1.png b/src/images/qs/图片(2)/图片/1.png deleted file mode 100644 index 0d842f5..0000000 Binary files a/src/images/qs/图片(2)/图片/1.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/10.png b/src/images/qs/图片(2)/图片/10.png deleted file mode 100644 index 1f96445..0000000 Binary files a/src/images/qs/图片(2)/图片/10.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/11.png b/src/images/qs/图片(2)/图片/11.png deleted file mode 100644 index 630e396..0000000 Binary files a/src/images/qs/图片(2)/图片/11.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/12.png b/src/images/qs/图片(2)/图片/12.png deleted file mode 100644 index 4df1f31..0000000 Binary files a/src/images/qs/图片(2)/图片/12.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/13.png b/src/images/qs/图片(2)/图片/13.png deleted file mode 100644 index 190cdcf..0000000 Binary files a/src/images/qs/图片(2)/图片/13.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/14.png b/src/images/qs/图片(2)/图片/14.png deleted file mode 100644 index 350db64..0000000 Binary files a/src/images/qs/图片(2)/图片/14.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/15.png b/src/images/qs/图片(2)/图片/15.png deleted file mode 100644 index 07d7df6..0000000 Binary files a/src/images/qs/图片(2)/图片/15.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/16.png b/src/images/qs/图片(2)/图片/16.png deleted file mode 100644 index 851da8d..0000000 Binary files a/src/images/qs/图片(2)/图片/16.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/17.png b/src/images/qs/图片(2)/图片/17.png deleted file mode 100644 index b913281..0000000 Binary files a/src/images/qs/图片(2)/图片/17.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/18.png b/src/images/qs/图片(2)/图片/18.png deleted file mode 100644 index d5922b1..0000000 Binary files a/src/images/qs/图片(2)/图片/18.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/19.png b/src/images/qs/图片(2)/图片/19.png deleted file mode 100644 index fd80c6b..0000000 Binary files a/src/images/qs/图片(2)/图片/19.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/2.png b/src/images/qs/图片(2)/图片/2.png deleted file mode 100644 index b372503..0000000 Binary files a/src/images/qs/图片(2)/图片/2.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/20.png b/src/images/qs/图片(2)/图片/20.png deleted file mode 100644 index 74e439e..0000000 Binary files a/src/images/qs/图片(2)/图片/20.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/21.png b/src/images/qs/图片(2)/图片/21.png deleted file mode 100644 index 948c359..0000000 Binary files a/src/images/qs/图片(2)/图片/21.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/22.png b/src/images/qs/图片(2)/图片/22.png deleted file mode 100644 index e757e57..0000000 Binary files a/src/images/qs/图片(2)/图片/22.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/3.png b/src/images/qs/图片(2)/图片/3.png deleted file mode 100644 index 364b4ed..0000000 Binary files a/src/images/qs/图片(2)/图片/3.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/4.png b/src/images/qs/图片(2)/图片/4.png deleted file mode 100644 index dfafa57..0000000 Binary files a/src/images/qs/图片(2)/图片/4.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/5.png b/src/images/qs/图片(2)/图片/5.png deleted file mode 100644 index 6c912cf..0000000 Binary files a/src/images/qs/图片(2)/图片/5.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/6.png b/src/images/qs/图片(2)/图片/6.png deleted file mode 100644 index 440e6ae..0000000 Binary files a/src/images/qs/图片(2)/图片/6.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/7.png b/src/images/qs/图片(2)/图片/7.png deleted file mode 100644 index 921a78a..0000000 Binary files a/src/images/qs/图片(2)/图片/7.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/8.png b/src/images/qs/图片(2)/图片/8.png deleted file mode 100644 index d44382c..0000000 Binary files a/src/images/qs/图片(2)/图片/8.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/9.png b/src/images/qs/图片(2)/图片/9.png deleted file mode 100644 index 445376e..0000000 Binary files a/src/images/qs/图片(2)/图片/9.png and /dev/null differ diff --git a/src/images/qs/图片(2)/图片/andikj.png b/src/images/qs/图片(2)/图片/andikj.png deleted file mode 100644 index ec91020..0000000 Binary files a/src/images/qs/图片(2)/图片/andikj.png and /dev/null differ diff --git a/src/pages/0/index.json b/src/pages/0/index.json new file mode 100644 index 0000000..4cb6a9b --- /dev/null +++ b/src/pages/0/index.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-icon": "@vant/weapp/icon/index" + } +} diff --git a/src/pages/0/index.scss b/src/pages/0/index.scss new file mode 100644 index 0000000..4c81e45 --- /dev/null +++ b/src/pages/0/index.scss @@ -0,0 +1,23 @@ +.page { + width: 100vw; + min-height: 3000rpx; + .page-img { + width: 100vw; + } + .page-click1 { + position: absolute; + top: 248rpx; + right: 72rpx; + z-index: 2; + width: 64rpx; + height: 64rpx; + background-color: transparent; + } +} + +.float1 { + display: block; + margin: 0 auto; + width: 670rpx; + height: 706rpx; +} diff --git a/src/pages/0/index.ts b/src/pages/0/index.ts new file mode 100644 index 0000000..91e21d4 --- /dev/null +++ b/src/pages/0/index.ts @@ -0,0 +1,25 @@ +const _app = getApp(); + +Page({ + data: { + current: 0, + float1: false, + }, + onLoad(options) { + this.setData({ + current: Number(options.current), + }); + }, + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + wx.navigateTo({ + url: "/pages/1/index", + }); + }, +}); + +export {}; diff --git a/src/pages/0/index.wxml b/src/pages/0/index.wxml new file mode 100644 index 0000000..75b47dd --- /dev/null +++ b/src/pages/0/index.wxml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index d860e7c..c9b77fc 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -4,51 +4,89 @@ } .page-click1 { position: absolute; - top: 836rpx; + top: 206rpx; left: 0; z-index: 1; - width: 50vw; - height: 336rpx; + width: 100vw; + height: 700rpx; background-color: transparent; + // background-color: #000; } .page-click2 { position: absolute; - top: 836rpx; - right: 0; + top: 886rpx; + left: 0; z-index: 1; - width: 50vw; - height: 336rpx; + width: 100vw; + height: 306rpx; background-color: transparent; } + .page-click3 { position: absolute; - top: 1190rpx; + top: 1200rpx; left: 0; z-index: 1; - width: 50vw; - height: 220rpx; + width: 100vw; + height: 400rpx; background-color: transparent; + // background-color: #000; } .page-click4 { position: absolute; - top: 388rpx; - right: 72rpx; - z-index: 2; - width: 64rpx; - height: 64rpx; + top: 1600rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 550rpx; background-color: transparent; + // background-color: #000; } .page-click5 { position: absolute; - top: 356rpx; - right: 0; + top: 2150rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 850rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click6 { + position: absolute; + top: 3032rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 416rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click7 { + position: absolute; + top: 3512rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 325rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click8 { + position: absolute; + top: 3883rpx; + left: 0; z-index: 1; width: 100vw; - height: 302rpx; + height: 281rpx; background-color: transparent; + // background-color: #000; } .tabbar { diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index d9d7a40..e684264 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -1,77 +1,57 @@ const app = getApp(); Page({ - data: { - float1: false, - }, - onShow() { - this.setData({ - float1: app.globalData.float1_1 === null ? true : false, - }); - }, + data: {}, + onShow() {}, handelTap1() { wx.navigateTo({ url: "/pages/2/index", }); - this.handleHideFloat1() }, handelTap2() { wx.navigateTo({ url: "/pages/3/index", }); - this.handleHideFloat1() }, handelTap3() { wx.navigateTo({ url: "/pages/4/index", }); - this.handleHideFloat1() }, handelTap4() { wx.navigateTo({ - url: "/pages/9/index?current=3", + url: "/pages/9/index", }); - this.handleHideFloat1() }, handelTap5() { wx.navigateTo({ - url: "/pages/9/index", + url: "/pages/10/index", }); - this.handleHideFloat1() }, + handelTap6() { + wx.navigateTo({ + url: "/pages/11/index", + }); + }, + // handleTabbar1() { + // wx.reLaunch({ + // url: "/pages/1/index", + // }); + // }, handleTabbar2() { wx.reLaunch({ url: "/pages/5/index", }); - this.handleHideFloat1() }, handleTabbar3() { - wx.navigateTo({ - url: "/pages/9/index", + wx.redirectTo({ + url: "/pages/8/index", }); - this.handleHideFloat1() }, handleTabbar4() { - wx.navigateTo({ - url: "/pages/6/index", - }); - this.handleHideFloat1() - }, - handleTabbar5() { - wx.reLaunch({ + wx.redirectTo({ url: "/pages/7/index", }); - this.handleHideFloat1() - }, - - handleFloat1() { - this.setData({ - float1: false, - }); - this.handleHideFloat1() - }, - handleHideFloat1() { - app.globalData.float1_1 = "1"; }, }); diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index 39d523f..e51d928 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -1,26 +1,21 @@ - + + + + - + - - diff --git a/src/pages/10/index.ts b/src/pages/10/index.ts index 1355922..b4ca364 100644 --- a/src/pages/10/index.ts +++ b/src/pages/10/index.ts @@ -4,9 +4,7 @@ Page({ data: {}, onLoad() {}, handleTap1() { - wx.navigateTo({ - url: "/pages/11/index", - }); + wx.navigateBack() }, }); diff --git a/src/pages/10/index.wxml b/src/pages/10/index.wxml index c675345..a1ba990 100644 --- a/src/pages/10/index.wxml +++ b/src/pages/10/index.wxml @@ -1 +1 @@ - + diff --git a/src/pages/11/index.ts b/src/pages/11/index.ts index 596001e..fd4744d 100644 --- a/src/pages/11/index.ts +++ b/src/pages/11/index.ts @@ -3,30 +3,8 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, - handelTap1() { - wx.navigateTo({ - url: "/pages/14/index", - }); - }, - handelTap2() { - wx.navigateTo({ - url: "/pages/12/index", - }); - }, - handelTap3() { - wx.navigateTo({ - url: "/pages/25/index", - }); - }, - handleTabbar2() { - wx.reLaunch({ - url: "/pages/17/index", - }); - }, - handleTabbar3() { - wx.reLaunch({ - url: "/pages/22/index", - }); + handlePage1() { + wx.navigateBack() }, }); diff --git a/src/pages/11/index.wxml b/src/pages/11/index.wxml index 1951092..ffd5f8f 100644 --- a/src/pages/11/index.wxml +++ b/src/pages/11/index.wxml @@ -1,15 +1 @@ - - - - - - - - - - - - - - - + diff --git a/src/pages/2/index.scss b/src/pages/2/index.scss index b691e80..bc96dd8 100644 --- a/src/pages/2/index.scss +++ b/src/pages/2/index.scss @@ -3,7 +3,7 @@ page { } .page { width: 100vw; - min-height: 100vh; + min-height: 2400rpx; padding-bottom: 150rpx; .page-img { width: 100vw; diff --git a/src/pages/2/index.ts b/src/pages/2/index.ts index 486330c..825cfe3 100644 --- a/src/pages/2/index.ts +++ b/src/pages/2/index.ts @@ -21,14 +21,6 @@ Page({ }); }, handlePage4() { - this.setData({ - current: 4, - }); - }, - handlePage5() { - wx.navigateBack(); - }, - handleBack() { wx.navigateBack(); }, }); diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index 306e0d1..5665631 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -3,18 +3,15 @@ - + - + - + - - - - + diff --git a/src/pages/3/index.json b/src/pages/3/index.json index a97367d..4cb6a9b 100644 --- a/src/pages/3/index.json +++ b/src/pages/3/index.json @@ -1,3 +1,6 @@ { - "usingComponents": {} + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-icon": "@vant/weapp/icon/index" + } } diff --git a/src/pages/3/index.scss b/src/pages/3/index.scss index bf6b6a6..4c81e45 100644 --- a/src/pages/3/index.scss +++ b/src/pages/3/index.scss @@ -1,38 +1,23 @@ -page { - padding-bottom: 100rpx; -} .page { width: 100vw; - min-height: 2200rpx; - padding-bottom: 150rpx; + min-height: 3000rpx; .page-img { width: 100vw; } -} - -.tabbar { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; - padding-bottom: 20rpx; - background-color: #fff; - .tabbar-img { - width: 100%; - } - .tabbar-wrap { + .page-click1 { position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - justify-content: space-between; - align-items: center; - .tabbar-click { - flex: 1; - height: 160rpx; - } + top: 248rpx; + right: 72rpx; + z-index: 2; + width: 64rpx; + height: 64rpx; + background-color: transparent; } } + +.float1 { + display: block; + margin: 0 auto; + width: 670rpx; + height: 706rpx; +} diff --git a/src/pages/3/index.ts b/src/pages/3/index.ts index 04c8c8f..7c22c35 100644 --- a/src/pages/3/index.ts +++ b/src/pages/3/index.ts @@ -3,30 +3,12 @@ const _app = getApp(); Page({ data: { current: 0, + float1: false, }, - onLoad() {}, - handlePage1() { - this.setData({ - current: 1, - }); - }, - handlePage2() { - this.setData({ - current: 2, - }); - }, - handlePage3() { - wx.navigateBack(); + onLoad(options) { }, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/11/index", - }); - }, - handleTabbar3() { - wx.reLaunch({ - url: "/pages/22/index", - }); + handlePage1() { + wx.navigateBack() }, }); diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml index 87bef71..f622381 100644 --- a/src/pages/3/index.wxml +++ b/src/pages/3/index.wxml @@ -1,12 +1,10 @@ - + + + + - - - - - - - + + diff --git a/src/pages/4/index.scss b/src/pages/4/index.scss index 339a226..b691e80 100644 --- a/src/pages/4/index.scss +++ b/src/pages/4/index.scss @@ -1,20 +1,20 @@ +page { + padding-bottom: 100rpx; +} .page { width: 100vw; -} -.page-click { - position: fixed; - top: 440rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 200rpx; - background-color: transparent; + min-height: 100vh; + padding-bottom: 150rpx; + .page-img { + width: 100vw; + } } .tabbar { position: fixed; bottom: 0; left: 0; + z-index: 2; width: 100vw; padding-bottom: 20rpx; background-color: #fff; @@ -36,4 +36,3 @@ } } } - diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts index 33c3475..15d0e38 100644 --- a/src/pages/4/index.ts +++ b/src/pages/4/index.ts @@ -1,13 +1,16 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, - - handleTap1() { - wx.navigateBack(); + handlePage1() { + this.setData({ + current: 1, + }); }, - handleBack() { + handlePage2() { wx.navigateBack(); }, }); diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index e10d4f8..04723c1 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -1,4 +1,11 @@ - + - + + + + + + + + diff --git a/src/pages/5/index.scss b/src/pages/5/index.scss index 21d4ef2..85c0d1d 100644 --- a/src/pages/5/index.scss +++ b/src/pages/5/index.scss @@ -3,7 +3,7 @@ page { } .page { width: 100vw; - min-height: 100vh; + min-height: 2000rpx; padding-bottom: 150rpx; .page-img { width: 100vw; @@ -11,12 +11,13 @@ page { } .page-click1 { position: absolute; - top: 176rpx; - right: 0; + top: 406rpx; + left: 0; z-index: 1; - width: 50vw; - height: 96rpx; + width: 100vw; + height: 1200rpx; background-color: transparent; + // background-color: #000; } .tabbar { diff --git a/src/pages/5/index.ts b/src/pages/5/index.ts index 90697ff..bc6787a 100644 --- a/src/pages/5/index.ts +++ b/src/pages/5/index.ts @@ -12,12 +12,13 @@ Page({ }, handlePage2() { this.setData({ - current: 2, + current: 0, }); }, + handelTap1() { wx.navigateTo({ - url: "/pages/4/index", + url: "/pages/6/index", }); }, handleTabbar1() { @@ -26,17 +27,12 @@ Page({ }); }, handleTabbar3() { - wx.navigateTo({ - url: "/pages/9/index", + wx.redirectTo({ + url: "/pages/8/index", }); }, handleTabbar4() { - wx.navigateTo({ - url: "/pages/6/index", - }); - }, - handleTabbar5() { - wx.reLaunch({ + wx.redirectTo({ url: "/pages/7/index", }); }, diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml index 534b374..4541dcb 100644 --- a/src/pages/5/index.wxml +++ b/src/pages/5/index.wxml @@ -1,24 +1,21 @@ - + + - - - - + - + - diff --git a/src/pages/6/index.json b/src/pages/6/index.json index 410e8cb..4cb6a9b 100644 --- a/src/pages/6/index.json +++ b/src/pages/6/index.json @@ -1,5 +1,6 @@ { "usingComponents": { + "van-popup": "@vant/weapp/popup/index", "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index f1d902c..f609f34 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -1,31 +1,23 @@ .page { width: 100vw; - margin-bottom: 80px; -} - -.tabbar { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; - padding-bottom: 20rpx; - background-color: #fff; - .tabbar-img { - width: 100%; + min-height: 3500rpx; + .page-img { + width: 100vw; } - .tabbar-wrap { + .page-click1 { position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - justify-content: space-between; - align-items: center; - .tabbar-click { - flex: 1; - height: 160rpx; - } + top: 248rpx; + right: 72rpx; + z-index: 2; + width: 64rpx; + height: 64rpx; + background-color: transparent; } } + +.float1 { + display: block; + margin: 0 auto; + width: 670rpx; + height: 706rpx; +} diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts index 4618f04..380d2b3 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -1,23 +1,43 @@ const _app = getApp(); Page({ - data: {}, - onLoad() {}, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/1/index", + data: { + current: 0, + float1: false, + }, + onLoad(options) { + this.setData({ + current: Number(options.current), + }); + }, + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + this.setData({ + current: 2, }); }, - handleTabbar2() { - wx.reLaunch({ - url: "/pages/5/index", + handlePage3() { + this.setData({ + current: 3, }); }, - handleTabbar5() { - wx.reLaunch({ - url: "/pages/7/index", + handlePage4() { + this.setData({ + current: 4, }); }, + handlePage5() { + this.setData({ + current: 5, + }); + }, + handlePage6() { + wx.navigateBack(); + }, handleBack() { wx.navigateBack(); }, diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index 080487f..505b241 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,4 +1,25 @@ - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts index 4bbc622..c0d8679 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -18,18 +18,13 @@ Page({ }); }, handleTabbar2() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/5/index", }); }, handleTabbar3() { - wx.navigateTo({ - url: "/pages/9/index", - }); - }, - handleTabbar4() { - wx.navigateTo({ - url: "/pages/6/index", + wx.redirectTo({ + url: "/pages/8/index", }); }, }); diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index 4983ccd..5ad6477 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -1,21 +1,11 @@ - - + - + - + - - - diff --git a/src/pages/8/index.scss b/src/pages/8/index.scss index 110af18..c9b77fc 100644 --- a/src/pages/8/index.scss +++ b/src/pages/8/index.scss @@ -1,10 +1,127 @@ .page { - width: 100%; + width: 100vw; + margin-bottom: 80px; } -.float1 { +.page-click1 { + position: absolute; + top: 206rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 700rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click2 { + position: absolute; + top: 886rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 306rpx; + background-color: transparent; +} + +.page-click3 { + position: absolute; + top: 1200rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 400rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click4 { + position: absolute; + top: 1600rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 550rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click5 { + position: absolute; + top: 2150rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 850rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click6 { + position: absolute; + top: 3032rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 416rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click7 { + position: absolute; + top: 3512rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 325rpx; + background-color: transparent; + // background-color: #000; +} + +.page-click8 { + position: absolute; + top: 3883rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 281rpx; + background-color: transparent; + // background-color: #000; +} + +.tabbar { position: fixed; bottom: 0; left: 0; + z-index: 2; width: 100vw; - z-index: 1; + padding-bottom: 20rpx; + background-color: #fff; + .tabbar-img { + width: 100%; + } + .tabbar-wrap { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + justify-content: space-between; + align-items: center; + .tabbar-click { + flex: 1; + height: 220rpx; + } + } +} + +.float1 { + position: fixed; + z-index: 3; + bottom: 248rpx; + left: 50%; + transform: translateX(-50%); + width: 256rpx; + height: 122rpx; } diff --git a/src/pages/8/index.ts b/src/pages/8/index.ts index de68858..9094339 100644 --- a/src/pages/8/index.ts +++ b/src/pages/8/index.ts @@ -1,12 +1,54 @@ -const _app = getApp(); +const app = getApp(); Page({ data: { - float1: false, }, - onLoad() {}, - handlePage1() { - wx.navigateBack() + onShow() { + }, + handelTap1() { + wx.navigateTo({ + url: "/pages/2/index", + }); + }, + handelTap2() { + wx.navigateTo({ + url: "/pages/3/index", + }); + }, + handelTap3() { + wx.navigateTo({ + url: "/pages/4/index", + }); + }, + handelTap4() { + wx.navigateTo({ + url: "/pages/9/index", + }); + }, + handelTap5() { + wx.navigateTo({ + url: "/pages/10/index", + }); + }, + handelTap6() { + wx.navigateTo({ + url: "/pages/11/index", + }); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", + }); + }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/5/index", + }); + }, + handleTabbar4() { + wx.redirectTo({ + url: "/pages/7/index", + }); }, }); diff --git a/src/pages/8/index.wxml b/src/pages/8/index.wxml index f411c0e..b2e024d 100644 --- a/src/pages/8/index.wxml +++ b/src/pages/8/index.wxml @@ -1,2 +1,13 @@ - - + + + + + + + + + + + + + diff --git a/src/pages/9/index.json b/src/pages/9/index.json index 4cb6a9b..410e8cb 100644 --- a/src/pages/9/index.json +++ b/src/pages/9/index.json @@ -1,6 +1,5 @@ { "usingComponents": { - "van-popup": "@vant/weapp/popup/index", "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/pages/9/index.scss b/src/pages/9/index.scss index 4c81e45..b691e80 100644 --- a/src/pages/9/index.scss +++ b/src/pages/9/index.scss @@ -1,23 +1,38 @@ +page { + padding-bottom: 100rpx; +} .page { width: 100vw; - min-height: 3000rpx; + min-height: 100vh; + padding-bottom: 150rpx; .page-img { width: 100vw; } - .page-click1 { - position: absolute; - top: 248rpx; - right: 72rpx; - z-index: 2; - width: 64rpx; - height: 64rpx; - background-color: transparent; - } } -.float1 { - display: block; - margin: 0 auto; - width: 670rpx; - height: 706rpx; +.tabbar { + position: fixed; + bottom: 0; + left: 0; + z-index: 2; + width: 100vw; + padding-bottom: 20rpx; + background-color: #fff; + .tabbar-img { + width: 100%; + } + .tabbar-wrap { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + justify-content: space-between; + align-items: center; + .tabbar-click { + flex: 1; + height: 160rpx; + } + } } diff --git a/src/pages/9/index.ts b/src/pages/9/index.ts index f361594..15d0e38 100644 --- a/src/pages/9/index.ts +++ b/src/pages/9/index.ts @@ -3,43 +3,14 @@ const _app = getApp(); Page({ data: { current: 0, - float1: false, - }, - onLoad(options) { - this.setData({ - current: Number(options.current), - }); }, + onLoad() {}, handlePage1() { this.setData({ current: 1, }); }, - hadnleFloat1() { - this.setData({ - float1: true, - }); - }, handlePage2() { - this.setData({ - float1: false, - current: 2, - }); - }, - handlePage3() { - this.setData({ - current: 3, - }); - }, - handlePage4() { - wx.navigateBack(); - }, - handelTap1() { - this.setData({ - current: 3, - }); - }, - handleBack() { wx.navigateBack(); }, }); diff --git a/src/pages/9/index.wxml b/src/pages/9/index.wxml index 3e1797a..044c933 100644 --- a/src/pages/9/index.wxml +++ b/src/pages/9/index.wxml @@ -1,28 +1,11 @@ - + - + - - - - - - - - + - - - -