nn class

src/app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/0/index",
     "pages/1/index",
     "pages/2/index",
     "pages/3/index",

src/pages/0/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}

src/pages/0/index.scss

@@ -0,0 +1,23 @@
+.page {
+  width: 100vw;
+  min-height: 3000rpx;
+  .page-img {
+    width: 100vw;
+  }
+  .page-click1 {
+    position: absolute;
+    top: 248rpx;
+    right: 72rpx;
+    z-index: 2;
+    width: 64rpx;
+    height: 64rpx;
+    background-color: transparent;
+  }
+}
+
+.float1 {
+  display: block;
+  margin: 0 auto;
+  width: 670rpx;
+  height: 706rpx;
+}

src/pages/0/index.ts

@@ -0,0 +1,25 @@
+const _app = getApp<IAppOption>();
+
+Page({
+  data: {
+    current: 0,
+    float1: false,
+  },
+  onLoad(options) {
+    this.setData({
+      current: Number(options.current),
+    });
+  },
+  handlePage1() {
+    this.setData({
+      current: 1,
+    });
+  },
+  handlePage2() {
+    wx.navigateTo({
+      url: "/pages/1/index",
+    });
+  },
+});
+
+export {};

src/pages/0/index.wxml

@@ -0,0 +1,13 @@
+<!-- <navigation-bar back="{{false}}"> -->
+<!--   <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" /> -->
+<!-- </navigation-bar> -->
+
+<swiper class="page" current="{{current}}">
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/2.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/1.png?t={{Timestamp}}"></image>
+  </swiper-item>
+</swiper>
+

src/pages/1/index.scss

@@ -4,51 +4,89 @@
 }
 .page-click1 {
   position: absolute;
-  top: 836rpx;
+  top: 206rpx;
   left: 0;
   z-index: 1;
-  width: 50vw;
+  width: 100vw;
-  height: 336rpx;
+  height: 700rpx;
   background-color: transparent;
+  // background-color: #000;
 }
 
 .page-click2 {
   position: absolute;
-  top: 836rpx;
+  top: 886rpx;
-  right: 0;
+  left: 0;
   z-index: 1;
-  width: 50vw;
+  width: 100vw;
-  height: 336rpx;
+  height: 306rpx;
   background-color: transparent;
 }
