diff --git a/project.config.json b/project.config.json index 8a72aaa..2325b0d 100644 --- a/project.config.json +++ b/project.config.json @@ -73,5 +73,5 @@ ], "include": [] }, - "appid": "wx1e025040096c7e1d" + "appid": "wx96104303877e3fd9" } \ No newline at end of file diff --git a/src/images/qs/1.png b/src/images/qs/1.png new file mode 100644 index 0000000..b9d1d81 Binary files /dev/null and b/src/images/qs/1.png differ diff --git a/src/images/qs/10.png b/src/images/qs/10.png new file mode 100644 index 0000000..e1e2db5 Binary files /dev/null and b/src/images/qs/10.png differ diff --git a/src/images/qs/11.png b/src/images/qs/11.png new file mode 100644 index 0000000..abdd218 Binary files /dev/null and b/src/images/qs/11.png differ diff --git a/src/images/qs/12.png b/src/images/qs/12.png new file mode 100644 index 0000000..d315148 Binary files /dev/null and b/src/images/qs/12.png differ diff --git a/src/images/qs/13.png b/src/images/qs/13.png new file mode 100644 index 0000000..e9c2f85 Binary files /dev/null and b/src/images/qs/13.png differ diff --git a/src/images/qs/14.png b/src/images/qs/14.png new file mode 100644 index 0000000..c928419 Binary files /dev/null and b/src/images/qs/14.png differ diff --git a/src/images/qs/2.png b/src/images/qs/2.png new file mode 100644 index 0000000..69741fe Binary files /dev/null and b/src/images/qs/2.png differ diff --git a/src/images/qs/3.png b/src/images/qs/3.png new file mode 100644 index 0000000..30e6e55 Binary files /dev/null and b/src/images/qs/3.png differ diff --git a/src/images/qs/4.png b/src/images/qs/4.png new file mode 100644 index 0000000..53c9b10 Binary files /dev/null and b/src/images/qs/4.png differ diff --git a/src/images/qs/5.png b/src/images/qs/5.png new file mode 100644 index 0000000..302b81b Binary files /dev/null and b/src/images/qs/5.png differ diff --git a/src/images/qs/6.png b/src/images/qs/6.png new file mode 100644 index 0000000..17f99f4 Binary files /dev/null and b/src/images/qs/6.png differ diff --git a/src/images/qs/7.png b/src/images/qs/7.png new file mode 100644 index 0000000..8f76544 Binary files /dev/null and b/src/images/qs/7.png differ diff --git a/src/images/qs/8.png b/src/images/qs/8.png new file mode 100644 index 0000000..df8a605 Binary files /dev/null and b/src/images/qs/8.png differ diff --git a/src/images/qs/9.png b/src/images/qs/9.png new file mode 100644 index 0000000..bc0d707 Binary files /dev/null and b/src/images/qs/9.png differ diff --git a/src/images/qs/tabbar1.png b/src/images/qs/tabbar1.png new file mode 100644 index 0000000..070c5fa Binary files /dev/null and b/src/images/qs/tabbar1.png differ diff --git a/src/images/qs/tabbar2.png b/src/images/qs/tabbar2.png new file mode 100644 index 0000000..15bc15f Binary files /dev/null and b/src/images/qs/tabbar2.png differ diff --git a/src/images/qs/tabbar3.png b/src/images/qs/tabbar3.png new file mode 100644 index 0000000..618a6a6 Binary files /dev/null and b/src/images/qs/tabbar3.png differ diff --git a/src/images/qs/tabbar4.png b/src/images/qs/tabbar4.png new file mode 100644 index 0000000..53604fa Binary files /dev/null and b/src/images/qs/tabbar4.png differ diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index 75b44bd..ebb8d13 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -1,32 +1,33 @@ .page { width: 100vw; + margin-bottom: 80px; } .page-click1 { position: absolute; - top: 500rpx; + top: 676rpx; left: 0; z-index: 1; - width: 750rpx; - height: 200rpx; + width: 50vw; + height: 336rpx; background-color: transparent; } .page-click2 { position: absolute; - top: 1080rpx; - left: 0; + top: 676rpx; + right: 0; z-index: 1; - width: 750rpx; - height: 500rpx; + width: 50vw; + height: 336rpx; background-color: transparent; } .page-click3 { - position: fixed; - top: 708rpx; + position: absolute; + top: 1270rpx; left: 0; z-index: 1; - width: 750rpx; - height: 360rpx; + width: 100vw; + height: 180rpx; background-color: transparent; } @@ -57,26 +58,3 @@ } } -.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/1/index.ts b/src/pages/1/index.ts index ab8971a..361564f 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -23,7 +23,7 @@ Page({ }, handelTap2() { wx.navigateTo({ - url: "/pages/8/index", + url: "/pages/3/index", }); }, handelTap3() { @@ -31,18 +31,17 @@ Page({ url: "/pages/4/index", }); }, - handleFloat1() { - this.setData({ - float1: false, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/5/index", }); - wx.setStorageSync("1float1", "1"); }, - handleTabbar2() { + handleTabbar4() { wx.reLaunch({ - url: "/pages/4/index", + url: "/pages/6/index", }); }, - handleTabbar3() { + handleTabbar5() { wx.reLaunch({ url: "/pages/7/index", }); diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index afbf1c4..0bdd06d 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -1,21 +1,15 @@ - + - + - + + + - - diff --git a/src/pages/2/index.scss b/src/pages/2/index.scss index afaaaa9..b691e80 100644 --- a/src/pages/2/index.scss +++ b/src/pages/2/index.scss @@ -1,3 +1,38 @@ -.page{ +page { + padding-bottom: 100rpx; +} +.page { + width: 100vw; + 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; + .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/2/index.ts b/src/pages/2/index.ts index 5d926b7..82f9252 100644 --- a/src/pages/2/index.ts +++ b/src/pages/2/index.ts @@ -1,13 +1,23 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, - handleTap1() { - wx.navigateTo({ - url: "/pages/3/index", + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + this.setData({ + current: 2, }); }, + handlePage3() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index 9cddfbb..af62c5b 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -1,2 +1,12 @@ - + + + + + + + + + + + diff --git a/src/pages/3/index.scss b/src/pages/3/index.scss index e859566..b691e80 100644 --- a/src/pages/3/index.scss +++ b/src/pages/3/index.scss @@ -1,3 +1,38 @@ +page { + padding-bottom: 100rpx; +} .page { width: 100vw; + 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; + .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/3/index.ts b/src/pages/3/index.ts index b3a4114..04c8c8f 100644 --- a/src/pages/3/index.ts +++ b/src/pages/3/index.ts @@ -1,11 +1,31 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, - handleTap1() { - wx.navigateTo({ - url: "/pages/1/index", + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + this.setData({ + current: 2, + }); + }, + handlePage3() { + wx.navigateBack(); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/11/index", + }); + }, + handleTabbar3() { + wx.reLaunch({ + url: "/pages/22/index", }); }, }); diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml index 97f0ac7..d2a3c3a 100644 --- a/src/pages/3/index.wxml +++ b/src/pages/3/index.wxml @@ -1,2 +1,12 @@ - + + + + + + + + + + + diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts index cf8c286..b01a564 100644 --- a/src/pages/4/index.ts +++ b/src/pages/4/index.ts @@ -5,24 +5,7 @@ Page({ onLoad() {}, handleTap1() { - wx.navigateTo({ - url: "/pages/5/index", - }); - }, - handleTap2() { - wx.navigateTo({ - url: "/pages/6/index", - }); - }, - handleTabbar1() { - wx.reLaunch({ - url: "/pages/1/index", - }); - }, - handleTabbar3() { - wx.reLaunch({ - url: "/pages/7/index", - }); + wx.navigateBack(); }, }); diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index b83dfb7..ebc54c8 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -1,11 +1,2 @@ - - - - - - - - - - - + + diff --git a/src/pages/5/index.scss b/src/pages/5/index.scss index afaaaa9..9616d46 100644 --- a/src/pages/5/index.scss +++ b/src/pages/5/index.scss @@ -1,3 +1,47 @@ -.page{ +page { + padding-bottom: 100rpx; +} +.page { + width: 100vw; + min-height: 100vh; + padding-bottom: 150rpx; + .page-img { + width: 100vw; + } +} +.page-click1 { + position: absolute; + top: 176rpx; + right: 0; + z-index: 1; + width: 50vw; + height: 96rpx; + 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/5/index.ts b/src/pages/5/index.ts index 7cf179c..49cc371 100644 --- a/src/pages/5/index.ts +++ b/src/pages/5/index.ts @@ -1,10 +1,39 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, - handleTap1() { - wx.navigateBack(); + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + this.setData({ + current: 2, + }); + }, + handelTap1() { + wx.navigateTo({ + url: "/pages/4/index", + }); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", + }); + }, + handleTabbar4() { + wx.reLaunch({ + url: "/pages/6/index", + }); + }, + handleTabbar5() { + wx.reLaunch({ + url: "/pages/7/index", + }); }, }); diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml index ada852d..6e7e32d 100644 --- a/src/pages/5/index.wxml +++ b/src/pages/5/index.wxml @@ -1,2 +1,25 @@ - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index afaaaa9..f1d902c 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -1,3 +1,31 @@ -.page{ +.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%; + } + .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/6/index.ts b/src/pages/6/index.ts index 7cf179c..65e00de 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -3,8 +3,20 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, - handleTap1() { - wx.navigateBack(); + handleTabbar1() { + wx.reLaunch({ + url: "/pages/1/index", + }); + }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/5/index", + }); + }, + handleTabbar5() { + wx.reLaunch({ + url: "/pages/7/index", + }); }, }); diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index db9da65..1dc1e00 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,2 +1,12 @@ - - + + + + + + + + + + + + diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss index 97be24b..f76ac07 100644 --- a/src/pages/7/index.scss +++ b/src/pages/7/index.scss @@ -3,7 +3,7 @@ } .page-click1 { position: fixed; - top: 380rpx; + top: 388rpx; left: 0; z-index: 1; width: 750rpx; @@ -11,24 +11,6 @@ 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; @@ -56,26 +38,3 @@ } } -.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..449273b 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -8,23 +8,8 @@ Page({ }, 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, + wx.navigateTo({ + url: "/pages/8/index", }); }, handleTabbar1() { @@ -37,6 +22,11 @@ Page({ url: "/pages/4/index", }); }, + handleTabbar4() { + wx.reLaunch({ + url: "/pages/6/index", + }); + }, }); export {}; diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index eadd2ec..f19900b 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -1,15 +1,21 @@ - + - - - + - - + + + + - + diff --git a/src/pages/8/index.wxml b/src/pages/8/index.wxml index c95388b..b68107b 100644 --- a/src/pages/8/index.wxml +++ b/src/pages/8/index.wxml @@ -1,4 +1,4 @@ - +