diff --git a/src/components/navigation-bar/navigation-bar.json b/src/components/navigation-bar/navigation-bar.json
index 4a20f17..909a65d 100644
--- a/src/components/navigation-bar/navigation-bar.json
+++ b/src/components/navigation-bar/navigation-bar.json
@@ -1,5 +1,8 @@
{
"component": true,
"styleIsolation": "apply-shared",
- "usingComponents": {}
-}
\ No newline at end of file
+ "usingComponents": {
+ "van-nav-bar": "@vant/weapp/nav-bar/index"
+ }
+}
+
diff --git a/src/components/navigation-bar/navigation-bar.scss b/src/components/navigation-bar/navigation-bar.scss
index 22d565e..cb3994c 100644
--- a/src/components/navigation-bar/navigation-bar.scss
+++ b/src/components/navigation-bar/navigation-bar.scss
@@ -36,7 +36,7 @@
padding-left: var(--left);
display: flex;
flex-direction: row;
- align-items: flex-start;
+ align-items: center;
height: 100%;
box-sizing: border-box;
}
diff --git a/src/components/navigation-bar/navigation-bar.ts b/src/components/navigation-bar/navigation-bar.ts
index 4466e8e..106b9d3 100644
--- a/src/components/navigation-bar/navigation-bar.ts
+++ b/src/components/navigation-bar/navigation-bar.ts
@@ -67,7 +67,7 @@ Component({
this.setData({
ios: !isAndroid,
innerPaddingRight: `padding-right: ${res.windowWidth - rect.left}px`,
- leftWidth: `width: ${res.windowWidth - rect.left }px`,
+ leftWidth: `width: 60px`,
safeAreaTop: isDevtools || isAndroid ? `height: calc(var(--height) + ${res.safeArea.top}px); padding-top: ${res.safeArea.top}px` : ``
})
}
diff --git a/src/images/qs/1.png b/src/images/qs/1.png
index b9d1d81..f7d7b77 100644
Binary files a/src/images/qs/1.png and b/src/images/qs/1.png differ
diff --git a/src/images/qs/13.png b/src/images/qs/13.png
index e9c2f85..c75d420 100644
Binary files a/src/images/qs/13.png and b/src/images/qs/13.png differ
diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts
index 361564f..1e7d88a 100644
--- a/src/pages/1/index.ts
+++ b/src/pages/1/index.ts
@@ -11,11 +11,6 @@ Page({
float1: wx.getStorageSync("1float1") !== "1",
});
},
- handlePage() {
- wx.navigateTo({
- url: "/pages/5/index",
- });
- },
handelTap1() {
wx.navigateTo({
url: "/pages/2/index",
@@ -37,7 +32,7 @@ Page({
});
},
handleTabbar4() {
- wx.reLaunch({
+ wx.navigateTo({
url: "/pages/6/index",
});
},
diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml
index 0bdd06d..0b9091a 100644
--- a/src/pages/1/index.wxml
+++ b/src/pages/1/index.wxml
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml
index af62c5b..bba0dc9 100644
--- a/src/pages/2/index.wxml
+++ b/src/pages/2/index.wxml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
-
+
diff --git a/src/pages/3/index.scss b/src/pages/3/index.scss
index b691e80..bf6b6a6 100644
--- a/src/pages/3/index.scss
+++ b/src/pages/3/index.scss
@@ -3,7 +3,7 @@ page {
}
.page {
width: 100vw;
- min-height: 100vh;
+ min-height: 2200rpx;
padding-bottom: 150rpx;
.page-img {
width: 100vw;
diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml
index d2a3c3a..87bef71 100644
--- a/src/pages/3/index.wxml
+++ b/src/pages/3/index.wxml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
-
+
diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml
index ebc54c8..5409dbd 100644
--- a/src/pages/4/index.wxml
+++ b/src/pages/4/index.wxml
@@ -1,2 +1,2 @@
-
-
+
+
diff --git a/src/pages/5/index.ts b/src/pages/5/index.ts
index 49cc371..d0dcb6a 100644
--- a/src/pages/5/index.ts
+++ b/src/pages/5/index.ts
@@ -26,7 +26,7 @@ Page({
});
},
handleTabbar4() {
- wx.reLaunch({
+ wx.navigateTo({
url: "/pages/6/index",
});
},
diff --git a/src/pages/5/index.wxml b/src/pages/5/index.wxml
index 6e7e32d..a4493f3 100644
--- a/src/pages/5/index.wxml
+++ b/src/pages/5/index.wxml
@@ -1,20 +1,19 @@
-
-
+
-
+
-
+
-
+
diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml
index 1dc1e00..f1841e3 100644
--- a/src/pages/6/index.wxml
+++ b/src/pages/6/index.wxml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts
index 449273b..2dc4419 100644
--- a/src/pages/7/index.ts
+++ b/src/pages/7/index.ts
@@ -23,7 +23,7 @@ Page({
});
},
handleTabbar4() {
- wx.reLaunch({
+ wx.navigateTo({
url: "/pages/6/index",
});
},
diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml
index f19900b..a09ba73 100644
--- a/src/pages/7/index.wxml
+++ b/src/pages/7/index.wxml
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/src/pages/8/index.ts b/src/pages/8/index.ts
index 0b6a01d..51f282f 100644
--- a/src/pages/8/index.ts
+++ b/src/pages/8/index.ts
@@ -5,16 +5,6 @@ Page({
float1: false,
},
onLoad() {},
- handleTap1() {
- this.setData({
- float1: true,
- });
- },
- handleFloat1() {
- this.setData({
- float1: false,
- });
- },
});
export {};
diff --git a/src/pages/8/index.wxml b/src/pages/8/index.wxml
index b68107b..af85268 100644
--- a/src/pages/8/index.wxml
+++ b/src/pages/8/index.wxml
@@ -1,4 +1,2 @@
-
-
-
-
+
+
diff --git a/src/utils/page.ts b/src/utils/page.ts
index 4ae4789..5161138 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -53,14 +53,14 @@ function page(config: WechatMiniprogram.Page.Instance