diff --git a/src/app.ts b/src/app.ts index d5566f9..edd6271 100644 --- a/src/app.ts +++ b/src/app.ts @@ -4,6 +4,7 @@ import page from "@/utils/page"; App({ globalData: { imageUrl: "https://m.wtx.hbraas.com/demo/web/images/", + float1_1: null, }, onLaunch() { Page = page as WechatMiniprogram.Page.Constructor; diff --git a/src/components/navigation-bar/navigation-bar.wxml b/src/components/navigation-bar/navigation-bar.wxml index be9a663..298f681 100644 --- a/src/components/navigation-bar/navigation-bar.wxml +++ b/src/components/navigation-bar/navigation-bar.wxml @@ -1,8 +1,10 @@ - - + - + @@ -40,13 +42,9 @@ - + - + {{title}} @@ -55,9 +53,9 @@ - + - + diff --git a/src/images/qs/1.png b/src/images/qs/1.png index f7d7b77..0d842f5 100644 Binary files a/src/images/qs/1.png and b/src/images/qs/1.png differ diff --git a/src/images/qs/10.png b/src/images/qs/10.png index e1e2db5..1f96445 100644 Binary files a/src/images/qs/10.png and b/src/images/qs/10.png differ diff --git a/src/images/qs/11.png b/src/images/qs/11.png index abdd218..630e396 100644 Binary files a/src/images/qs/11.png and b/src/images/qs/11.png differ diff --git a/src/images/qs/12.png b/src/images/qs/12.png index d315148..4df1f31 100644 Binary files a/src/images/qs/12.png and b/src/images/qs/12.png differ diff --git a/src/images/qs/13.png b/src/images/qs/13.png index c75d420..1657d47 100644 Binary files a/src/images/qs/13.png and b/src/images/qs/13.png differ diff --git a/src/images/qs/14.png b/src/images/qs/14.png index c928419..03ee748 100644 Binary files a/src/images/qs/14.png and b/src/images/qs/14.png differ diff --git a/src/images/qs/15.png b/src/images/qs/15.png new file mode 100644 index 0000000..49770ec Binary files /dev/null and b/src/images/qs/15.png differ diff --git a/src/images/qs/16.png b/src/images/qs/16.png new file mode 100644 index 0000000..851da8d Binary files /dev/null and b/src/images/qs/16.png differ diff --git a/src/images/qs/17.png b/src/images/qs/17.png new file mode 100644 index 0000000..b913281 Binary files /dev/null and b/src/images/qs/17.png differ diff --git a/src/images/qs/18.png b/src/images/qs/18.png new file mode 100644 index 0000000..d5922b1 Binary files /dev/null and b/src/images/qs/18.png differ diff --git a/src/images/qs/19.png b/src/images/qs/19.png new file mode 100644 index 0000000..fd80c6b Binary files /dev/null and b/src/images/qs/19.png differ diff --git a/src/images/qs/2.png b/src/images/qs/2.png index 69741fe..b372503 100644 Binary files a/src/images/qs/2.png and b/src/images/qs/2.png differ diff --git a/src/images/qs/20.png b/src/images/qs/20.png new file mode 100644 index 0000000..9118713 Binary files /dev/null and b/src/images/qs/20.png differ diff --git a/src/images/qs/21.png b/src/images/qs/21.png new file mode 100644 index 0000000..948c359 Binary files /dev/null and b/src/images/qs/21.png differ diff --git a/src/images/qs/22.png b/src/images/qs/22.png new file mode 100644 index 0000000..e757e57 Binary files /dev/null and b/src/images/qs/22.png differ diff --git a/src/images/qs/3.png b/src/images/qs/3.png index 30e6e55..364b4ed 100644 Binary files a/src/images/qs/3.png and b/src/images/qs/3.png differ diff --git a/src/images/qs/4.png b/src/images/qs/4.png index 53c9b10..dfafa57 100644 Binary files a/src/images/qs/4.png and b/src/images/qs/4.png differ diff --git a/src/images/qs/5.png b/src/images/qs/5.png index 302b81b..6c912cf 100644 Binary files a/src/images/qs/5.png and b/src/images/qs/5.png differ diff --git a/src/images/qs/6.png b/src/images/qs/6.png index 17f99f4..440e6ae 100644 Binary files a/src/images/qs/6.png and b/src/images/qs/6.png differ diff --git a/src/images/qs/7.png b/src/images/qs/7.png index 8f76544..921a78a 100644 Binary files a/src/images/qs/7.png and b/src/images/qs/7.png differ diff --git a/src/images/qs/8.png b/src/images/qs/8.png index df8a605..d44382c 100644 Binary files a/src/images/qs/8.png and b/src/images/qs/8.png differ diff --git a/src/images/qs/9.png b/src/images/qs/9.png index bc0d707..445376e 100644 Binary files a/src/images/qs/9.png and b/src/images/qs/9.png differ diff --git a/src/images/qs/tabbar-tip.png b/src/images/qs/tabbar-tip.png new file mode 100644 index 0000000..6998b5e Binary files /dev/null and b/src/images/qs/tabbar-tip.png differ diff --git a/src/images/qs/tabbar1.png b/src/images/qs/tabbar1.png index 070c5fa..5ebfbd4 100644 Binary files a/src/images/qs/tabbar1.png and b/src/images/qs/tabbar1.png differ diff --git a/src/images/qs/tabbar2.png b/src/images/qs/tabbar2.png index 15bc15f..e4adaf6 100644 Binary files a/src/images/qs/tabbar2.png and b/src/images/qs/tabbar2.png differ diff --git a/src/images/qs/tabbar3.png b/src/images/qs/tabbar3.png index 618a6a6..55cb16a 100644 Binary files a/src/images/qs/tabbar3.png and b/src/images/qs/tabbar3.png differ diff --git a/src/images/qs/tabbar4.png b/src/images/qs/tabbar4.png index 53604fa..83f38ec 100644 Binary files a/src/images/qs/tabbar4.png and b/src/images/qs/tabbar4.png differ diff --git a/src/images/qs/首页长 - 标准2.png b/src/images/qs/首页长 - 标准2.png new file mode 100644 index 0000000..d44382c Binary files /dev/null and b/src/images/qs/首页长 - 标准2.png differ diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index ebb8d13..d860e7c 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -4,7 +4,7 @@ } .page-click1 { position: absolute; - top: 676rpx; + top: 836rpx; left: 0; z-index: 1; width: 50vw; @@ -14,7 +14,7 @@ .page-click2 { position: absolute; - top: 676rpx; + top: 836rpx; right: 0; z-index: 1; width: 50vw; @@ -23,11 +23,31 @@ } .page-click3 { position: absolute; - top: 1270rpx; + top: 1190rpx; left: 0; z-index: 1; + width: 50vw; + height: 220rpx; + background-color: transparent; +} + +.page-click4 { + position: absolute; + top: 388rpx; + right: 72rpx; + z-index: 2; + width: 64rpx; + height: 64rpx; + background-color: transparent; +} + +.page-click5 { + position: absolute; + top: 356rpx; + right: 0; + z-index: 1; width: 100vw; - height: 180rpx; + height: 302rpx; background-color: transparent; } @@ -53,8 +73,17 @@ align-items: center; .tabbar-click { flex: 1; - height: 160rpx; + height: 220rpx; } } } +.float1 { + position: fixed; + z-index: 3; + bottom: 248rpx; + left: 50%; + transform: translateX(-50%); + width: 256rpx; + height: 122rpx; +} diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index 1e7d88a..d9d7a40 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -1,45 +1,77 @@ -const _app = getApp(); +const app = getApp(); Page({ data: { - float1: true, - float2: false, - float3: false, + float1: false, }, - onLoad() { + onShow() { this.setData({ - float1: wx.getStorageSync("1float1") !== "1", + float1: app.globalData.float1_1 === null ? true : false, }); }, handelTap1() { wx.navigateTo({ url: "/pages/2/index", }); + this.handleHideFloat1() }, handelTap2() { wx.navigateTo({ url: "/pages/3/index", }); + this.handleHideFloat1() }, handelTap3() { wx.navigateTo({ url: "/pages/4/index", }); + this.handleHideFloat1() + }, + handelTap4() { + wx.navigateTo({ + url: "/pages/9/index?current=3", + }); + this.handleHideFloat1() + }, + handelTap5() { + wx.navigateTo({ + url: "/pages/9/index", + }); + this.handleHideFloat1() }, handleTabbar2() { wx.reLaunch({ url: "/pages/5/index", }); + this.handleHideFloat1() + }, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/9/index", + }); + this.handleHideFloat1() }, handleTabbar4() { wx.navigateTo({ url: "/pages/6/index", }); + this.handleHideFloat1() }, handleTabbar5() { wx.reLaunch({ url: "/pages/7/index", }); + this.handleHideFloat1() + }, + + handleFloat1() { + this.setData({ + float1: false, + }); + this.handleHideFloat1() + }, + handleHideFloat1() { + app.globalData.float1_1 = "1"; }, }); diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml index 0b9091a..bad8725 100644 --- a/src/pages/1/index.wxml +++ b/src/pages/1/index.wxml @@ -2,14 +2,24 @@ + + - + + + diff --git a/src/pages/2/index.json b/src/pages/2/index.json index a97367d..410e8cb 100644 --- a/src/pages/2/index.json +++ b/src/pages/2/index.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "van-icon": "@vant/weapp/icon/index" + } } diff --git a/src/pages/2/index.ts b/src/pages/2/index.ts index 82f9252..486330c 100644 --- a/src/pages/2/index.ts +++ b/src/pages/2/index.ts @@ -16,6 +16,19 @@ Page({ }); }, handlePage3() { + this.setData({ + current: 3, + }); + }, + handlePage4() { + this.setData({ + current: 4, + }); + }, + handlePage5() { + wx.navigateBack(); + }, + handleBack() { wx.navigateBack(); }, }); diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index bba0dc9..306e0d1 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -1,4 +1,6 @@ - + + + @@ -9,4 +11,10 @@ + + + + + + diff --git a/src/pages/5/index.scss b/src/pages/5/index.scss index 9616d46..21d4ef2 100644 --- a/src/pages/5/index.scss +++ b/src/pages/5/index.scss @@ -41,7 +41,7 @@ page { align-items: center; .tabbar-click { flex: 1; - height: 160rpx; + height: 220rpx; } } } diff --git a/src/pages/5/index.ts b/src/pages/5/index.ts index d0dcb6a..90697ff 100644 --- a/src/pages/5/index.ts +++ b/src/pages/5/index.ts @@ -25,6 +25,11 @@ Page({ url: "/pages/1/index", }); }, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/9/index", + }); + }, handleTabbar4() { wx.navigateTo({ url: "/pages/6/index", diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml index a4493f3..534b374 100644 --- a/src/pages/5/index.wxml +++ b/src/pages/5/index.wxml @@ -17,7 +17,7 @@ - + diff --git a/src/pages/6/index.json b/src/pages/6/index.json index a97367d..410e8cb 100644 --- a/src/pages/6/index.json +++ b/src/pages/6/index.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "van-icon": "@vant/weapp/icon/index" + } } diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts index 65e00de..4618f04 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -18,6 +18,9 @@ Page({ url: "/pages/7/index", }); }, + handleBack() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index e1e08d3..080487f 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -1,2 +1,4 @@ - + + + diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss index f76ac07..f04e3a7 100644 --- a/src/pages/7/index.scss +++ b/src/pages/7/index.scss @@ -3,7 +3,7 @@ } .page-click1 { position: fixed; - top: 388rpx; + top: 508rpx; left: 0; z-index: 1; width: 750rpx; @@ -33,7 +33,7 @@ align-items: center; .tabbar-click { flex: 1; - height: 160rpx; + height: 220rpx; } } } diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts index 2dc4419..0be0d8a 100644 --- a/src/pages/7/index.ts +++ b/src/pages/7/index.ts @@ -22,6 +22,11 @@ Page({ url: "/pages/4/index", }); }, + handleTabbar3() { + wx.navigateTo({ + url: "/pages/9/index", + }); + }, handleTabbar4() { wx.navigateTo({ url: "/pages/6/index", diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml index a09ba73..4983ccd 100644 --- a/src/pages/7/index.wxml +++ b/src/pages/7/index.wxml @@ -6,7 +6,7 @@ - + diff --git a/src/pages/9/index.json b/src/pages/9/index.json index a97367d..4cb6a9b 100644 --- a/src/pages/9/index.json +++ b/src/pages/9/index.json @@ -1,3 +1,6 @@ { - "usingComponents": {} + "usingComponents": { + "van-popup": "@vant/weapp/popup/index", + "van-icon": "@vant/weapp/icon/index" + } } diff --git a/src/pages/9/index.scss b/src/pages/9/index.scss index c505384..59a7f1f 100644 --- a/src/pages/9/index.scss +++ b/src/pages/9/index.scss @@ -1,18 +1,14 @@ .page { - width: 100%; -} -.float1 { - position: fixed; - z-index: 3; - bottom: 0; - left: 0; - width: 100%; + width: 100vw; + min-height: 3000rpx; + .page-img { + width: 100vw; + } } -.float2 { - position: fixed; - z-index: 3; - bottom: 0; - left: 0; - width: 100%; +.float1 { + display: block; + margin: 0 auto; + width: 670rpx; + height: 706rpx; } diff --git a/src/pages/9/index.ts b/src/pages/9/index.ts index fb4f20f..0e627d5 100644 --- a/src/pages/9/index.ts +++ b/src/pages/9/index.ts @@ -2,25 +2,41 @@ const _app = getApp(); Page({ data: { - float1: true, - float2: false, + current: 0, + float1: false, }, - onLoad() {}, - handleTap1() { + onLoad(options) { this.setData({ - float2: true, + current: Number(options.current), }); }, - handleFloat1() { + handlePage1() { + this.setData({ + current: 1, + }); + }, + hadnleFloat1() { + this.setData({ + float1: true, + }); + }, + handlePage2() { this.setData({ float1: false, + current: 2, }); }, - handleFloat2() { - wx.navigateTo({ - url: "/pages/10/index", + handlePage3() { + this.setData({ + current: 3, }); }, + handlePage4() { + wx.navigateBack(); + }, + handleBack() { + wx.navigateBack(); + }, }); export {}; diff --git a/src/pages/9/index.wxml b/src/pages/9/index.wxml index f35c423..6fe7705 100644 --- a/src/pages/9/index.wxml +++ b/src/pages/9/index.wxml @@ -1,4 +1,27 @@ - + + + + + + + + + + + + + + + + + - - + + + diff --git a/typings/index.d.ts b/typings/index.d.ts index 3ee60c8..2e30e41 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -2,7 +2,8 @@ interface IAppOption { globalData: { - userInfo?: WechatMiniprogram.UserInfo, - } - userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback, -} \ No newline at end of file + float1_1: null | string; + userInfo?: WechatMiniprogram.UserInfo; + }; + userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback; +}