diff --git a/project.config.json b/project.config.json
index 35556e3..8c149fc 100644
--- a/project.config.json
+++ b/project.config.json
@@ -51,27 +51,15 @@
"packOptions": {
"ignore": [
{
- "value": "/images/*.jpg",
+ "value": "/images/*",
"type": "glob"
},
{
- "value": "/images/**/*.jpg",
- "type": "glob"
- },
- {
- "value": "/images/*.png",
- "type": "glob"
- },
- {
- "value": "/images/**/*.png",
- "type": "glob"
- },
- {
- "value": "/images/**/*.gif",
+ "value": "/images/**/*",
"type": "glob"
}
],
"include": []
},
"appid": "wx10d27bb39a39ff0e"
-}
\ No newline at end of file
+}
diff --git a/src/app.json b/src/app.json
index e3212de..477c0e3 100644
--- a/src/app.json
+++ b/src/app.json
@@ -1,5 +1,6 @@
{
"pages": [
+ "pages/start/index",
"pages/1/index",
"pages/2/index",
"pages/3/index",
diff --git a/src/components/navigation-bar/navigation-bar.json b/src/components/navigation-bar/navigation-bar.json
index 4a20f17..817ff58 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-icon": "@vant/weapp/icon/index"
+ }
+}
+
diff --git a/src/components/navigation-bar/navigation-bar.wxml b/src/components/navigation-bar/navigation-bar.wxml
index be9a663..5bdfd6e 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.scss b/src/components/tabbar/tabbar.scss
index be3bd8e..0137b3d 100644
--- a/src/components/tabbar/tabbar.scss
+++ b/src/components/tabbar/tabbar.scss
@@ -5,6 +5,7 @@
z-index: 2;
width: 100vw;
.tabbar-img {
+ display: block;
width: 100%;
}
.tabbar-wrap {
diff --git a/src/components/tabbar/tabbar.ts b/src/components/tabbar/tabbar.ts
index 2e7f02b..62a4756 100644
--- a/src/components/tabbar/tabbar.ts
+++ b/src/components/tabbar/tabbar.ts
@@ -28,24 +28,19 @@ Component({
});
},
handleTabbar2() {
- wx.reLaunch({
- url: "/pages/4/index",
- });
- },
- handleTabbar3() {
wx.navigateTo({
- url: "/pages/7/index",
+ url: "/pages/2/index",
});
},
handleTabbar4() {
wx.reLaunch({
- url: "/pages/5/index",
+ url: "/pages/4/index",
});
},
handleTabbar5() {
- wx.reLaunch({
- url: "/pages/6/index",
- });
+ // wx.reLaunch({
+ // url: "/pages/6/index",
+ // });
},
},
});
diff --git a/src/components/tabbar/tabbar.wxml b/src/components/tabbar/tabbar.wxml
index a46e90b..b6ec174 100644
--- a/src/components/tabbar/tabbar.wxml
+++ b/src/components/tabbar/tabbar.wxml
@@ -1,12 +1,10 @@
-
+
-
-
diff --git a/src/pages/1/index.scss b/src/pages/1/index.scss
index 147935f..5da1aa3 100644
--- a/src/pages/1/index.scss
+++ b/src/pages/1/index.scss
@@ -3,20 +3,38 @@
}
.page-click1 {
position: absolute;
- top: 163rpx;
+ top: 223rpx;
left: 0;
z-index: 1;
width: 750rpx;
- height: 430rpx;
+ height: 530rpx;
background-color: transparent;
}
.page-click2 {
position: absolute;
- top: 600rpx;
+ top: 768rpx;
left: 0;
z-index: 1;
- width: 750rpx;
- height: 430rpx;
+ width: 33vw;
+ height: 240rpx;
+ background-color: transparent;
+}
+.page-click3 {
+ position: absolute;
+ top: 768rpx;
+ left: 33vw;
+ z-index: 1;
+ width: 34vw;
+ height: 240rpx;
+ background-color: transparent;
+}
+.page-click4 {
+ position: absolute;
+ top: 768rpx;
+ right: 0;
+ z-index: 1;
+ width: 33vw;
+ height: 240rpx;
background-color: transparent;
}
diff --git a/src/pages/1/index.ts b/src/pages/1/index.ts
index dab5fd1..bf26084 100644
--- a/src/pages/1/index.ts
+++ b/src/pages/1/index.ts
@@ -1,10 +1,13 @@
const app = getApp();
Page({
- data: {},
+ data: {
+ float1: true,
+ },
onLoad() {
this.setData({
start: app.globalData.start,
+ float1: app.globalData.float1,
});
},
onShow() {
@@ -14,19 +17,29 @@ Page({
},
handelTap1() {
wx.navigateTo({
- url: "/pages/2/index",
+ url: "/pages/3/index",
});
},
handelTap2() {
wx.navigateTo({
- url: "/pages/3/index",
+ url: "/pages/7/index",
+ });
+ },
+ handelTap3() {
+ wx.navigateTo({
+ url: "/pages/2/index",
+ });
+ },
+ handelTap4() {
+ wx.navigateTo({
+ url: "/pages/4/index",
});
},
handleFloat1() {
this.setData({
float1: false,
});
- wx.setStorageSync("1float1", "1");
+ app.globalData.float1 = false;
},
});
diff --git a/src/pages/1/index.wxml b/src/pages/1/index.wxml
index 3f2e9ab..7be65cb 100644
--- a/src/pages/1/index.wxml
+++ b/src/pages/1/index.wxml
@@ -1,6 +1,9 @@
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml
index 7826df9..0ed32eb 100644
--- a/src/pages/2/index.wxml
+++ b/src/pages/2/index.wxml
@@ -1,6 +1,6 @@
-
+
diff --git a/src/pages/3/index.scss b/src/pages/3/index.scss
index 0de862a..a7bd40f 100644
--- a/src/pages/3/index.scss
+++ b/src/pages/3/index.scss
@@ -1,15 +1,19 @@
.page {
width: 100vw;
-}
-
-.page-click1 {
- position: fixed;
- bottom: 0;
- left: 0;
- z-index: 1;
- width: 750rpx;
- height: 230rpx;
- background-color: transparent;
+ min-height: 200vh;
+ .page-img {
+ width: 100%;
+ height: 100%;
+ }
+ .swiper-click1 {
+ position: absolute;
+ top: 863rpx;
+ left: 0;
+ z-index: 1;
+ width: 750rpx;
+ height: 230rpx;
+ background-color: transparent;
+ }
}
.float1 {
diff --git a/src/pages/3/index.ts b/src/pages/3/index.ts
index d3f6da3..9eab615 100644
--- a/src/pages/3/index.ts
+++ b/src/pages/3/index.ts
@@ -2,20 +2,36 @@ const _app = getApp();
Page({
data: {
+ current: 0,
+ page1: true,
+ page2: false,
+ page3: false,
+ page4: false,
+
float1: false,
},
onLoad() {},
handlePage1() {
- wx.navigateBack();
+ this.setData({
+ current: 1,
+ });
},
- handelTap1() {
+ handlePage2() {
this.setData({
- float1: true,
+ current: 2,
});
},
- handleFloat1() {
+ handlePage3() {
+ this.setData({
+ current: 3,
+ });
+ },
+ handlePage4() {
+ wx.navigateBack();
+ },
+ handelTap1() {
this.setData({
- float1: false,
+ current: 0,
});
},
});
diff --git a/src/pages/3/index.wxml b/src/pages/3/index.wxml
index d644b81..1bc2385 100644
--- a/src/pages/3/index.wxml
+++ b/src/pages/3/index.wxml
@@ -1,6 +1,36 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/4/index.scss b/src/pages/4/index.scss
index cc9825a..8675887 100644
--- a/src/pages/4/index.scss
+++ b/src/pages/4/index.scss
@@ -1,12 +1,16 @@
.page {
width: 100vw;
+ min-height: 120vh;
+ .page-img{
+ width: 100%;
+ height: 100%;
+ }
}
-.page-click {
+
+.float1 {
position: fixed;
- top: 440rpx;
+ bottom: 0;
left: 0;
- z-index: 1;
- width: 750rpx;
- height: 200rpx;
- background-color: transparent;
+ z-index: 3;
+ width: 100vw;
}
diff --git a/src/pages/4/index.ts b/src/pages/4/index.ts
index 71146ef..3df07d0 100644
--- a/src/pages/4/index.ts
+++ b/src/pages/4/index.ts
@@ -1,15 +1,26 @@
+const app = getApp();
+
Page({
- data: {},
- onLoad() {},
+ data: {
+ current: 0,
+ page1: true,
+ page2: false,
+ page3: false,
+ page4: false,
- handleTap1() {
- wx.navigateTo({
- url: "/pages/5/index",
+ float1: false,
+ },
+ onLoad() {
+ app.globalData.start = 1;
+ },
+ handlePage1() {
+ this.setData({
+ float1: true,
});
},
- handleTap2() {
- wx.navigateTo({
- url: "/pages/6/index",
+ handleFloat1() {
+ this.setData({
+ float1: false,
});
},
});
diff --git a/src/pages/4/index.wxml b/src/pages/4/index.wxml
index 767a3e1..74d8c90 100644
--- a/src/pages/4/index.wxml
+++ b/src/pages/4/index.wxml
@@ -1,4 +1,12 @@
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/7/index.scss b/src/pages/7/index.scss
index b64135c..ea2453c 100644
--- a/src/pages/7/index.scss
+++ b/src/pages/7/index.scss
@@ -5,6 +5,15 @@
width: 100%;
height: 100%;
}
+ .swiper-click1 {
+ position: absolute;
+ top: 743rpx;
+ left: 0;
+ z-index: 1;
+ width: 750rpx;
+ height: 230rpx;
+ background-color: transparent;
+ }
}
.float1 {
diff --git a/src/pages/7/index.ts b/src/pages/7/index.ts
index 16610a9..9eab615 100644
--- a/src/pages/7/index.ts
+++ b/src/pages/7/index.ts
@@ -18,18 +18,22 @@ Page({
},
handlePage2() {
this.setData({
- float1: true,
+ current: 2,
});
},
- handleFloat1() {
+ handlePage3() {
this.setData({
- current: 2,
- float1: false,
+ current: 3,
});
},
handlePage4() {
wx.navigateBack();
},
+ handelTap1() {
+ this.setData({
+ current: 0,
+ });
+ },
});
export {};
diff --git a/src/pages/7/index.wxml b/src/pages/7/index.wxml
index 2cba032..cb184c7 100644
--- a/src/pages/7/index.wxml
+++ b/src/pages/7/index.wxml
@@ -1,14 +1,16 @@
-
+
-
+
-
+
+
+
+
+
-
-
diff --git a/src/pages/start/index.json b/src/pages/start/index.json
new file mode 100644
index 0000000..a97367d
--- /dev/null
+++ b/src/pages/start/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
diff --git a/src/pages/start/index.scss b/src/pages/start/index.scss
new file mode 100644
index 0000000..fa3768d
--- /dev/null
+++ b/src/pages/start/index.scss
@@ -0,0 +1,19 @@
+.page {
+ width: 100vw;
+}
+
+.footer {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 20rpx 0 60rpx;
+ background-color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ .btn {
+ width: 690rpx;
+ height: 109rpx;
+ }
+}
diff --git a/src/pages/start/index.ts b/src/pages/start/index.ts
new file mode 100644
index 0000000..5cf134c
--- /dev/null
+++ b/src/pages/start/index.ts
@@ -0,0 +1,13 @@
+const _app = getApp();
+
+Page({
+ data: {},
+ onLoad() {},
+ handlePage1() {
+ wx.navigateTo({
+ url: "/pages/1/index",
+ });
+ },
+});
+
+export {};
diff --git a/src/pages/start/index.wxml b/src/pages/start/index.wxml
new file mode 100644
index 0000000..6c503d4
--- /dev/null
+++ b/src/pages/start/index.wxml
@@ -0,0 +1,4 @@
+
+