diff --git a/src/components/navigation-bar/navigation-bar.wxml b/src/components/navigation-bar/navigation-bar.wxml index 5bdfd6e..4e54b7a 100644 --- a/src/components/navigation-bar/navigation-bar.wxml +++ b/src/components/navigation-bar/navigation-bar.wxml @@ -15,7 +15,7 @@ aria-role="button" aria-label="返回" > - + diff --git a/src/components/tabbar/tabbar.ts b/src/components/tabbar/tabbar.ts index 62a4756..3af2303 100644 --- a/src/components/tabbar/tabbar.ts +++ b/src/components/tabbar/tabbar.ts @@ -32,11 +32,13 @@ Component({ url: "/pages/2/index", }); }, - handleTabbar4() { - wx.reLaunch({ + handleTabbar3() { + wx.navigateTo({ url: "/pages/4/index", }); }, + handleTabbar4() { + }, handleTabbar5() { // wx.reLaunch({ // url: "/pages/6/index", diff --git a/src/components/tabbar/tabbar.wxml b/src/components/tabbar/tabbar.wxml index b6ec174..3b5a8bf 100644 --- a/src/components/tabbar/tabbar.wxml +++ b/src/components/tabbar/tabbar.wxml @@ -5,6 +5,8 @@ + + diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss index 0cdeb07..f3e13e1 100644 --- a/src/pages/1/index.scss +++ b/src/pages/1/index.scss @@ -7,43 +7,44 @@ left: 0; z-index: 1; width: 750rpx; - height: 260rpx; + height: 460rpx; background-color: transparent; } .page-click1 { position: absolute; - top: 523rpx; + top: 718rpx; left: 0; z-index: 1; - width: 750rpx; - height: 230rpx; + width: 42vw; + height: 240rpx; background-color: transparent; } .page-click2 { position: absolute; - top: 768rpx; - left: 0; + top: 718rpx; + left: 42vw; z-index: 1; - width: 33vw; + width: 42vw; height: 240rpx; background-color: transparent; } .page-click3 { position: absolute; - top: 768rpx; - left: 33vw; + top: 718rpx; + right: 0; z-index: 1; - width: 34vw; + width: 14vw; height: 240rpx; background-color: transparent; } + .page-click4 { position: absolute; - top: 768rpx; - right: 0; + top: 1003rpx; + left: 0; z-index: 1; - width: 33vw; - height: 240rpx; + width: 750rpx; + height: 290rpx; background-color: transparent; } diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts index bcd9f67..fa7504b 100644 --- a/src/pages/1/index.ts +++ b/src/pages/1/index.ts @@ -16,28 +16,28 @@ Page({ }); }, handelTap0() { - this.setData({ - float1: true, + wx.navigateTo({ + url: "/pages/4/index", }); }, handelTap1() { wx.navigateTo({ - url: "/pages/3/index", + url: "/pages/2/index", }); }, handelTap2() { wx.navigateTo({ - url: "/pages/7/index", + url: "/pages/3/index", }); }, handelTap3() { wx.navigateTo({ - url: "/pages/2/index", + url: "/pages/7/index", }); }, handelTap4() { - wx.navigateTo({ - url: "/pages/4/index", + this.setData({ + float1: true, }); }, handleFloat1() { diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml index 74d8c90..f9515d9 100644 --- a/src/pages/4/index.wxml +++ b/src/pages/4/index.wxml @@ -9,4 +9,3 @@ - diff --git a/src/pages/start/index.json b/src/pages/start/index.json index a97367d..410e8cb 100644 --- a/src/pages/start/index.json +++ b/src/pages/start/index.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "van-icon": "@vant/weapp/icon/index" + } } diff --git a/src/pages/start/index.scss b/src/pages/start/index.scss index fa3768d..d27508a 100644 --- a/src/pages/start/index.scss +++ b/src/pages/start/index.scss @@ -15,5 +15,14 @@ .btn { width: 690rpx; height: 109rpx; + background-color: #319588; + color: #fff; + border-radius: 90rpx; + display: flex; + align-items: center; + justify-content: center; + .arrow{ + margin-top: 8rpx; + } } } diff --git a/src/pages/start/index.wxml b/src/pages/start/index.wxml index 6c503d4..7ec9da5 100644 --- a/src/pages/start/index.wxml +++ b/src/pages/start/index.wxml @@ -1,4 +1,7 @@ - - + + + 立即加入 + +