+
 .page-click3 {
   position: absolute;
-  top: 1190rpx;
+  top: 1200rpx;
   left: 0;
   z-index: 1;
-  width: 50vw;
+  width: 100vw;
-  height: 220rpx;
+  height: 400rpx;
   background-color: transparent;
+  // background-color: #000;
 }
 
 .page-click4 {
   position: absolute;
-  top: 388rpx;
+  top: 1600rpx;
-  right: 72rpx;
+  left: 0;
-  z-index: 2;
+  z-index: 1;
-  width: 64rpx;
+  width: 100vw;
-  height: 64rpx;
+  height: 550rpx;
   background-color: transparent;
+  // background-color: #000;
 }
 
 .page-click5 {
   position: absolute;
-  top: 356rpx;
+  top: 2150rpx;
-  right: 0;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 850rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click6 {
+  position: absolute;
+  top: 3032rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 416rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click7 {
+  position: absolute;
+  top: 3512rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 325rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click8 {
+  position: absolute;
+  top: 3883rpx;
+  left: 0;
   z-index: 1;
   width: 100vw;
-  height: 302rpx;
+  height: 281rpx;
   background-color: transparent;
+  // background-color: #000;
 }
 
 .tabbar {

src/pages/1/index.ts

@@ -1,77 +1,57 @@
 const app = getApp<IAppOption>();
 
 Page({
-  data: {
+  data: {},
-    float1: false,
+  onShow() {},
-  },
-  onShow() {
-    this.setData({
-      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",
+      url: "/pages/9/index",
     });
-    this.handleHideFloat1()
   },
   handelTap5() {
     wx.navigateTo({
-      url: "/pages/9/index",
+      url: "/pages/10/index",
     });
-    this.handleHideFloat1()
   },
+  handelTap6() {
+    wx.navigateTo({
+      url: "/pages/11/index",
+    });
+  },
+  // handleTabbar1() {
+  //   wx.reLaunch({
+  //     url: "/pages/1/index",
+  //   });
+  // },
   handleTabbar2() {
     wx.reLaunch({
       url: "/pages/5/index",
     });
-    this.handleHideFloat1()
   },
   handleTabbar3() {
-    wx.navigateTo({
+    wx.redirectTo({
-      url: "/pages/9/index",
+      url: "/pages/8/index",
     });
-    this.handleHideFloat1()
   },
   handleTabbar4() {
-    wx.navigateTo({
+    wx.redirectTo({
-      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";
   },
 });
 

src/pages/1/index.wxml

@@ -1,26 +1,21 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}qs/1.png?t={{Timestamp}}"></image>
+<image class="page" mode="widthFix" src="{{imageUrl}}class/7.jpg?t={{Timestamp}}"></image>
 <view class="page-click1" catch:tap="handelTap1"></view>
 <view class="page-click2" catch:tap="handelTap2"></view>
 <view class="page-click3" catch:tap="handelTap3"></view>
 <view class="page-click4" catch:tap="handelTap4"></view>
 <view class="page-click5" catch:tap="handelTap5"></view>
+<view class="page-click6" catch:tap="handelTap4"></view>
+<view class="page-click7" catch:tap="handelTap5"></view>
+<view class="page-click8" catch:tap="handelTap6"></view>
 
 <view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}qs/tabbar1.png?t={{Timestamp}}"></image>
+  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}class/tabbar1.png?t={{Timestamp}}"></image>
   <view class="tabbar-wrap">
     <view class="tabbar-click"></view>
     <view class="tabbar-click" catch:tap="handleTabbar2"></view>
     <view class="tabbar-click" catch:tap="handleTabbar3"></view>
     <view class="tabbar-click" catch:tap="handleTabbar4"></view>
-    <view class="tabbar-click" catch:tap="handleTabbar5"></view>
   </view>
 </view>
 
-<image
-  wx:if="{{float1}}"
-  class="float1"
-  mode="widthFix"
-  src="{{imageUrl}}qs/tabbar-tip.png?t={{Timestamp}}"
-  bind:tap="handleFloat1"
-></image>
 

src/pages/10/index.ts

@@ -4,9 +4,7 @@ Page({
   data: {},
   onLoad() {},
   handleTap1() {
-    wx.navigateTo({
+    wx.navigateBack()
-      url: "/pages/11/index",
-    });
   },
 });
 

src/pages/10/index.wxml

@@ -1 +1 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}18.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<image class="page" mode="widthFix" src="{{imageUrl}}class/24.png?t={{Timestamp}}" bind:tap="handleTap1"></image>

src/pages/11/index.ts

@@ -3,30 +3,8 @@ const _app = getApp<IAppOption>();
 Page({
   data: {},
   onLoad() {},
-  handelTap1() {
+  handlePage1() {
-    wx.navigateTo({
+    wx.navigateBack()
-      url: "/pages/14/index",
-    });
-  },
-  handelTap2() {
-    wx.navigateTo({
-      url: "/pages/12/index",
-    });
-  },
-  handelTap3() {
-    wx.navigateTo({
-      url: "/pages/25/index",
-    });
-  },
-  handleTabbar2() {
-    wx.reLaunch({
-      url: "/pages/17/index",
-    });
-  },
-  handleTabbar3() {
-    wx.reLaunch({
-      url: "/pages/22/index",
-    });
   },
 });
 

src/pages/11/index.wxml

@@ -1,15 +1 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}20.png?t={{Timestamp}}"></image>
+<image class="page" bind:tap="handlePage1" mode="widthFix" src="{{imageUrl}}class/25.png?t={{Timestamp}}"></image>
-<view class="page-click1" bind:tap="handelTap1"></view>
-<view class="page-click2" bind:tap="handelTap2"></view>
-<view class="page-click3" bind:tap="handelTap3"></view>
-
-<view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}tabbar2-1.png?t={{Timestamp}}"></image>
-  <view class="tabbar-wrap">
-    <view class="tabbar-click"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar2"></view>
-    <view class="tabbar-click" bind:tap="handleTabbar3"></view>
-  </view>
-</view>
-
-<image wx:if="{{float1}}" class="float1" mode="widthFix" src="{{imageUrl}}9.png?t={{Timestamp}}" bind:tap="handleFloat1"></image>

src/pages/2/index.scss

@@ -3,7 +3,7 @@ page {
 }
 .page {
   width: 100vw;
-  min-height: 100vh;
+  min-height: 2400rpx;
   padding-bottom: 150rpx;
   .page-img {
     width: 100vw;

src/pages/2/index.ts

@@ -21,14 +21,6 @@ Page({
     });
   },
   handlePage4() {
-    this.setData({
-      current: 4,
-    });
-  },
-  handlePage5() {
-    wx.navigateBack();
-  },
-  handleBack() {
     wx.navigateBack();
   },
 });

src/pages/2/index.wxml

@@ -3,18 +3,15 @@
 </navigation-bar>
 <swiper class="page" current="{{current}}">
   <swiper-item class="swiper-item1">
-    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/2.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/6.png?t={{Timestamp}}"></image>
   </swiper-item>
   <swiper-item>
-    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}qs/3.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/4.png?t={{Timestamp}}"></image>
   </swiper-item>
   <swiper-item>
-    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}qs/4.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}class/3.png?t={{Timestamp}}"></image>
   </swiper-item>
   <swiper-item>
-    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}qs/15.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}class/5.png?t={{Timestamp}}"></image>
-  </swiper-item>
-  <swiper-item>
-    <image bind:tap="handlePage5" class="page-img" mode="widthFix" src="{{imageUrl}}qs/17.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>

