diff --git a/project.private.config.json b/project.private.config.json index d8816bf..000d268 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,8 +23,8 @@ "miniprogram": { "list": [ { - "name": "31", - "pathName": "pages/31/index", + "name": "患者-首页", + "pathName": "pages/1/index", "query": "", "scene": null, "launchMode": "default" @@ -32,4 +32,4 @@ ] } } -} +} \ No newline at end of file diff --git a/src/app.json b/src/app.json index e3212de..477c0e3 100644 --- a/src/app.json +++ b/src/app.json @@ -1,5 +1,6 @@ { "pages": [ + "pages/start/index", "pages/1/index", "pages/2/index", "pages/3/index", diff --git a/src/images/md/1.png b/src/images/md/1.png new file mode 100644 index 0000000..6019265 Binary files /dev/null and b/src/images/md/1.png differ diff --git a/src/images/md/10.png b/src/images/md/10.png new file mode 100644 index 0000000..ab9b357 Binary files /dev/null and b/src/images/md/10.png differ diff --git a/src/images/md/11.png b/src/images/md/11.png new file mode 100644 index 0000000..a9bbe29 Binary files /dev/null and b/src/images/md/11.png differ diff --git a/src/images/md/12.png b/src/images/md/12.png new file mode 100644 index 0000000..6f8d7e9 Binary files /dev/null and b/src/images/md/12.png differ diff --git a/src/images/md/13.png b/src/images/md/13.png new file mode 100644 index 0000000..28883b8 Binary files /dev/null and b/src/images/md/13.png differ diff --git a/src/images/md/14.png b/src/images/md/14.png new file mode 100644 index 0000000..0ae9e2d Binary files /dev/null and b/src/images/md/14.png differ diff --git a/src/images/md/15.png b/src/images/md/15.png new file mode 100644 index 0000000..4cd21b7 Binary files /dev/null and b/src/images/md/15.png differ diff --git a/src/images/md/16.png b/src/images/md/16.png new file mode 100644 index 0000000..dac61a2 Binary files /dev/null and b/src/images/md/16.png differ diff --git a/src/images/md/17.png b/src/images/md/17.png new file mode 100644 index 0000000..2376794 Binary files /dev/null and b/src/images/md/17.png differ diff --git a/src/images/md/18.png b/src/images/md/18.png new file mode 100644 index 0000000..014c5e6 Binary files /dev/null and b/src/images/md/18.png differ diff --git a/src/images/md/19.png b/src/images/md/19.png new file mode 100644 index 0000000..f72a3cf Binary files /dev/null and b/src/images/md/19.png differ diff --git a/src/images/md/2.png b/src/images/md/2.png new file mode 100644 index 0000000..d4b07b0 Binary files /dev/null and b/src/images/md/2.png differ diff --git a/src/images/md/20.png b/src/images/md/20.png new file mode 100644 index 0000000..d378d03 Binary files /dev/null and b/src/images/md/20.png differ diff --git a/src/images/md/21.png b/src/images/md/21.png new file mode 100644 index 0000000..8893444 Binary files /dev/null and b/src/images/md/21.png differ diff --git a/src/images/md/22.png b/src/images/md/22.png new file mode 100644 index 0000000..d61f376 Binary files /dev/null and b/src/images/md/22.png differ diff --git a/src/images/md/23.png b/src/images/md/23.png new file mode 100644 index 0000000..682cc89 Binary files /dev/null and b/src/images/md/23.png differ diff --git a/src/images/md/24.png b/src/images/md/24.png new file mode 100644 index 0000000..4ca1faf Binary files /dev/null and b/src/images/md/24.png differ diff --git a/src/images/md/25.png b/src/images/md/25.png new file mode 100644 index 0000000..3715e83 Binary files /dev/null and b/src/images/md/25.png differ diff --git a/src/images/md/26.png b/src/images/md/26.png new file mode 100644 index 0000000..e5f4e28 Binary files /dev/null and b/src/images/md/26.png differ diff --git a/src/images/md/27.png b/src/images/md/27.png new file mode 100644 index 0000000..52745bd Binary files /dev/null and b/src/images/md/27.png differ diff --git a/src/images/md/28.png b/src/images/md/28.png new file mode 100644 index 0000000..d8282e0 Binary files /dev/null and b/src/images/md/28.png differ diff --git a/src/images/md/29.png b/src/images/md/29.png new file mode 100644 index 0000000..0913818 Binary files /dev/null and b/src/images/md/29.png differ diff --git a/src/images/md/3.png b/src/images/md/3.png new file mode 100644 index 0000000..456852e Binary files /dev/null and b/src/images/md/3.png differ diff --git a/src/images/md/30.png b/src/images/md/30.png new file mode 100644 index 0000000..9697894 Binary files /dev/null and b/src/images/md/30.png differ diff --git a/src/images/md/31.png b/src/images/md/31.png new file mode 100644 index 0000000..42c0f3e Binary files /dev/null and b/src/images/md/31.png differ diff --git a/src/images/md/32.png b/src/images/md/32.png new file mode 100644 index 0000000..afe1dde Binary files /dev/null and b/src/images/md/32.png differ diff --git a/src/images/md/33.png b/src/images/md/33.png new file mode 100644 index 0000000..964500d Binary files /dev/null and b/src/images/md/33.png differ diff --git a/src/images/md/34.png b/src/images/md/34.png new file mode 100644 index 0000000..2a62efc Binary files /dev/null and b/src/images/md/34.png differ diff --git a/src/images/md/4.png b/src/images/md/4.png new file mode 100644 index 0000000..3c53401 Binary files /dev/null and b/src/images/md/4.png differ diff --git a/src/images/md/5.png b/src/images/md/5.png new file mode 100644 index 0000000..a69a58c Binary files /dev/null and b/src/images/md/5.png differ diff --git a/src/images/md/6.png b/src/images/md/6.png new file mode 100644 index 0000000..4200af5 Binary files /dev/null and b/src/images/md/6.png differ diff --git a/src/images/md/7.png b/src/images/md/7.png new file mode 100644 index 0000000..d8731c2 Binary files /dev/null and b/src/images/md/7.png differ diff --git a/src/images/md/8.png b/src/images/md/8.png new file mode 100644 index 0000000..cd40f3e Binary files /dev/null and b/src/images/md/8.png differ diff --git a/src/images/md/9.png b/src/images/md/9.png new file mode 100644 index 0000000..efb5771 Binary files /dev/null and b/src/images/md/9.png differ diff --git a/src/images/md/footer1.png b/src/images/md/footer1.png new file mode 100644 index 0000000..de1c638 Binary files /dev/null and b/src/images/md/footer1.png differ diff --git a/src/images/md/footer2.png b/src/images/md/footer2.png new file mode 100644 index 0000000..c17b88e Binary files /dev/null and b/src/images/md/footer2.png differ diff --git a/src/images/md/tabbar1-1.png b/src/images/md/tabbar1-1.png new file mode 100644 index 0000000..c765da6 Binary files /dev/null and b/src/images/md/tabbar1-1.png differ diff --git a/src/images/md/tabbar1-2.png b/src/images/md/tabbar1-2.png new file mode 100644 index 0000000..d61fa65 Binary files /dev/null and b/src/images/md/tabbar1-2.png differ diff --git a/src/images/md/tabbar1-3.png b/src/images/md/tabbar1-3.png new file mode 100644 index 0000000..f2fd9aa Binary files /dev/null and b/src/images/md/tabbar1-3.png differ diff --git a/src/images/md/tabbar1-4.png b/src/images/md/tabbar1-4.png new file mode 100644 index 0000000..255b576 Binary files /dev/null and b/src/images/md/tabbar1-4.png differ diff --git a/src/images/md/tabbar2-1.png b/src/images/md/tabbar2-1.png new file mode 100644 index 0000000..a44ea34 Binary files /dev/null and b/src/images/md/tabbar2-1.png differ diff --git a/src/images/md/tabbar2-2.png b/src/images/md/tabbar2-2.png new file mode 100644 index 0000000..c9d1998 Binary files /dev/null and b/src/images/md/tabbar2-2.png differ diff --git a/src/images/md/tabbar3-1.png b/src/images/md/tabbar3-1.png new file mode 100644 index 0000000..414b930 Binary files /dev/null and b/src/images/md/tabbar3-1.png differ diff --git a/src/images/md/tabbar3-2.png b/src/images/md/tabbar3-2.png new file mode 100644 index 0000000..39b2394 Binary files /dev/null and b/src/images/md/tabbar3-2.png differ diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index 75b44bd..6399123 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -3,11 +3,11 @@ } .page-click1 { position: absolute; - top: 500rpx; + top: 526rpx; left: 0; z-index: 1; width: 750rpx; - height: 200rpx; + height: 84rpx; background-color: transparent; } diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index ab8971a..2f4cc9e 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -1,50 +1,36 @@ const _app = getApp(); Page({ - data: { - float1: true, - float2: false, - float3: false, - }, - onLoad() { - this.setData({ - float1: wx.getStorageSync("1float1") !== "1", - }); - }, - handlePage() { - wx.navigateTo({ - url: "/pages/5/index", - }); - }, + data: {}, + onLoad() {}, handelTap1() { - wx.navigateTo({ - url: "/pages/2/index", + wx.reLaunch({ + url: "/pages/9/index", }); }, - handelTap2() { - wx.navigateTo({ - url: "/pages/8/index", + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", }); }, - handelTap3() { - wx.navigateTo({ + handleTabbar2() { + wx.reLaunch({ url: "/pages/4/index", }); }, - handleFloat1() { - this.setData({ - float1: false, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/5/index", }); - wx.setStorageSync("1float1", "1"); }, - handleTabbar2() { - wx.reLaunch({ - url: "/pages/4/index", + handleTabbar4() { + wx.navigateTo({ + url: "/pages/9/index", }); }, - handleTabbar3() { - wx.reLaunch({ - url: "/pages/7/index", + handleTabbar5() { + wx.navigateTo({ + url: "/pages/10/index", }); }, }); diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index afbf1c4..7075163 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -1,21 +1,13 @@ - + - - - + + + - - diff --git a/src/pages/10/index.scss b/src/pages/10/index.scss index f89e686..6399123 100644 --- a/src/pages/10/index.scss +++ b/src/pages/10/index.scss @@ -1,3 +1,82 @@ -.page{ - width: 100%; +.page { + width: 100vw; +} +.page-click1 { + position: absolute; + top: 526rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 84rpx; + background-color: transparent; +} + +.page-click2 { + position: absolute; + top: 1080rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 500rpx; + background-color: transparent; +} +.page-click3 { + position: fixed; + top: 708rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 360rpx; + background-color: transparent; +} + +.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; + } + } +} + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float2 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; } diff --git a/src/pages/10/index.ts b/src/pages/10/index.ts index 1355922..2c93fb5 100644 --- a/src/pages/10/index.ts +++ b/src/pages/10/index.ts @@ -3,9 +3,55 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, - handleTap1() { + handlePage() { wx.navigateTo({ - url: "/pages/11/index", + url: "/pages/5/index", + }); + }, + handelTap1() { + wx.navigateTo({ + url: "/pages/2/index", + }); + }, + handelTap2() { + wx.navigateTo({ + url: "/pages/8/index", + }); + }, + handelTap3() { + wx.navigateTo({ + url: "/pages/4/index", + }); + }, + handleFloat1() { + this.setData({ + float1: false, + }); + wx.setStorageSync("1float1", "1"); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", + }); + }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/4/index", + }); + }, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/5/index", + }); + }, + handleTabbar4() { + wx.navigateTo({ + url: "/pages/9/index", + }); + }, + handleTabbar5() { + wx.navigateTo({ + url: "/pages/10/index", }); }, }); diff --git a/src/pages/10/index.wxml b/src/pages/10/index.wxml index c675345..0fe2389 100644 --- a/src/pages/10/index.wxml +++ b/src/pages/10/index.wxml @@ -1 +1,15 @@ - + + + + + + + + + + + + + + + diff --git a/src/pages/11/index.scss b/src/pages/11/index.scss index c0e0f25..afaaaa9 100644 --- a/src/pages/11/index.scss +++ b/src/pages/11/index.scss @@ -1,72 +1,3 @@ -page{ - padding-bottom: 80rpx; -} -.page { - width: 100vw; -} -.page-click1 { - position: absolute; - top: 340rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 200rpx; - background-color: transparent; -} - -.page-click2 { - position: absolute; - top: 500rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 400rpx; - background-color: transparent; -} - -.page-click3 { - position: absolute; - top: 1400rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 400rpx; - background-color: transparent; -} - - -.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; - } - } -} - -.float1 { - position: fixed; - bottom: 0; - left: 0; - z-index: 3; +.page{ width: 100vw; } - diff --git a/src/pages/11/index.ts b/src/pages/11/index.ts index 596001e..e2452bb 100644 --- a/src/pages/11/index.ts +++ b/src/pages/11/index.ts @@ -3,31 +3,11 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, - handelTap1() { - wx.navigateTo({ - url: "/pages/14/index", - }); - }, - handelTap2() { + handleTap1() { 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", - }); - }, }); export {}; diff --git a/src/pages/11/index.wxml b/src/pages/11/index.wxml index 1951092..271f39f 100644 --- a/src/pages/11/index.wxml +++ b/src/pages/11/index.wxml @@ -1,15 +1,2 @@ - - - - - - - - - - - - - - - + + diff --git a/src/pages/12/index.scss b/src/pages/12/index.scss index 26380ba..aabd946 100644 --- a/src/pages/12/index.scss +++ b/src/pages/12/index.scss @@ -1,50 +1,45 @@ -.page { +.page{ width: 100vw; - min-height: 100vh; - .page-img { - width: 100%; - height: 100%; - } - .swiper-item1 { - position: relative; - .swiper-item1-block1 { - position: absolute; - top: 644rpx; - left: 0; - width: 100vw; - height: 104rpx; - background-color: transparent; - } - .swiper-item1-block2 { - position: absolute; - top: 854rpx; - left: 0; - width: 100vw; - height: 104rpx; - background-color: transparent; - } - .swiper-item1-block3 { - position: absolute; - top: 1070rpx; - left: 0; - width: 100vw; - height: 104rpx; - background-color: transparent; - } - .swiper-item1-block4 { - position: absolute; - top: 1280rpx; - left: 0; - width: 100vw; - height: 104rpx; - background-color: transparent; - } - } + padding-bottom: 180rpx; +} + +.page-click1 { + position: fixed; + bottom: 20rpx; + left: 0; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click2 { + position: fixed; + bottom: 20rpx; + left: 50vw; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click3 { + position: absolute; + top: 320rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 124rpx; + background-color: transparent; } -.float1{ +.tabbar { position: fixed; bottom: 0; left: 0; + z-index: 2; width: 100vw; + padding-bottom: 20rpx; + background-color: #fff; + .tabbar-img { + width: 100%; + } } diff --git a/src/pages/12/index.ts b/src/pages/12/index.ts index 85e7932..4d08b69 100644 --- a/src/pages/12/index.ts +++ b/src/pages/12/index.ts @@ -1,56 +1,26 @@ const _app = getApp(); Page({ - data: { - current: 0, - - float1: false, - }, + data: {}, onLoad() {}, - handlePage1() { - this.setData({ - current: 1, - }); - }, - handlePage2() { - this.setData({ - current: 2, - }); - }, - handlePage3() { - this.setData({ - current: 3, - }); - }, - handlePage4() { - wx.navigateBack(); - }, handleTap1() { wx.navigateTo({ url: "/pages/13/index", }); }, - handleTap2() { - wx.navigateTo({ - url: "/pages/15/index", - }); + handelTap1() { + wx.navigateBack(); }, - handleTap3() { + handelTap2() { wx.navigateTo({ - url: "/pages/16/index", + url: "/pages/13/index", }); }, - handleTap4() { - this.setData({ - float1: true, + handelTap3() { + wx.redirectTo({ + url: "/pages/19/index", }); }, - - handleFloat1(){ - this.setData({ - float1: false, - }); - } }); export {}; diff --git a/src/pages/12/index.wxml b/src/pages/12/index.wxml index a7a759b..d3cfa7a 100644 --- a/src/pages/12/index.wxml +++ b/src/pages/12/index.wxml @@ -1,21 +1,10 @@ - - - - - - - - - - - - - - - - - - + - + + + + + + + diff --git a/src/pages/13/index.scss b/src/pages/13/index.scss index 370c853..afaaaa9 100644 --- a/src/pages/13/index.scss +++ b/src/pages/13/index.scss @@ -1,8 +1,3 @@ -.page { +.page{ width: 100vw; - min-height: 100vh; - .page-img{ - width: 100%; - height: 100%; - } } diff --git a/src/pages/13/index.ts b/src/pages/13/index.ts index f6cb792..69abf9b 100644 --- a/src/pages/13/index.ts +++ b/src/pages/13/index.ts @@ -1,27 +1,13 @@ const _app = getApp(); Page({ - data: { - current: 0, - page1: true, - page2: false, - page3: false, - page4: false, - }, + data: {}, onLoad() {}, - handlePage1() { - this.setData({ - current: 1, - }); - }, - handlePage2() { - this.setData({ - current: 2, + handleTap1() { + wx.navigateTo({ + url: "/pages/14/index", }); }, - handlePage3() { - wx.navigateBack(); - }, }); export {}; diff --git a/src/pages/13/index.wxml b/src/pages/13/index.wxml index 1ce0f92..1432525 100644 --- a/src/pages/13/index.wxml +++ b/src/pages/13/index.wxml @@ -1,12 +1,2 @@ - - - - - - - - - - - + diff --git a/src/pages/14/index.ts b/src/pages/14/index.ts index 7cf179c..964cc1d 100644 --- a/src/pages/14/index.ts +++ b/src/pages/14/index.ts @@ -4,7 +4,9 @@ Page({ data: {}, onLoad() {}, handleTap1() { - wx.navigateBack(); + wx.navigateTo({ + url:"/pages/15/index" + }) }, }); diff --git a/src/pages/14/index.wxml b/src/pages/14/index.wxml index ce27027..cc02beb 100644 --- a/src/pages/14/index.wxml +++ b/src/pages/14/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/15/index.scss b/src/pages/15/index.scss index 39d1895..f0071db 100644 --- a/src/pages/15/index.scss +++ b/src/pages/15/index.scss @@ -1,8 +1,63 @@ .page { width: 100vw; - min-height: 100vh; - .page-img { +} +.page-click1 { + position: absolute; + top: 212rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 124rpx; + background-color: transparent; +} + +.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; + } } } + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float2 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} diff --git a/src/pages/15/index.ts b/src/pages/15/index.ts index 11e35f7..ef59db0 100644 --- a/src/pages/15/index.ts +++ b/src/pages/15/index.ts @@ -1,22 +1,22 @@ const _app = getApp(); Page({ - data: { - current: 0, - }, + data: {}, onLoad() {}, - handlePage1() { - this.setData({ - current: 1, + handelTap1() { + wx.navigateTo({ + url: "/pages/16/index", }); }, - handlePage2() { - this.setData({ - current: 2, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/15/index", }); }, - handlePage3() { - wx.navigateBack() + handleTabbar2() { + wx.reLaunch({ + url: "/pages/17/index", + }); }, }); diff --git a/src/pages/15/index.wxml b/src/pages/15/index.wxml index 5003b51..59992af 100644 --- a/src/pages/15/index.wxml +++ b/src/pages/15/index.wxml @@ -1,12 +1,11 @@ - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/pages/16/index.scss b/src/pages/16/index.scss index 39d1895..afaaaa9 100644 --- a/src/pages/16/index.scss +++ b/src/pages/16/index.scss @@ -1,8 +1,3 @@ -.page { +.page{ width: 100vw; - min-height: 100vh; - .page-img { - width: 100%; - height: 100%; - } } diff --git a/src/pages/16/index.ts b/src/pages/16/index.ts index 825cfe3..3d3acac 100644 --- a/src/pages/16/index.ts +++ b/src/pages/16/index.ts @@ -5,23 +5,8 @@ Page({ current: 0, }, onLoad() {}, - handlePage1() { - this.setData({ - current: 1, - }); - }, - handlePage2() { - this.setData({ - current: 2, - }); - }, - handlePage3() { - this.setData({ - current: 3, - }); - }, - handlePage4() { - wx.navigateBack(); + reLaunch() { + wx.navigateBack() }, }); diff --git a/src/pages/16/index.wxml b/src/pages/16/index.wxml index 5d0798c..3493749 100644 --- a/src/pages/16/index.wxml +++ b/src/pages/16/index.wxml @@ -1,15 +1,2 @@ - - - - - - - - - - - - - - + diff --git a/src/pages/17/index.scss b/src/pages/17/index.scss index b691e80..f0071db 100644 --- a/src/pages/17/index.scss +++ b/src/pages/17/index.scss @@ -1,13 +1,14 @@ -page { - padding-bottom: 100rpx; -} .page { width: 100vw; - min-height: 100vh; - padding-bottom: 150rpx; - .page-img { - width: 100vw; - } +} +.page-click1 { + position: absolute; + top: 212rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 124rpx; + background-color: transparent; } .tabbar { @@ -36,3 +37,27 @@ page { } } } + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float2 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} diff --git a/src/pages/17/index.ts b/src/pages/17/index.ts index 02a9875..c3943f9 100644 --- a/src/pages/17/index.ts +++ b/src/pages/17/index.ts @@ -1,31 +1,21 @@ const _app = getApp(); Page({ - data: { - current: 0, - }, + data: {}, onLoad() {}, - handlePage1() { + handlePage() { wx.navigateTo({ - url: "/pages/24/index", - }); - }, - handlePage2() { - this.setData({ - current: 2, + url: "/pages/18/index", }); }, - handlePage3() { - wx.navigateBack(); - }, handleTabbar1() { wx.reLaunch({ - url: "/pages/11/index", + url: "/pages/15/index", }); }, - handleTabbar3() { + handleTabbar2() { wx.reLaunch({ - url: "/pages/22/index", + url: "/pages/17/index", }); }, }); diff --git a/src/pages/17/index.wxml b/src/pages/17/index.wxml index c1e59c1..3b65387 100644 --- a/src/pages/17/index.wxml +++ b/src/pages/17/index.wxml @@ -1,20 +1,10 @@ - - - - - - - - - - - + - + - + + - diff --git a/src/pages/18/index.scss b/src/pages/18/index.scss index 0a87a59..7835af1 100644 --- a/src/pages/18/index.scss +++ b/src/pages/18/index.scss @@ -1,71 +1,27 @@ -page { - position: relative; - padding-bottom: 80px; -} - .page { - width: 100%; -} - -.page-click1 { - position: absolute; - top: 780rpx; - left: 0; width: 100vw; - height: 230rpx; - background-color: transparent; -} - -.page-click2 { - position: absolute; - top: 920rpx; - left: 0; - width: 100vw; - height: 730rpx; - background-color: transparent; + min-height: 100vh; + padding-bottom: 150rpx; + .page-img { + width: 100vw; + } } -.page-click3 { +.page-click1 { position: absolute; - top: 1680rpx; + top: 1386rpx; left: 0; + z-index: 1; width: 50vw; - height: 180rpx; + height: 120rpx; background-color: transparent; } - -.page-click4 { +.page-click2 { position: absolute; - top: 1680rpx; - right: 0; + top: 1386rpx; + left: 50vw; + z-index: 1; width: 50vw; - height: 180rpx; + height: 120rpx; background-color: transparent; } - -.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/18/index.ts b/src/pages/18/index.ts index c818106..6829d9d 100644 --- a/src/pages/18/index.ts +++ b/src/pages/18/index.ts @@ -1,31 +1,28 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, handleTap1() { - wx.navigateTo({ - url: "/pages/19/index", + if (this.data.current <= 0) { + wx.navigateBack(); + return; + } + this.setData({ + current: this.data.current - 1, }); }, handleTap2() { - wx.navigateTo({ - url: "/pages/20/index", - }); - }, - handleTap3() { - wx.navigateTo({ - url: "/pages/21/index", - }); - }, - handleTap4() { - wx.navigateTo({ - url: "/pages/25/index" - }); - }, - handleTabbar2() { - wx.reLaunch({ - url: "/pages/23/index", + if (this.data.current >= 2) { + wx.navigateTo({ + url: "/pages/7/index", + }); + return; + } + this.setData({ + current: this.data.current + 1, }); }, }); diff --git a/src/pages/18/index.wxml b/src/pages/18/index.wxml index f10fc77..39fd551 100644 --- a/src/pages/18/index.wxml +++ b/src/pages/18/index.wxml @@ -1,15 +1,16 @@ - + + + + + + + + + + + + - - - - - - - - - - - - + + diff --git a/src/pages/19/index.scss b/src/pages/19/index.scss index e859566..aabd946 100644 --- a/src/pages/19/index.scss +++ b/src/pages/19/index.scss @@ -1,3 +1,45 @@ -.page { +.page{ width: 100vw; + padding-bottom: 180rpx; +} + +.page-click1 { + position: fixed; + bottom: 20rpx; + left: 0; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click2 { + position: fixed; + bottom: 20rpx; + left: 50vw; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click3 { + position: absolute; + top: 320rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 124rpx; + background-color: transparent; +} + +.tabbar { + position: fixed; + bottom: 0; + left: 0; + z-index: 2; + width: 100vw; + padding-bottom: 20rpx; + background-color: #fff; + .tabbar-img { + width: 100%; + } } diff --git a/src/pages/19/index.ts b/src/pages/19/index.ts index 7cf179c..9914ccb 100644 --- a/src/pages/19/index.ts +++ b/src/pages/19/index.ts @@ -4,8 +4,23 @@ Page({ data: {}, onLoad() {}, handleTap1() { + wx.navigateTo({ + url: "/pages/20/index", + }); + }, + handelTap1() { wx.navigateBack(); }, + handelTap2() { + wx.navigateTo({ + url: "/pages/20/index", + }); + }, + handelTap3() { + wx.redirectTo({ + url: "/pages/12/index", + }); + }, }); export {}; diff --git a/src/pages/19/index.wxml b/src/pages/19/index.wxml index 9e8a404..a207472 100644 --- a/src/pages/19/index.wxml +++ b/src/pages/19/index.wxml @@ -1,2 +1,17 @@ - + + + + + + + + + + + + + + + + diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index 9cddfbb..b3c477c 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/20/index.scss b/src/pages/20/index.scss index 7b147f3..e859566 100644 --- a/src/pages/20/index.scss +++ b/src/pages/20/index.scss @@ -1,39 +1,3 @@ -page { - padding-bottom: 100rpx; -} .page { width: 100vw; - min-height: 100vh; - padding-bottom: 150rpx; - .page-img { - display: block; - 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 { - 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/20/index.ts b/src/pages/20/index.ts index 2dd03cd..c2710ff 100644 --- a/src/pages/20/index.ts +++ b/src/pages/20/index.ts @@ -1,29 +1,13 @@ const _app = getApp(); Page({ - data: { - current: 0, + data: {}, + onLoad() {}, + handleTap1() { + wx.navigateTo({ + url:"/pages/21/index" + }) }, - onLoad(options) { - if (options.current) { - this.setData({ - current: Number(options.current), - }); - } - }, - handlePage1() { - this.setData({ - current: 1, - }); - }, - handlePage2() { - this.setData({ - current: 2, - }); - }, - handlePage3(){ - wx.navigateBack(); - } }); export {}; diff --git a/src/pages/20/index.wxml b/src/pages/20/index.wxml index 1ea6d79..0289528 100644 --- a/src/pages/20/index.wxml +++ b/src/pages/20/index.wxml @@ -1,12 +1,2 @@ - - - - - - - - - - - + diff --git a/src/pages/21/index.scss b/src/pages/21/index.scss index 63b389b..e859566 100644 --- a/src/pages/21/index.scss +++ b/src/pages/21/index.scss @@ -1,40 +1,3 @@ -page { - padding-bottom: 100rpx; -} - .page { width: 100vw; - min-height: 100vh; - padding-bottom: 150rpx; - .page-img { - display: block; - 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 { - 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/21/index.ts b/src/pages/21/index.ts index cb8a8cc..8cbc008 100644 --- a/src/pages/21/index.ts +++ b/src/pages/21/index.ts @@ -1,26 +1,12 @@ const _app = getApp(); Page({ - data: { - current: 0, - }, - onLoad(options) { - if (options.current) { - this.setData({ - current: Number(options.current), - }); - } - }, - handlePage1() { + data: {}, + onLoad() {}, + handleTap1() { wx.navigateTo({ - url: "/pages/20/index?current=1", - }); - }, - handlePage2() { - wx.navigateBack(); - }, - handlePage3() { - wx.navigateBack(); + url:"/pages/22/index" + }) }, }); diff --git a/src/pages/21/index.wxml b/src/pages/21/index.wxml index 9593a66..af54a83 100644 --- a/src/pages/21/index.wxml +++ b/src/pages/21/index.wxml @@ -1,12 +1,2 @@ - - - - - - - - - - - + diff --git a/src/pages/22/index.scss b/src/pages/22/index.scss index 97be24b..f0071db 100644 --- a/src/pages/22/index.scss +++ b/src/pages/22/index.scss @@ -2,31 +2,12 @@ width: 100vw; } .page-click1 { - position: fixed; - top: 380rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 200rpx; - background-color: transparent; -} - -.page-click2 { - position: fixed; - top: 640rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 170rpx; - background-color: transparent; -} -.page-click3 { - position: fixed; - top: 830rpx; + position: absolute; + top: 212rpx; left: 0; z-index: 1; width: 750rpx; - height: 170rpx; + height: 124rpx; background-color: transparent; } @@ -34,6 +15,7 @@ position: fixed; bottom: 0; left: 0; + z-index: 2; width: 100vw; padding-bottom: 20rpx; background-color: #fff; @@ -60,7 +42,7 @@ position: fixed; bottom: 0; left: 0; - z-index: 2; + z-index: 3; width: 100vw; } @@ -68,7 +50,7 @@ position: fixed; bottom: 0; left: 0; - z-index: 2; + z-index: 3; width: 100vw; } @@ -76,6 +58,6 @@ position: fixed; bottom: 0; left: 0; - z-index: 2; + z-index: 3; width: 100vw; } diff --git a/src/pages/22/index.ts b/src/pages/22/index.ts index 1a18991..293db01 100644 --- a/src/pages/22/index.ts +++ b/src/pages/22/index.ts @@ -1,35 +1,21 @@ const _app = getApp(); Page({ - data: { - float1: false, - float2: false, - float3: false, - }, + data: {}, onLoad() {}, handelTap1() { - this.setData({ - float1: true, - }); - }, - handelTap2() { - wx.reLaunch({ - url: "/pages/18/index", - }); - }, - handleFloat1() { - this.setData({ - float1: false, + wx.navigateTo({ + url: "/pages/23/index", }); }, handleTabbar1() { wx.reLaunch({ - url: "/pages/11/index", + url: "/pages/22/index", }); }, handleTabbar2() { wx.reLaunch({ - url: "/pages/17/index", + url: "/pages/24/index", }); }, }); diff --git a/src/pages/22/index.wxml b/src/pages/22/index.wxml index c536efe..fdebb79 100644 --- a/src/pages/22/index.wxml +++ b/src/pages/22/index.wxml @@ -1,14 +1,11 @@ - - - + + - + - - + + - - diff --git a/src/pages/23/index.scss b/src/pages/23/index.scss index 97be24b..afaaaa9 100644 --- a/src/pages/23/index.scss +++ b/src/pages/23/index.scss @@ -1,81 +1,3 @@ -.page { - width: 100vw; -} -.page-click1 { - position: fixed; - top: 380rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 200rpx; - background-color: transparent; -} - -.page-click2 { - position: fixed; - top: 640rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 170rpx; - background-color: transparent; -} -.page-click3 { - position: fixed; - top: 830rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 170rpx; - background-color: transparent; -} - -.tabbar { - position: fixed; - bottom: 0; - left: 0; - 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; - } - } -} - -.float1 { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; -} - -.float2 { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; -} - -.float3 { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; +.page{ width: 100vw; } diff --git a/src/pages/23/index.ts b/src/pages/23/index.ts index 2525fb1..3d3acac 100644 --- a/src/pages/23/index.ts +++ b/src/pages/23/index.ts @@ -2,25 +2,11 @@ const _app = getApp(); Page({ data: { - float1: false, - float2: false, - float3: false, + current: 0, }, onLoad() {}, - handelTap1() { - wx.reLaunch({ - url: "/pages/11/index", - }); - }, - handleFloat1() { - this.setData({ - float1: false, - }); - }, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/18/index", - }); + reLaunch() { + wx.navigateBack() }, }); diff --git a/src/pages/23/index.wxml b/src/pages/23/index.wxml index fe30879..3a53674 100644 --- a/src/pages/23/index.wxml +++ b/src/pages/23/index.wxml @@ -1,11 +1,2 @@ - - - - - - - - - - - + + diff --git a/src/pages/24/index.scss b/src/pages/24/index.scss index 39d1895..f0071db 100644 --- a/src/pages/24/index.scss +++ b/src/pages/24/index.scss @@ -1,8 +1,63 @@ .page { width: 100vw; - min-height: 100vh; - .page-img { +} +.page-click1 { + position: absolute; + top: 212rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 124rpx; + background-color: transparent; +} + +.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; + } } } + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float2 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} diff --git a/src/pages/24/index.ts b/src/pages/24/index.ts index 15d0e38..9af41a6 100644 --- a/src/pages/24/index.ts +++ b/src/pages/24/index.ts @@ -1,17 +1,22 @@ const _app = getApp(); Page({ - data: { - current: 0, - }, + data: {}, onLoad() {}, - handlePage1() { - this.setData({ - current: 1, + handlePage() { + wx.navigateTo({ + url: "/pages/25/index", + }); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/24/index", }); }, - handlePage2() { - wx.navigateBack(); + handleTabbar2() { + wx.reLaunch({ + url: "/pages/24/index", + }); }, }); diff --git a/src/pages/24/index.wxml b/src/pages/24/index.wxml index 374a86e..66f5926 100644 --- a/src/pages/24/index.wxml +++ b/src/pages/24/index.wxml @@ -1,9 +1,10 @@ - - - - - - - - - + + + + + + + + + + diff --git a/src/pages/25/index.scss b/src/pages/25/index.scss index e859566..7835af1 100644 --- a/src/pages/25/index.scss +++ b/src/pages/25/index.scss @@ -1,3 +1,27 @@ .page { width: 100vw; + min-height: 100vh; + padding-bottom: 150rpx; + .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/25/index.ts b/src/pages/25/index.ts index f2bc315..6829d9d 100644 --- a/src/pages/25/index.ts +++ b/src/pages/25/index.ts @@ -1,10 +1,29 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, - handlePage() { - wx.navigateBack(); + handleTap1() { + if (this.data.current <= 0) { + wx.navigateBack(); + return; + } + this.setData({ + current: this.data.current - 1, + }); + }, + handleTap2() { + if (this.data.current >= 2) { + wx.navigateTo({ + url: "/pages/7/index", + }); + return; + } + this.setData({ + current: this.data.current + 1, + }); }, }); diff --git a/src/pages/25/index.wxml b/src/pages/25/index.wxml index b276d02..1bd3e02 100644 --- a/src/pages/25/index.wxml +++ b/src/pages/25/index.wxml @@ -1,2 +1,16 @@ - + + + + + + + + + + + + + + + diff --git a/src/pages/3/index.scss b/src/pages/3/index.scss index e859566..ed54923 100644 --- a/src/pages/3/index.scss +++ b/src/pages/3/index.scss @@ -1,3 +1,22 @@ .page { width: 100vw; } +.page-click1 { + position: absolute; + top: 1236rpx; + left: 0; + z-index: 1; + width: 50vw; + height: 200rpx; + background-color: transparent; +} + +.page-click2 { + position: absolute; + top: 1236rpx; + left: 50vw; + z-index: 1; + width: 50vw; + height: 200rpx; + background-color: transparent; +} diff --git a/src/pages/3/index.ts b/src/pages/3/index.ts index b3a4114..02818ae 100644 --- a/src/pages/3/index.ts +++ b/src/pages/3/index.ts @@ -4,6 +4,9 @@ Page({ data: {}, onLoad() {}, handleTap1() { + wx.navigateBack(); + }, + handleTap2() { wx.navigateTo({ url: "/pages/1/index", }); diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml index 97f0ac7..5b052d9 100644 --- a/src/pages/3/index.wxml +++ b/src/pages/3/index.wxml @@ -1,2 +1,5 @@ - + + + + diff --git a/src/pages/4/index.scss b/src/pages/4/index.scss index 339a226..77d4232 100644 --- a/src/pages/4/index.scss +++ b/src/pages/4/index.scss @@ -1,14 +1,13 @@ +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 { @@ -36,4 +35,3 @@ } } } - diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts index cf8c286..3aa0cd2 100644 --- a/src/pages/4/index.ts +++ b/src/pages/4/index.ts @@ -4,24 +4,29 @@ Page({ data: {}, onLoad() {}, - handleTap1() { - wx.navigateTo({ - url: "/pages/5/index", + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", }); }, - handleTap2() { + handleTabbar2() { + wx.reLaunch({ + url: "/pages/4/index", + }); + }, + handleTabbar3() { wx.navigateTo({ - url: "/pages/6/index", + url: "/pages/5/index", }); }, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/1/index", + handleTabbar4() { + wx.navigateTo({ + url: "/pages/9/index", }); }, - handleTabbar3() { - wx.reLaunch({ - url: "/pages/7/index", + handleTabbar5() { + wx.navigateTo({ + url: "/pages/10/index", }); }, }); diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index b83dfb7..bc93ba4 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -1,11 +1,27 @@ - - + + + + + + + + - + - - - + + + + + + + diff --git a/src/pages/5/index.ts b/src/pages/5/index.ts index 7cf179c..d0bd196 100644 --- a/src/pages/5/index.ts +++ b/src/pages/5/index.ts @@ -4,7 +4,9 @@ Page({ data: {}, onLoad() {}, handleTap1() { - wx.navigateBack(); + wx.navigateTo({ + url: "/pages/6/index", + }); }, }); diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml index ada852d..c45b81e 100644 --- a/src/pages/5/index.wxml +++ b/src/pages/5/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index afaaaa9..7835af1 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -1,3 +1,27 @@ -.page{ +.page { width: 100vw; + min-height: 100vh; + padding-bottom: 150rpx; + .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 7cf179c..6829d9d 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -1,10 +1,29 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, handleTap1() { - wx.navigateBack(); + if (this.data.current <= 0) { + wx.navigateBack(); + return; + } + this.setData({ + current: this.data.current - 1, + }); + }, + handleTap2() { + if (this.data.current >= 2) { + wx.navigateTo({ + url: "/pages/7/index", + }); + return; + } + this.setData({ + current: this.data.current + 1, + }); }, }); diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index db9da65..9c96b0c 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,2 +1,16 @@ - + + + + + + + + + + + + + + + diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss index 97be24b..59e9222 100644 --- a/src/pages/7/index.scss +++ b/src/pages/7/index.scss @@ -1,81 +1,22 @@ .page { width: 100vw; } + .page-click1 { - position: fixed; - top: 380rpx; + position: absolute; + top: 1386rpx; left: 0; z-index: 1; - width: 750rpx; - height: 200rpx; + width: 50vw; + height: 120rpx; background-color: transparent; } - .page-click2 { - position: fixed; - top: 640rpx; - left: 0; - z-index: 1; - width: 750rpx; - height: 170rpx; - background-color: transparent; -} -.page-click3 { - position: fixed; - top: 830rpx; - left: 0; + position: absolute; + top: 1386rpx; + left: 50vw; z-index: 1; - width: 750rpx; - height: 170rpx; + width: 50vw; + height: 120rpx; background-color: transparent; } - -.tabbar { - position: fixed; - bottom: 0; - left: 0; - 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; - } - } -} - -.float1 { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; -} - -.float2 { - position: fixed; - bottom: 0; - left: 0; - z-index: 2; - width: 100vw; -} - -.float3 { - 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 befbf58..a2d13fa 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -7,34 +7,12 @@ Page({ float3: false, }, onLoad() {}, - handelTap1() { - this.setData({ - float1: true, - }); - }, - handelTap2() { - wx.reLaunch({ - url:'/pages/9/index' - }) - }, - handelTap3() { - wx.reLaunch({ - url:'/pages/18/index' - }) - }, - handleFloat1() { - this.setData({ - float1: false, - }); - }, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/1/index", - }); + handleTap1() { + wx.navigateBack(); }, - handleTabbar2() { - wx.reLaunch({ - url: "/pages/4/index", + handleTap2() { + wx.navigateTo({ + url: "/pages/8/index", }); }, }); diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index eadd2ec..7955c20 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -1,15 +1,5 @@ - - - - + + - - - - - - - - - - + + diff --git a/src/pages/8/index.scss b/src/pages/8/index.scss index 110af18..2f5102d 100644 --- a/src/pages/8/index.scss +++ b/src/pages/8/index.scss @@ -1,10 +1,30 @@ .page { - width: 100%; + width: 100vw; +} + +.page-click1 { + position: absolute; + top: 1486rpx; + left: 0; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; } +.page-click2 { + position: absolute; + top: 1486rpx; + left: 50vw; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; +} + .float1 { position: fixed; bottom: 0; left: 0; + z-index: 3; width: 100vw; - z-index: 1; } diff --git a/src/pages/8/index.ts b/src/pages/8/index.ts index 0b6a01d..50ea7bc 100644 --- a/src/pages/8/index.ts +++ b/src/pages/8/index.ts @@ -6,13 +6,16 @@ Page({ }, onLoad() {}, handleTap1() { + wx.navigateBack(); + }, + handleTap2() { this.setData({ float1: true, }); }, handleFloat1() { - this.setData({ - float1: false, + wx.reLaunch({ + url: "/pages/1/index", }); }, }); diff --git a/src/pages/8/index.wxml b/src/pages/8/index.wxml index c95388b..fb78e2a 100644 --- a/src/pages/8/index.wxml +++ b/src/pages/8/index.wxml @@ -1,4 +1,13 @@ - + - + + + + diff --git a/src/pages/9/index.scss b/src/pages/9/index.scss index c505384..6399123 100644 --- a/src/pages/9/index.scss +++ b/src/pages/9/index.scss @@ -1,18 +1,82 @@ .page { - width: 100%; + width: 100vw; } +.page-click1 { + position: absolute; + top: 526rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 84rpx; + background-color: transparent; +} + +.page-click2 { + position: absolute; + top: 1080rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 500rpx; + background-color: transparent; +} +.page-click3 { + position: fixed; + top: 708rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 360rpx; + background-color: transparent; +} + +.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; + } + } +} + .float1 { position: fixed; - z-index: 3; bottom: 0; left: 0; - width: 100%; + z-index: 3; + width: 100vw; } .float2 { position: fixed; + bottom: 0; + left: 0; z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; bottom: 0; left: 0; - width: 100%; + z-index: 3; + width: 100vw; } diff --git a/src/pages/9/index.ts b/src/pages/9/index.ts index fb4f20f..2c93fb5 100644 --- a/src/pages/9/index.ts +++ b/src/pages/9/index.ts @@ -1,22 +1,55 @@ const _app = getApp(); Page({ - data: { - float1: true, - float2: false, - }, + data: {}, onLoad() {}, - handleTap1() { - this.setData({ - float2: true, + handlePage() { + wx.navigateTo({ + url: "/pages/5/index", + }); + }, + handelTap1() { + wx.navigateTo({ + url: "/pages/2/index", + }); + }, + handelTap2() { + wx.navigateTo({ + url: "/pages/8/index", + }); + }, + handelTap3() { + wx.navigateTo({ + url: "/pages/4/index", }); }, handleFloat1() { this.setData({ float1: false, }); + wx.setStorageSync("1float1", "1"); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", + }); + }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/4/index", + }); + }, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/5/index", + }); + }, + handleTabbar4() { + wx.navigateTo({ + url: "/pages/9/index", + }); }, - handleFloat2() { + handleTabbar5() { wx.navigateTo({ url: "/pages/10/index", }); diff --git a/src/pages/9/index.wxml b/src/pages/9/index.wxml index f35c423..7dbf35e 100644 --- a/src/pages/9/index.wxml +++ b/src/pages/9/index.wxml @@ -1,4 +1,15 @@ - + + + + - - + + + + + + + + + + diff --git a/src/pages/start/index.json b/src/pages/start/index.json new file mode 100644 index 0000000..a97367d --- /dev/null +++ b/src/pages/start/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} diff --git a/src/pages/start/index.scss b/src/pages/start/index.scss new file mode 100644 index 0000000..de21474 --- /dev/null +++ b/src/pages/start/index.scss @@ -0,0 +1,82 @@ +.page { + width: 100vw; +} +.page-click1 { + position: absolute; + top: 476rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 180rpx; + background-color: transparent; +} + +.page-click2 { + position: absolute; + top: 676rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 180rpx; + background-color: transparent; +} +.page-click3 { + position: fixed; + top: 876rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 180rpx; + background-color: transparent; +} + +.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; + } + } +} + +.float1 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float2 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} + +.float3 { + position: fixed; + bottom: 0; + left: 0; + z-index: 3; + width: 100vw; +} diff --git a/src/pages/start/index.ts b/src/pages/start/index.ts new file mode 100644 index 0000000..3a7d047 --- /dev/null +++ b/src/pages/start/index.ts @@ -0,0 +1,27 @@ +const _app = getApp(); + +Page({ + data: { + float1: true, + float2: false, + float3: false, + }, + onLoad() {}, + handelTap1() { + wx.navigateTo({ + url: "/pages/2/index", + }); + }, + handelTap2() { + wx.navigateTo({ + url: "/pages/11/index", + }); + }, + handelTap3() { + wx.navigateTo({ + url: "/pages/11/index", + }); + }, +}); + +export {}; diff --git a/src/pages/start/index.wxml b/src/pages/start/index.wxml new file mode 100644 index 0000000..64d1197 --- /dev/null +++ b/src/pages/start/index.wxml @@ -0,0 +1,4 @@ + + + +