diff --git a/project.private.config.json b/project.private.config.json index afd00c9..357dda9 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,13 +23,27 @@ "miniprogram": { "list": [ { - "name": "23", - "pathName": "pages/23/index", + "name": "25", + "pathName": "pages/25/index", "query": "", "scene": null, "launchMode": "default" }, { + "name": "24", + "pathName": "pages/24/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "23", + "pathName": "pages/23/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "22", "pathName": "pages/22/index", "query": "", diff --git a/src/images/20.png b/src/images/20.png index 1dfc708..055ede6 100644 Binary files a/src/images/20.png and b/src/images/20.png differ diff --git a/src/images/43.png b/src/images/43.png index 5bd5b82..6b2dab1 100644 Binary files a/src/images/43.png and b/src/images/43.png differ diff --git a/src/images/52.png b/src/images/52.png index 9e273c9..b875a81 100644 Binary files a/src/images/52.png and b/src/images/52.png differ diff --git a/src/images/55.png b/src/images/55.png new file mode 100644 index 0000000..b4cf397 Binary files /dev/null and b/src/images/55.png differ diff --git a/src/images/56.png b/src/images/56.png new file mode 100644 index 0000000..0ce4097 Binary files /dev/null and b/src/images/56.png differ diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index 398f10c..ab8971a 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -11,6 +11,11 @@ Page({ float1: wx.getStorageSync("1float1") !== "1", }); }, + handlePage() { + wx.navigateTo({ + url: "/pages/5/index", + }); + }, handelTap1() { wx.navigateTo({ url: "/pages/2/index", diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index cc45887..afbf1c4 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -1,14 +1,14 @@ - - - - + + + + - - + + @@ -17,5 +17,5 @@ class="float1" mode="widthFix" src="{{imageUrl}}9.png?t={{Timestamp}}" - bind:tap="handleFloat1" + catch:tap="handleFloat1" > diff --git a/src/pages/11/index.scss b/src/pages/11/index.scss index aa6a3ac..c0e0f25 100644 --- a/src/pages/11/index.scss +++ b/src/pages/11/index.scss @@ -24,6 +24,16 @@ page{ background-color: transparent; } +.page-click3 { + position: absolute; + top: 1400rpx; + left: 0; + z-index: 1; + width: 750rpx; + height: 400rpx; + background-color: transparent; +} + .tabbar { position: fixed; diff --git a/src/pages/11/index.ts b/src/pages/11/index.ts index c6d6d3d..596001e 100644 --- a/src/pages/11/index.ts +++ b/src/pages/11/index.ts @@ -15,7 +15,7 @@ Page({ }, handelTap3() { wx.navigateTo({ - url: "/pages/17/index", + url: "/pages/25/index", }); }, handleTabbar2() { diff --git a/src/pages/11/index.wxml b/src/pages/11/index.wxml index 5e4d24b..1951092 100644 --- a/src/pages/11/index.wxml +++ b/src/pages/11/index.wxml @@ -1,6 +1,7 @@ + diff --git a/src/pages/17/index.ts b/src/pages/17/index.ts index 04c8c8f..02a9875 100644 --- a/src/pages/17/index.ts +++ b/src/pages/17/index.ts @@ -6,8 +6,8 @@ Page({ }, onLoad() {}, handlePage1() { - this.setData({ - current: 1, + wx.navigateTo({ + url: "/pages/24/index", }); }, handlePage2() { diff --git a/src/pages/18/index.scss b/src/pages/18/index.scss index 17a10c7..0a87a59 100644 --- a/src/pages/18/index.scss +++ b/src/pages/18/index.scss @@ -18,7 +18,7 @@ page { .page-click2 { position: absolute; - top: 1220rpx; + top: 920rpx; left: 0; width: 100vw; height: 730rpx; @@ -27,7 +27,7 @@ page { .page-click3 { position: absolute; - top: 1020rpx; + top: 1680rpx; left: 0; width: 50vw; height: 180rpx; @@ -36,7 +36,7 @@ page { .page-click4 { position: absolute; - top: 1020rpx; + top: 1680rpx; right: 0; width: 50vw; height: 180rpx; diff --git a/src/pages/18/index.ts b/src/pages/18/index.ts index 7c71db4..c818106 100644 --- a/src/pages/18/index.ts +++ b/src/pages/18/index.ts @@ -20,7 +20,7 @@ Page({ }, handleTap4() { wx.navigateTo({ - url: "/pages/21/index?current=2", + url: "/pages/25/index" }); }, handleTabbar2() { diff --git a/src/pages/20/index.ts b/src/pages/20/index.ts index e342172..2dd03cd 100644 --- a/src/pages/20/index.ts +++ b/src/pages/20/index.ts @@ -17,8 +17,13 @@ Page({ }); }, handlePage2() { - wx.navigateBack(); + this.setData({ + current: 2, + }); }, + handlePage3(){ + wx.navigateBack(); + } }); export {}; diff --git a/src/pages/20/index.wxml b/src/pages/20/index.wxml index 22172af..1ea6d79 100644 --- a/src/pages/20/index.wxml +++ b/src/pages/20/index.wxml @@ -6,4 +6,7 @@ + + + diff --git a/src/pages/24/index.scss b/src/pages/24/index.scss index e859566..39d1895 100644 --- a/src/pages/24/index.scss +++ b/src/pages/24/index.scss @@ -1,3 +1,8 @@ .page { width: 100vw; + min-height: 100vh; + .page-img { + width: 100%; + height: 100%; + } } diff --git a/src/pages/24/index.ts b/src/pages/24/index.ts index ad9a054..15d0e38 100644 --- a/src/pages/24/index.ts +++ b/src/pages/24/index.ts @@ -1,8 +1,18 @@ const _app = getApp(); Page({ - data: {}, + data: { + current: 0, + }, onLoad() {}, + handlePage1() { + this.setData({ + current: 1, + }); + }, + handlePage2() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/24/index.wxml b/src/pages/24/index.wxml index e69de29..374a86e 100644 --- a/src/pages/24/index.wxml +++ b/src/pages/24/index.wxml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/pages/25/index.ts b/src/pages/25/index.ts index ad9a054..f2bc315 100644 --- a/src/pages/25/index.ts +++ b/src/pages/25/index.ts @@ -3,6 +3,9 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, + handlePage() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/25/index.wxml b/src/pages/25/index.wxml index e69de29..b276d02 100644 --- a/src/pages/25/index.wxml +++ b/src/pages/25/index.wxml @@ -0,0 +1,2 @@ + +