src/pages/3/index.json

@@ -1,3 +1,6 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
+    "van-icon": "@vant/weapp/icon/index"
+  }
 }

src/pages/3/index.scss

@@ -1,38 +1,23 @@
-page {
-  padding-bottom: 100rpx;
-}
 .page {
   width: 100vw;
-  min-height: 2200rpx;
+  min-height: 3000rpx;
-  padding-bottom: 150rpx;
   .page-img {
     width: 100vw;
   }
-}
+  .page-click1 {
-
-.tabbar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
-  width: 100vw;
-  padding-bottom: 20rpx;
-  background-color: #fff;
-  .tabbar-img {
-    width: 100%;
-  }
-  .tabbar-wrap {
     position: absolute;
-    top: 0;
+    top: 248rpx;
-    left: 0;
+    right: 72rpx;
-    width: 100%;
+    z-index: 2;
-    height: 100%;
+    width: 64rpx;
-    display: flex;
+    height: 64rpx;
-    justify-content: space-between;
+    background-color: transparent;
-    align-items: center;
-    .tabbar-click {
-      flex: 1;
-      height: 160rpx;
   }
 }
+
+.float1 {
+  display: block;
+  margin: 0 auto;
+  width: 670rpx;
+  height: 706rpx;
 }

src/pages/3/index.ts

@@ -3,30 +3,12 @@ const _app = getApp<IAppOption>();
 Page({
   data: {
     current: 0,
+    float1: false,
   },
-  onLoad() {},
+  onLoad(options) {
-  handlePage1() {
-    this.setData({
-      current: 1,
-    });
-  },
-  handlePage2() {
-    this.setData({
-      current: 2,
-    });
-  },
-  handlePage3() {
-    wx.navigateBack();
   },
-  handleTabbar1() {
+  handlePage1() {
-    wx.reLaunch({
+    wx.navigateBack()
-      url: "/pages/11/index",
-    });
-  },
-  handleTabbar3() {
-    wx.reLaunch({
-      url: "/pages/22/index",
-    });
   },
 });
 

src/pages/3/index.wxml

@@ -1,12 +1,10 @@
-<navigation-bar title="PASI 评测"></navigation-bar>
+<!-- <navigation-bar back="{{false}}"> -->
+<!--   <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" /> -->
+<!-- </navigation-bar> -->
+
 <swiper class="page" current="{{current}}">
   <swiper-item class="swiper-item1">
-    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/5.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/19.png?t={{Timestamp}}"></image>
-  </swiper-item>
-  <swiper-item>
-    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}qs/6.png?t={{Timestamp}}"></image>
-  </swiper-item>
-  <swiper-item>
-    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}qs/7.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>
+

src/pages/4/index.scss

@@ -1,20 +1,20 @@
+page {
+  padding-bottom: 100rpx;
+}
 .page {
   width: 100vw;
+  min-height: 100vh;
+  padding-bottom: 150rpx;
+  .page-img {
+    width: 100vw;
   }
-.page-click {
-  position: fixed;
-  top: 440rpx;
-  left: 0;
-  z-index: 1;
-  width: 750rpx;
-  height: 200rpx;
-  background-color: transparent;
 }
 
 .tabbar {
   position: fixed;
   bottom: 0;
   left: 0;
+  z-index: 2;
   width: 100vw;
   padding-bottom: 20rpx;
   background-color: #fff;
@@ -36,4 +36,3 @@
     }
   }
 }
