diff --git a/.gitignore b/.gitignore index 3c3629e..ecf69da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules +src/images/.svn diff --git a/project.config.json b/project.config.json index e352e04..17d1585 100644 --- a/project.config.json +++ b/project.config.json @@ -49,8 +49,28 @@ }, "libVersion": "2.32.3", "packOptions": { - "ignore": [], - "include": [] + "ignore": [ + { + "value": "/images/*.jpg", + "type": "glob" + }, + { + "value": "/images/**/*.jpg", + "type": "glob" + }, + { + "value": "/images/*.png", + "type": "glob" + }, + { + "value": "/images/**/*.png", + "type": "glob" + }, + { + "value": "/images/**/*.gif", + "type": "glob" + } + ] }, "appid": "wxaae50c206446a964" } diff --git a/project.private.config.json b/project.private.config.json index 03ade7f..afd00c9 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,13 +23,27 @@ "miniprogram": { "list": [ { - "name": "21", - "pathName": "pages/21/index", + "name": "23", + "pathName": "pages/23/index", "query": "", "scene": null, "launchMode": "default" }, { + "name": "22", + "pathName": "pages/22/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "21", + "pathName": "pages/21/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "20", "pathName": "pages/20/index", "query": "", diff --git a/src/images/1.png b/src/images/1.png index e579b12..f332e53 100644 Binary files a/src/images/1.png and b/src/images/1.png differ diff --git a/src/images/10.png b/src/images/10.png index 14cdd3d..ec19bb4 100644 Binary files a/src/images/10.png and b/src/images/10.png differ diff --git a/src/images/11.png b/src/images/11.png index e159b91..958980b 100644 Binary files a/src/images/11.png and b/src/images/11.png differ diff --git a/src/images/12.png b/src/images/12.png index e669ecd..bfebbae 100644 Binary files a/src/images/12.png and b/src/images/12.png differ diff --git a/src/images/13.png b/src/images/13.png index 5b0042e..e52dd63 100644 Binary files a/src/images/13.png and b/src/images/13.png differ diff --git a/src/images/14.png b/src/images/14.png index 66894fd..f907cf4 100644 Binary files a/src/images/14.png and b/src/images/14.png differ diff --git a/src/images/15.png b/src/images/15.png index dccd670..1fcba50 100644 Binary files a/src/images/15.png and b/src/images/15.png differ diff --git a/src/images/16.png b/src/images/16.png index 2c2bcc9..f6c7069 100644 Binary files a/src/images/16.png and b/src/images/16.png differ diff --git a/src/images/17.png b/src/images/17.png index 27f73c1..a2b3002 100644 Binary files a/src/images/17.png and b/src/images/17.png differ diff --git a/src/images/18.png b/src/images/18.png index 2d518b4..8390683 100644 Binary files a/src/images/18.png and b/src/images/18.png differ diff --git a/src/images/19.png b/src/images/19.png index 8d7dc76..47f98e4 100644 Binary files a/src/images/19.png and b/src/images/19.png differ diff --git a/src/images/2.png b/src/images/2.png index 75b6d57..e3fb5e8 100644 Binary files a/src/images/2.png and b/src/images/2.png differ diff --git a/src/images/20.png b/src/images/20.png index 3f09cea..1dfc708 100644 Binary files a/src/images/20.png and b/src/images/20.png differ diff --git a/src/images/21.png b/src/images/21.png index fbd915a..4d161d2 100644 Binary files a/src/images/21.png and b/src/images/21.png differ diff --git a/src/images/22.png b/src/images/22.png index ad4f20d..c920780 100644 Binary files a/src/images/22.png and b/src/images/22.png differ diff --git a/src/images/23.png b/src/images/23.png index 605318a..846fab5 100644 Binary files a/src/images/23.png and b/src/images/23.png differ diff --git a/src/images/24.png b/src/images/24.png index 195c039..44051e3 100644 Binary files a/src/images/24.png and b/src/images/24.png differ diff --git a/src/images/25.png b/src/images/25.png index 9d3bbe5..9bd7e42 100644 Binary files a/src/images/25.png and b/src/images/25.png differ diff --git a/src/images/26.png b/src/images/26.png index b5286cf..48b130a 100644 Binary files a/src/images/26.png and b/src/images/26.png differ diff --git a/src/images/27.png b/src/images/27.png index 9b49b0d..b7783e5 100644 Binary files a/src/images/27.png and b/src/images/27.png differ diff --git a/src/images/28.png b/src/images/28.png index 9cd0888..3566526 100644 Binary files a/src/images/28.png and b/src/images/28.png differ diff --git a/src/images/29.png b/src/images/29.png index ad4f20d..c920780 100644 Binary files a/src/images/29.png and b/src/images/29.png differ diff --git a/src/images/3.png b/src/images/3.png index 48b95ff..3c77803 100644 Binary files a/src/images/3.png and b/src/images/3.png differ diff --git a/src/images/30.png b/src/images/30.png index 8bd6dbe..8e7a20a 100644 Binary files a/src/images/30.png and b/src/images/30.png differ diff --git a/src/images/31.png b/src/images/31.png index 53bccf1..bc937b4 100644 Binary files a/src/images/31.png and b/src/images/31.png differ diff --git a/src/images/32.png b/src/images/32.png index 7848291..2e3e931 100644 Binary files a/src/images/32.png and b/src/images/32.png differ diff --git a/src/images/33.png b/src/images/33.png index 7041a43..dca53f9 100644 Binary files a/src/images/33.png and b/src/images/33.png differ diff --git a/src/images/34.png b/src/images/34.png index 289d16d..b9c641a 100644 Binary files a/src/images/34.png and b/src/images/34.png differ diff --git a/src/images/35.png b/src/images/35.png index e1dc256..fcd0e30 100644 Binary files a/src/images/35.png and b/src/images/35.png differ diff --git a/src/images/36.png b/src/images/36.png index 95c59f6..414f476 100644 Binary files a/src/images/36.png and b/src/images/36.png differ diff --git a/src/images/37.png b/src/images/37.png index 0b11b29..9951ba3 100644 Binary files a/src/images/37.png and b/src/images/37.png differ diff --git a/src/images/38.png b/src/images/38.png index f5ccc54..8b18b26 100644 Binary files a/src/images/38.png and b/src/images/38.png differ diff --git a/src/images/39.png b/src/images/39.png index 133287c..9305dfa 100644 Binary files a/src/images/39.png and b/src/images/39.png differ diff --git a/src/images/4.png b/src/images/4.png index a63b2bb..7c77bb2 100644 Binary files a/src/images/4.png and b/src/images/4.png differ diff --git a/src/images/40.png b/src/images/40.png index d5016f7..5483aec 100644 Binary files a/src/images/40.png and b/src/images/40.png differ diff --git a/src/images/41.png b/src/images/41.png index 0286408..aeca632 100644 Binary files a/src/images/41.png and b/src/images/41.png differ diff --git a/src/images/42.png b/src/images/42.png index e98d347..46d33ee 100644 Binary files a/src/images/42.png and b/src/images/42.png differ diff --git a/src/images/43.png b/src/images/43.png index d11568f..5bd5b82 100644 Binary files a/src/images/43.png and b/src/images/43.png differ diff --git a/src/images/44.png b/src/images/44.png index 3880ee9..e3530be 100644 Binary files a/src/images/44.png and b/src/images/44.png differ diff --git a/src/images/45.png b/src/images/45.png index 4ef943b..1dae005 100644 Binary files a/src/images/45.png and b/src/images/45.png differ diff --git a/src/images/46.png b/src/images/46.png index 3be71d9..1d0b60e 100644 Binary files a/src/images/46.png and b/src/images/46.png differ diff --git a/src/images/47.png b/src/images/47.png index 31b7bc0..fd24c6a 100644 Binary files a/src/images/47.png and b/src/images/47.png differ diff --git a/src/images/48.png b/src/images/48.png index 338cc3c..4073162 100644 Binary files a/src/images/48.png and b/src/images/48.png differ diff --git a/src/images/49.png b/src/images/49.png index 526cb85..5e23ce3 100644 Binary files a/src/images/49.png and b/src/images/49.png differ diff --git a/src/images/5.png b/src/images/5.png index 9991117..0d771cc 100644 Binary files a/src/images/5.png and b/src/images/5.png differ diff --git a/src/images/50.png b/src/images/50.png index 48746c5..eec21ce 100644 Binary files a/src/images/50.png and b/src/images/50.png differ diff --git a/src/images/51.png b/src/images/51.png index 3135d10..549f4db 100644 Binary files a/src/images/51.png and b/src/images/51.png differ diff --git a/src/images/52.png b/src/images/52.png index 732d134..9e273c9 100644 Binary files a/src/images/52.png and b/src/images/52.png differ diff --git a/src/images/53.png b/src/images/53.png new file mode 100644 index 0000000..e720b3d Binary files /dev/null and b/src/images/53.png differ diff --git a/src/images/54.png b/src/images/54.png new file mode 100644 index 0000000..f62cb86 Binary files /dev/null and b/src/images/54.png differ diff --git a/src/images/6.png b/src/images/6.png index 319b02b..c92841b 100644 Binary files a/src/images/6.png and b/src/images/6.png differ diff --git a/src/images/7.png b/src/images/7.png index eee9dff..7e8c226 100644 Binary files a/src/images/7.png and b/src/images/7.png differ diff --git a/src/images/8.png b/src/images/8.png index 2aea76e..4d08a0b 100644 Binary files a/src/images/8.png and b/src/images/8.png differ diff --git a/src/images/9.png b/src/images/9.png index e0ba8a2..398ea1b 100644 Binary files a/src/images/9.png and b/src/images/9.png differ diff --git a/src/images/navbar.png b/src/images/navbar.png index a3f466a..908a3b0 100644 Binary files a/src/images/navbar.png and b/src/images/navbar.png differ diff --git a/src/images/tabbar1-1.png b/src/images/tabbar1-1.png index 932beae..abe5537 100644 Binary files a/src/images/tabbar1-1.png and b/src/images/tabbar1-1.png differ diff --git a/src/images/tabbar1-2.png b/src/images/tabbar1-2.png index 29ba66b..9f8d515 100644 Binary files a/src/images/tabbar1-2.png and b/src/images/tabbar1-2.png differ diff --git a/src/images/tabbar1-3.png b/src/images/tabbar1-3.png index c91c874..21818cc 100644 Binary files a/src/images/tabbar1-3.png and b/src/images/tabbar1-3.png differ diff --git a/src/images/tabbar2-1.png b/src/images/tabbar2-1.png index eebc5e4..45fa972 100644 Binary files a/src/images/tabbar2-1.png and b/src/images/tabbar2-1.png differ diff --git a/src/images/tabbar2-2.png b/src/images/tabbar2-2.png index 23afbe8..178da2b 100644 Binary files a/src/images/tabbar2-2.png and b/src/images/tabbar2-2.png differ diff --git a/src/images/tabbar2-3.png b/src/images/tabbar2-3.png index 5404422..2435d53 100644 Binary files a/src/images/tabbar2-3.png and b/src/images/tabbar2-3.png differ diff --git a/src/images/tabbar2-4.png b/src/images/tabbar2-4.png index 52fbdeb..9619cad 100644 Binary files a/src/images/tabbar2-4.png and b/src/images/tabbar2-4.png differ diff --git a/src/images/tabbar3-1.png b/src/images/tabbar3-1.png index 5236c1a..f5569f3 100644 Binary files a/src/images/tabbar3-1.png and b/src/images/tabbar3-1.png differ diff --git a/src/images/tabbar3-2.png b/src/images/tabbar3-2.png index fbd7b15..212eedd 100644 Binary files a/src/images/tabbar3-2.png and b/src/images/tabbar3-2.png differ diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index 8aa5a9f..75b44bd 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -2,7 +2,7 @@ width: 100vw; } .page-click1 { - position: fixed; + position: absolute; top: 500rpx; left: 0; z-index: 1; @@ -12,7 +12,7 @@ } .page-click2 { - position: fixed; + position: absolute; top: 1080rpx; left: 0; z-index: 1; @@ -20,6 +20,15 @@ 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; diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index e619b7c..398f10c 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -21,6 +21,11 @@ Page({ url: "/pages/8/index", }); }, + handelTap3() { + wx.navigateTo({ + url: "/pages/4/index", + }); + }, handleFloat1() { this.setData({ float1: false, @@ -28,12 +33,12 @@ Page({ wx.setStorageSync("1float1", "1"); }, handleTabbar2() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/4/index", }); }, handleTabbar3() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/7/index", }); }, diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index c8fcf8f..cc45887 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -1,12 +1,14 @@ - + + + - + - + @@ -14,6 +16,6 @@ wx:if="{{float1}}" class="float1" mode="widthFix" - src="/images/9.png" + src="{{imageUrl}}9.png?t={{Timestamp}}" bind:tap="handleFloat1" > diff --git a/src/pages/10/index.wxml b/src/pages/10/index.wxml index 895e564..c675345 100644 --- a/src/pages/10/index.wxml +++ b/src/pages/10/index.wxml @@ -1 +1 @@ - + diff --git a/src/pages/11/index.scss b/src/pages/11/index.scss index 060d368..aa6a3ac 100644 --- a/src/pages/11/index.scss +++ b/src/pages/11/index.scss @@ -5,25 +5,26 @@ page{ width: 100vw; } .page-click1 { - position: fixed; + position: absolute; top: 340rpx; left: 0; z-index: 1; width: 750rpx; - height: 150rpx; + height: 200rpx; background-color: transparent; } .page-click2 { - position: fixed; + position: absolute; top: 500rpx; left: 0; z-index: 1; width: 750rpx; - height: 360rpx; + height: 400rpx; background-color: transparent; } + .tabbar { position: fixed; bottom: 0; diff --git a/src/pages/11/index.ts b/src/pages/11/index.ts index 980beee..c6d6d3d 100644 --- a/src/pages/11/index.ts +++ b/src/pages/11/index.ts @@ -13,11 +13,21 @@ Page({ url: "/pages/12/index", }); }, - handleTabbar2() { + handelTap3() { wx.navigateTo({ url: "/pages/17/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 1db3bef..5e4d24b 100644 --- a/src/pages/11/index.wxml +++ b/src/pages/11/index.wxml @@ -1,9 +1,9 @@ - + - + @@ -11,4 +11,4 @@ - + diff --git a/src/pages/12/index.wxml b/src/pages/12/index.wxml index 15a1dc5..a7a759b 100644 --- a/src/pages/12/index.wxml +++ b/src/pages/12/index.wxml @@ -1,21 +1,21 @@ - + - + - + - + - + diff --git a/src/pages/13/index.wxml b/src/pages/13/index.wxml index 46701e6..1ce0f92 100644 --- a/src/pages/13/index.wxml +++ b/src/pages/13/index.wxml @@ -1,12 +1,12 @@ - + - + - + diff --git a/src/pages/14/index.wxml b/src/pages/14/index.wxml index db71f84..ce27027 100644 --- a/src/pages/14/index.wxml +++ b/src/pages/14/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/15/index.wxml b/src/pages/15/index.wxml index 56ba07a..5003b51 100644 --- a/src/pages/15/index.wxml +++ b/src/pages/15/index.wxml @@ -1,12 +1,12 @@ - + - + - + diff --git a/src/pages/16/index.wxml b/src/pages/16/index.wxml index 163a786..5d0798c 100644 --- a/src/pages/16/index.wxml +++ b/src/pages/16/index.wxml @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/src/pages/17/index.ts b/src/pages/17/index.ts index f3e8498..04c8c8f 100644 --- a/src/pages/17/index.ts +++ b/src/pages/17/index.ts @@ -19,8 +19,13 @@ Page({ wx.navigateBack(); }, handleTabbar1() { - wx.navigateTo({ - url: "/pages/1/index", + wx.reLaunch({ + url: "/pages/11/index", + }); + }, + handleTabbar3() { + wx.reLaunch({ + url: "/pages/22/index", }); }, }); diff --git a/src/pages/17/index.wxml b/src/pages/17/index.wxml index bf54ad6..c1e59c1 100644 --- a/src/pages/17/index.wxml +++ b/src/pages/17/index.wxml @@ -1,17 +1,17 @@ - + - + - + - + diff --git a/src/pages/18/index.scss b/src/pages/18/index.scss index 683ca68..17a10c7 100644 --- a/src/pages/18/index.scss +++ b/src/pages/18/index.scss @@ -1,5 +1,6 @@ page { position: relative; + padding-bottom: 80px; } .page { @@ -41,3 +42,30 @@ page { 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; + } + } +} diff --git a/src/pages/18/index.ts b/src/pages/18/index.ts index 2602196..7c71db4 100644 --- a/src/pages/18/index.ts +++ b/src/pages/18/index.ts @@ -23,6 +23,11 @@ Page({ url: "/pages/21/index?current=2", }); }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/23/index", + }); + }, }); export {}; diff --git a/src/pages/18/index.wxml b/src/pages/18/index.wxml index 705a35a..f10fc77 100644 --- a/src/pages/18/index.wxml +++ b/src/pages/18/index.wxml @@ -1,6 +1,15 @@ - + + + + + + + + + + diff --git a/src/pages/19/index.wxml b/src/pages/19/index.wxml index 738199f..9e8a404 100644 --- a/src/pages/19/index.wxml +++ b/src/pages/19/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index 4c317a9..9cddfbb 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/20/index.ts b/src/pages/20/index.ts index 15d0e38..e342172 100644 --- a/src/pages/20/index.ts +++ b/src/pages/20/index.ts @@ -4,7 +4,13 @@ Page({ data: { current: 0, }, - onLoad() {}, + onLoad(options) { + if (options.current) { + this.setData({ + current: Number(options.current), + }); + } + }, handlePage1() { this.setData({ current: 1, diff --git a/src/pages/20/index.wxml b/src/pages/20/index.wxml index 5d0ea2b..22172af 100644 --- a/src/pages/20/index.wxml +++ b/src/pages/20/index.wxml @@ -1,9 +1,9 @@ - + - + diff --git a/src/pages/21/index.ts b/src/pages/21/index.ts index 3ae0366..cb8a8cc 100644 --- a/src/pages/21/index.ts +++ b/src/pages/21/index.ts @@ -12,7 +12,9 @@ Page({ } }, handlePage1() { - wx.navigateBack(); + wx.navigateTo({ + url: "/pages/20/index?current=1", + }); }, handlePage2() { wx.navigateBack(); diff --git a/src/pages/21/index.wxml b/src/pages/21/index.wxml index ae32019..9593a66 100644 --- a/src/pages/21/index.wxml +++ b/src/pages/21/index.wxml @@ -1,12 +1,12 @@ - + - + - + diff --git a/src/pages/22/index.scss b/src/pages/22/index.scss index e859566..97be24b 100644 --- a/src/pages/22/index.scss +++ b/src/pages/22/index.scss @@ -1,3 +1,81 @@ .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; + width: 100vw; +} diff --git a/src/pages/22/index.ts b/src/pages/22/index.ts index ad9a054..1a18991 100644 --- a/src/pages/22/index.ts +++ b/src/pages/22/index.ts @@ -1,8 +1,37 @@ const _app = getApp(); Page({ - data: {}, + data: { + float1: false, + float2: false, + float3: false, + }, onLoad() {}, + handelTap1() { + this.setData({ + float1: true, + }); + }, + handelTap2() { + wx.reLaunch({ + url: "/pages/18/index", + }); + }, + handleFloat1() { + this.setData({ + float1: false, + }); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/11/index", + }); + }, + handleTabbar2() { + wx.reLaunch({ + url: "/pages/17/index", + }); + }, }); export {}; diff --git a/src/pages/22/index.wxml b/src/pages/22/index.wxml index e69de29..c536efe 100644 --- a/src/pages/22/index.wxml +++ b/src/pages/22/index.wxml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/pages/23/index.scss b/src/pages/23/index.scss index e859566..97be24b 100644 --- a/src/pages/23/index.scss +++ b/src/pages/23/index.scss @@ -1,3 +1,81 @@ .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; + width: 100vw; +} diff --git a/src/pages/23/index.ts b/src/pages/23/index.ts index ad9a054..2525fb1 100644 --- a/src/pages/23/index.ts +++ b/src/pages/23/index.ts @@ -1,8 +1,27 @@ const _app = getApp(); Page({ - data: {}, + data: { + float1: false, + float2: false, + float3: false, + }, onLoad() {}, + handelTap1() { + wx.reLaunch({ + url: "/pages/11/index", + }); + }, + handleFloat1() { + this.setData({ + float1: false, + }); + }, + handleTabbar1() { + wx.reLaunch({ + url: "/pages/18/index", + }); + }, }); export {}; diff --git a/src/pages/23/index.wxml b/src/pages/23/index.wxml index e69de29..fe30879 100644 --- a/src/pages/23/index.wxml +++ b/src/pages/23/index.wxml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml index fa13f63..97f0ac7 100644 --- a/src/pages/3/index.wxml +++ b/src/pages/3/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts index 73d58dd..cf8c286 100644 --- a/src/pages/4/index.ts +++ b/src/pages/4/index.ts @@ -15,12 +15,12 @@ Page({ }); }, handleTabbar1() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/1/index", }); }, handleTabbar3() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/7/index", }); }, diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index 560da84..b83dfb7 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -1,12 +1,11 @@ - + - + - diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml index 9cc41ba..ada852d 100644 --- a/src/pages/5/index.wxml +++ b/src/pages/5/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index dc39cad..db9da65 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,2 +1,2 @@ - + diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts index b8872b0..befbf58 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -13,12 +13,12 @@ Page({ }); }, handelTap2() { - wx.navigateTo({ + wx.reLaunch({ url:'/pages/9/index' }) }, handelTap3() { - wx.navigateTo({ + wx.reLaunch({ url:'/pages/18/index' }) }, @@ -28,12 +28,12 @@ Page({ }); }, handleTabbar1() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/1/index", }); }, handleTabbar2() { - wx.navigateTo({ + wx.reLaunch({ url: "/pages/4/index", }); }, diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index 4ed2543..eadd2ec 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -1,10 +1,10 @@ - + - + @@ -12,4 +12,4 @@ - + diff --git a/src/pages/8/index.ts b/src/pages/8/index.ts index 7f6ad82..0b6a01d 100644 --- a/src/pages/8/index.ts +++ b/src/pages/8/index.ts @@ -2,11 +2,13 @@ const _app = getApp(); Page({ data: { - float1: true, + float1: false, }, onLoad() {}, handleTap1() { - wx.navigateBack(); + this.setData({ + float1: true, + }); }, handleFloat1() { this.setData({ diff --git a/src/pages/8/index.wxml b/src/pages/8/index.wxml index ed60fef..c95388b 100644 --- a/src/pages/8/index.wxml +++ b/src/pages/8/index.wxml @@ -1,4 +1,4 @@ - + - + diff --git a/src/pages/9/index.ts b/src/pages/9/index.ts index 78815ca..fb4f20f 100644 --- a/src/pages/9/index.ts +++ b/src/pages/9/index.ts @@ -17,9 +17,6 @@ Page({ }); }, handleFloat2() { - this.setData({ - float2: false, - }); wx.navigateTo({ url: "/pages/10/index", }); diff --git a/src/pages/9/index.wxml b/src/pages/9/index.wxml index a6f3d50..f35c423 100644 --- a/src/pages/9/index.wxml +++ b/src/pages/9/index.wxml @@ -1,5 +1,4 @@ - - + - - + + diff --git a/src/utils/page.ts b/src/utils/page.ts index 9d7db56..4ae4789 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -53,15 +53,15 @@ function page(config: WechatMiniprogram.Page.Instance