-

src/pages/4/index.ts

@@ -1,13 +1,16 @@
 const _app = getApp<IAppOption>();
 
 Page({
-  data: {},
+  data: {
+    current: 0,
+  },
   onLoad() {},
-
+  handlePage1() {
-  handleTap1() {
+    this.setData({
-    wx.navigateBack();
+      current: 1,
+    });
   },
-  handleBack() {
+  handlePage2() {
     wx.navigateBack();
   },
 });

src/pages/4/index.wxml

@@ -1,4 +1,11 @@
-<navigation-bar back="{{false}}">
+<navigation-bar back="{{current<4}}">
   <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
 </navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}qs/8.png?t={{Timestamp}}" bind:tap="handleTap1"></image>
+<swiper class="page" current="{{current}}">
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/23.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/20.png?t={{Timestamp}}"></image>
+  </swiper-item>
+</swiper>

src/pages/5/index.scss

@@ -3,7 +3,7 @@ page {
 }
 .page {
   width: 100vw;
-  min-height: 100vh;
+  min-height: 2000rpx;
   padding-bottom: 150rpx;
   .page-img {
     width: 100vw;
@@ -11,12 +11,13 @@ page {
 }
 .page-click1 {
   position: absolute;
-  top: 176rpx;
+  top: 406rpx;
-  right: 0;
+  left: 0;
   z-index: 1;
-  width: 50vw;
+  width: 100vw;
-  height: 96rpx;
+  height: 1200rpx;
   background-color: transparent;
+  // background-color: #000;
 }
 
 .tabbar {

src/pages/5/index.ts

@@ -12,12 +12,13 @@ Page({
   },
   handlePage2() {
     this.setData({
-      current: 2,
+      current: 0,
     });
   },
+
   handelTap1() {
     wx.navigateTo({
-      url: "/pages/4/index",
+      url: "/pages/6/index",
     });
   },
   handleTabbar1() {
@@ -26,17 +27,12 @@ Page({
     });
   },
   handleTabbar3() {
-    wx.navigateTo({
+    wx.redirectTo({
-      url: "/pages/9/index",
+      url: "/pages/8/index",
     });
   },
   handleTabbar4() {
-    wx.navigateTo({
+    wx.redirectTo({
-      url: "/pages/6/index",
-    });
-  },
-  handleTabbar5() {
-    wx.reLaunch({
       url: "/pages/7/index",
     });
   },

src/pages/5/index.wxml

@@ -1,24 +1,21 @@
 <swiper class="page" current="{{current}}">
   <swiper-item class="swiper-item1">
-    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/9.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/26.png?t={{Timestamp}}"></image>
-  </swiper-item>
+    <view class="page-click1" catch:tap="handelTap1"></view>
-  <swiper-item>
-    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}qs/10.png?t={{Timestamp}}"></image>
   </swiper-item>
   <swiper-item>
-    <image class="page-img" mode="widthFix" src="{{imageUrl}}qs/11.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/27.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>
 
 <view class="page-click1" catch:tap="handelTap1"></view>
 
 <view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}qs/tabbar2.png?t={{Timestamp}}"></image>
+  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}class/tabbar2.png?t={{Timestamp}}"></image>
   <view class="tabbar-wrap">
     <view class="tabbar-click" catch:tap="handleTabbar1"></view>
     <view class="tabbar-click"></view>
     <view class="tabbar-click" catch:tap="handleTabbar3"></view>
     <view class="tabbar-click" catch:tap="handleTabbar4"></view>
-    <view class="tabbar-click" catch:tap="handleTabbar5"></view>
   </view>
 </view>

src/pages/6/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index",
     "van-icon": "@vant/weapp/icon/index"
   }
 }

src/pages/6/index.scss

@@ -1,31 +1,23 @@
 .page {
   width: 100vw;
-  margin-bottom: 80px;
+  min-height: 3500rpx;
-}
+  .page-img {
-
-.tabbar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: 2;
     width: 100vw;
-  padding-bottom: 20rpx;
-  background-color: #fff;
-  .tabbar-img {
-    width: 100%;
   }
-  .tabbar-wrap {
+  .page-click1 {
     position: absolute;
-    top: 0;
+    top: 248rpx;
-    left: 0;
+    right: 72rpx;
-    width: 100%;
+    z-index: 2;
-    height: 100%;
+    width: 64rpx;
-    display: flex;
+    height: 64rpx;
-    justify-content: space-between;
+    background-color: transparent;
-    align-items: center;
-    .tabbar-click {
-      flex: 1;
-      height: 160rpx;
   }
 }
+
+.float1 {
+  display: block;
+  margin: 0 auto;
+  width: 670rpx;
+  height: 706rpx;
 }

src/pages/6/index.ts

@@ -1,23 +1,43 @@
 const _app = getApp<IAppOption>();
 
 Page({
-  data: {},
+  data: {
-  onLoad() {},
+    current: 0,
-  handleTabbar1() {
+    float1: false,
-    wx.reLaunch({
+  },
-      url: "/pages/1/index",
+  onLoad(options) {
+    this.setData({
+      current: Number(options.current),
+    });
+  },
+  handlePage1() {
+    this.setData({
+      current: 1,
+    });
+  },
+  handlePage2() {
+    this.setData({
+      current: 2,
     });
   },
-  handleTabbar2() {
+  handlePage3() {
-    wx.reLaunch({
+    this.setData({
-      url: "/pages/5/index",
+      current: 3,
     });
   },
-  handleTabbar5() {
+  handlePage4() {
-    wx.reLaunch({
+    this.setData({
-      url: "/pages/7/index",
+      current: 4,
     });
   },
+  handlePage5() {
+    this.setData({
+      current: 5,
+    });
+  },
+  handlePage6() {
+    wx.navigateBack();
+  },
   handleBack() {
     wx.navigateBack();
   },

src/pages/6/index.wxml

@@ -1,4 +1,25 @@
 <navigation-bar back="{{false}}">
   <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
 </navigation-bar>
-<image class="page" mode="widthFix" src="{{imageUrl}}qs/12.png?t={{Timestamp}}"></image>
+
+<swiper class="page" current="{{current}}">
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/17.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/11.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}class/16.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}class/15.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage5" class="page-img" mode="widthFix" src="{{imageUrl}}class/12.png?t={{Timestamp}}"></image>
+  </swiper-item>
+  <swiper-item class="swiper-item1">
+    <image bind:tap="handlePage6" class="page-img" mode="widthFix" src="{{imageUrl}}class/14.png?t={{Timestamp}}"></image>
+  </swiper-item>
+</swiper>
+

src/pages/7/index.ts

@@ -18,18 +18,13 @@ Page({
     });
   },
   handleTabbar2() {
-    wx.navigateTo({
+    wx.reLaunch({
       url: "/pages/5/index",
     });
   },
   handleTabbar3() {
-    wx.navigateTo({
+    wx.redirectTo({
-      url: "/pages/9/index",
+      url: "/pages/8/index",
-    });
-  },
-  handleTabbar4() {
-    wx.navigateTo({
-      url: "/pages/6/index",
     });
   },
 });

src/pages/7/index.wxml

@@ -1,21 +1,11 @@
-<image class="page" mode="widthFix" src="{{imageUrl}}qs/13.png?t={{Timestamp}}"></image>
+<image class="page" mode="widthFix" src="{{imageUrl}}class/28.png?t={{Timestamp}}"></image>
-<view class="page-click1" bind:tap="handelTap1"></view>
 
 <view class="tabbar">
-  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}qs/tabbar4.png?t={{Timestamp}}"></image>
+  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}class/tabbar4.png?t={{Timestamp}}"></image>
   <view class="tabbar-wrap">
     <view class="tabbar-click" catch:tap="handleTabbar1"></view>
-    <view class="tabbar-click" catch:tap="handleTabbar2"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar1"></view>
     <view class="tabbar-click" catch:tap="handleTabbar3"></view>
-    <view class="tabbar-click" catch:tap="handleTabbar4"></view>
     <view class="tabbar-click"></view>
   </view>
 </view>
-
-<image
-  wx:if="{{float1}}"
-  class="float1"
-  mode="widthFix"
-  src="{{imageUrl}}12.png?t={{Timestamp}}"
-  bind:tap="handleFloat1"
-></image>

src/pages/8/index.scss

@@ -1,10 +1,127 @@
 .page {
-  width: 100%;
+  width: 100vw;
+  margin-bottom: 80px;
 }
-.float1 {
+.page-click1 {
+  position: absolute;
+  top: 206rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 700rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click2 {
+  position: absolute;
+  top: 886rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 306rpx;
+  background-color: transparent;
+}
+
+.page-click3 {
+  position: absolute;
+  top: 1200rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 400rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click4 {
+  position: absolute;
+  top: 1600rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 550rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click5 {
+  position: absolute;
+  top: 2150rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 850rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click6 {
+  position: absolute;
+  top: 3032rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 416rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click7 {
+  position: absolute;
+  top: 3512rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 325rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.page-click8 {
+  position: absolute;
+  top: 3883rpx;
+  left: 0;
+  z-index: 1;
+  width: 100vw;
+  height: 281rpx;
+  background-color: transparent;
+  // background-color: #000;
+}
+
+.tabbar {
   position: fixed;
   bottom: 0;
   left: 0;
+  z-index: 2;
   width: 100vw;
-  z-index: 1;
+  padding-bottom: 20rpx;
+  background-color: #fff;
+  .tabbar-img {
+    width: 100%;
+  }
+  .tabbar-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .tabbar-click {
+      flex: 1;
+      height: 220rpx;
+    }
+  }
+}
+
+.float1 {
+  position: fixed;
+  z-index: 3;
+  bottom: 248rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 256rpx;
+  height: 122rpx;
 }

src/pages/8/index.ts

@@ -1,12 +1,54 @@
-const _app = getApp<IAppOption>();
+const app = getApp<IAppOption>();
 
 Page({
   data: {
-    float1: false,
   },
-  onLoad() {},
+  onShow() {
-  handlePage1() {
+  },
-    wx.navigateBack()
+  handelTap1() {
+    wx.navigateTo({
+      url: "/pages/2/index",
+    });
+  },
+  handelTap2() {
+    wx.navigateTo({
+      url: "/pages/3/index",
+    });
+  },
+  handelTap3() {
+    wx.navigateTo({
+      url: "/pages/4/index",
+    });
+  },
+  handelTap4() {
+    wx.navigateTo({
+      url: "/pages/9/index",
+    });
+  },
+  handelTap5() {
+    wx.navigateTo({
+      url: "/pages/10/index",
+    });
+  },
+  handelTap6() {
+    wx.navigateTo({
+      url: "/pages/11/index",
+    });
+  },
+  handleTabbar1() {
+    wx.reLaunch({
+      url: "/pages/1/index",
+    });
+  },
+  handleTabbar2() {
+    wx.reLaunch({
+      url: "/pages/5/index",
+    });
+  },
+  handleTabbar4() {
+    wx.redirectTo({
+      url: "/pages/7/index",
+    });
   },
 });
 

src/pages/8/index.wxml

@@ -1,2 +1,13 @@
-<navigation-bar title="我的健康报告"></navigation-bar>
+<image class="page" mode="widthFix" src="{{imageUrl}}class/8.png?t={{Timestamp}}"></image>
-<image class="page" bind:tap="handlePage1" mode="widthFix" src="{{imageUrl}}qs/14.png?t={{Timestamp}}"></image>
+
+<view class="tabbar">
+  <image class="tabbar-img" mode="widthFix" src="{{imageUrl}}class/tabbar3.png?t={{Timestamp}}"></image>
+  <view class="tabbar-wrap">
+    <view class="tabbar-click" catch:tap="handleTabbar1"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar2"></view>
+    <view class="tabbar-click"></view>
+    <view class="tabbar-click" catch:tap="handleTabbar4"></view>
+  </view>
+</view>
+
+

src/pages/9/index.json

@@ -1,6 +1,5 @@
 {
   "usingComponents": {
-    "van-popup": "@vant/weapp/popup/index",
     "van-icon": "@vant/weapp/icon/index"
   }
 }

src/pages/9/index.scss

@@ -1,23 +1,38 @@
+page {
+  padding-bottom: 100rpx;
+}
 .page {
   width: 100vw;
-  min-height: 3000rpx;
+  min-height: 100vh;
+  padding-bottom: 150rpx;
   .page-img {
     width: 100vw;
   }
-  .page-click1 {
+}
-    position: absolute;
+
-    top: 248rpx;
+.tabbar {
-    right: 72rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0;
   z-index: 2;
-    width: 64rpx;
+  width: 100vw;
-    height: 64rpx;
+  padding-bottom: 20rpx;
-    background-color: transparent;
+  background-color: #fff;
+  .tabbar-img {
+    width: 100%;
+  }
+  .tabbar-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .tabbar-click {
+      flex: 1;
+      height: 160rpx;
     }
   }
-
-.float1 {
-  display: block;
-  margin: 0 auto;
-  width: 670rpx;
-  height: 706rpx;
 }

src/pages/9/index.ts

@@ -3,43 +3,14 @@ const _app = getApp<IAppOption>();
 Page({
   data: {
     current: 0,
-    float1: false,
-  },
-  onLoad(options) {
-    this.setData({
-      current: Number(options.current),
-    });
   },
+  onLoad() {},
   handlePage1() {
     this.setData({
       current: 1,
     });
   },
-  hadnleFloat1() {
-    this.setData({
-      float1: true,
-    });
-  },
   handlePage2() {
-    this.setData({
-      float1: false,
-      current: 2,
-    });
-  },
-  handlePage3() {
-    this.setData({
-      current: 3,
-    });
-  },
-  handlePage4() {
-    wx.navigateBack();
-  },
-  handelTap1() {
-    this.setData({
-      current: 3,
-    });
-  },
-  handleBack() {
     wx.navigateBack();
   },
 });

src/pages/9/index.wxml

@@ -1,28 +1,11 @@
-<navigation-bar back="{{false}}">
+<navigation-bar back="{{current<4}}">
   <van-icon slot="left" size="24" name="cross" bind:tap="handleBack" />
 </navigation-bar>
 <swiper class="page" current="{{current}}">
   <swiper-item class="swiper-item1">
-    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/18.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}class/22.png?t={{Timestamp}}"></image>
   </swiper-item>
   <swiper-item>
-    <image bind:tap="hadnleFloat1" class="page-img" mode="widthFix" src="{{imageUrl}}qs/19.png?t={{Timestamp}}"></image>
+    <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}class/21.png?t={{Timestamp}}"></image>
-    <view class="page-click1" catch:tap="handelTap1"></view>
-  </swiper-item>
-  <swiper-item>
-    <image bind:tap="handlePage3" class="page-img" mode="widthFix" src="{{imageUrl}}qs/21.png?t={{Timestamp}}"></image>
-  </swiper-item>
-  <swiper-item>
-    <image bind:tap="handlePage4" class="page-img" mode="widthFix" src="{{imageUrl}}qs/22.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>
-
-<van-popup
-  show="{{ float1 }}"
-  position="bottom"
-  bind:close="handlePage2"
-  custom-style="background:transparent"
-  safe-area-inset-bottom="{{false}}"
->
-  <image bind:tap="handlePage2" class="float1" mode="widthFix" src="{{imageUrl}}qs/20.png?t={{Timestamp}}"></image>
-</van-popup>