update

src/pages/17/index.scss

@@ -1,5 +1,6 @@
 .page {
   width: 100vw;
+  padding-bottom: 100rpx;
 }
 .page-click1 {
   position: absolute;

src/pages/18/index.scss

@@ -2,6 +2,10 @@
   width: 100vw;
   min-height: 100vh;
   padding-bottom: 150rpx;
+  .swiper-item1 {
+    height: 100vh;
+    overflow-y: scroll;
+  }
   .page-img {
     width: 100vw;
   }

src/pages/18/index.ts

@@ -5,24 +5,19 @@ Page({
     current: 0,
   },
   onLoad() {},
-  handleTap1() {
-    if (this.data.current <= 0) {
-      wx.navigateBack();
-      return;
-    }
+  handlePage1() {
     this.setData({
-      current: this.data.current - 1,
+      current: 1,
     });
   },
-  handleTap2() {
-    if (this.data.current >= 2) {
-      wx.navigateTo({
-        url: "/pages/7/index",
+  handlePage2() {
+    this.setData({
+      current: 2,
     });
-      return;
-    }
+  },
+  handlePage3() {
     this.setData({
-      current: this.data.current + 1,
+      current: 0,
     });
   },
 });

src/pages/18/index.wxml

@@ -1,13 +1,13 @@
 <navigation-bar></navigation-bar>
 
 <swiper class="page" model:current="{{current}}">
-  <swiper-item class="swiper-item1">
+  <swiper-item class="swiper-item1" bind:tap="handlePage1">
     <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}md/22.png?t={{Timestamp}}"></image>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1" bind:tap="handlePage2">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/23.png?t={{Timestamp}}"></image>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1" bind:tap="handlePage3">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/24.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>

src/pages/24/index.scss

@@ -1,5 +1,6 @@
 .page {
   width: 100vw;
+  padding-bottom: 100rpx;
 }
 .page-click1 {
   position: absolute;

src/pages/25/index.scss

@@ -1,7 +1,10 @@
 .page {
   width: 100vw;
   min-height: 100vh;
-  padding-bottom: 150rpx;
+  .swiper-item1 {
+    height: 100vh;
+    overflow-y: scroll;
+  }
   .page-img {
     width: 100vw;
   }

src/pages/25/index.ts

@@ -5,24 +5,19 @@ Page({
     current: 0,
   },
   onLoad() {},
-  handleTap1() {
-    if (this.data.current <= 0) {
-      wx.navigateBack();
-      return;
-    }
+  handlePage1() {
     this.setData({
-      current: this.data.current - 1,
+      current: 1,
     });
   },
-  handleTap2() {
-    if (this.data.current >= 2) {
-      wx.navigateTo({
-        url: "/pages/7/index",
+  handlePage2() {
+    this.setData({
+      current: 2,
     });
-      return;
-    }
+  },
+  handlePage3() {
     this.setData({
-      current: this.data.current + 1,
+      current: 0,
     });
   },
 });

src/pages/25/index.wxml

@@ -1,13 +1,13 @@
 <navigation-bar></navigation-bar>
 
 <swiper class="page" model:current="{{current}}">
-  <swiper-item class="swiper-item1">
+  <swiper-item class="swiper-item1" bind:tap="handlePage1">
     <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}md/31.png?t={{Timestamp}}"></image>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1"  bind:tap="handlePage2">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/32.png?t={{Timestamp}}"></image>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1"  bind:tap="handlePage3">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/33.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>

src/pages/4/index.scss

@@ -5,8 +5,13 @@ page {
   width: 100vw;
   min-height: 100vh;
   padding-bottom: 150rpx;
+  .swiper-item1 {
+    height: 100vh;
+    overflow-y: scroll;
+  }
   .page-img {
     width: 100vw;
+    padding-bottom: 0;
   }
 }
 

src/pages/4/index.wxml

@@ -2,7 +2,7 @@
   <swiper-item class="swiper-item1">
     <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}md/5.png?t={{Timestamp}}"></image>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/6.png?t={{Timestamp}}"></image>
   </swiper-item>
 </swiper>

src/pages/6/index.scss

@@ -1,12 +1,10 @@
 .page {
   width: 100vw;
   min-height: 100vh;
-  padding-bottom: 150rpx;
-  .page-img {
-    width: 100vw;
-  }
-}
-
+  .swiper-item1 {
+    position: relative;
+    height: 100vh;
+    overflow-y: scroll;
     .page-click1 {
       position: absolute;
       top: 1386rpx;
@@ -25,3 +23,8 @@
       height: 120rpx;
       background-color: transparent;
     }
+  }
+  .page-img {
+    width: 100vw;
+  }
+}

src/pages/6/index.ts

@@ -5,6 +5,21 @@ Page({
     current: 0,
   },
   onLoad() {},
+  handlePage1() {
+    this.setData({
+      current: 1,
+    });
+  },
+  handlePage2() {
+    this.setData({
+      current: 2,
+    });
+  },
+  handlePage3() {
+    this.setData({
+      current: 0,
+    });
+  },
   handleTap1() {
     if (this.data.current <= 0) {
       wx.navigateBack();
@@ -15,15 +30,9 @@ Page({
     });
   },
   handleTap2() {
-    if (this.data.current >= 2) {
     wx.navigateTo({
       url: "/pages/7/index",
     });
-      return;
-    }
-    this.setData({
-      current: this.data.current + 1,
-    });
   },
 });
 

src/pages/6/index.wxml

@@ -1,16 +1,19 @@
 <navigation-bar></navigation-bar>
 
 <swiper class="page" model:current="{{current}}">
-  <swiper-item class="swiper-item1">
+  <swiper-item class="swiper-item1" bind:tap="handlePage1">
     <image bind:tap="handlePage1" class="page-img" mode="widthFix" src="{{imageUrl}}md/2.png?t={{Timestamp}}"></image>
+    <view class="page-click1" catch:tap="handleTap1"></view>
+    <view class="page-click2" catch:tap="handleTap2"></view>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1" bind:tap="handlePage2">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/9.png?t={{Timestamp}}"></image>
+    <view class="page-click1" catch:tap="handleTap1"></view>
+    <view class="page-click2" catch:tap="handleTap2"></view>
   </swiper-item>
-  <swiper-item>
+  <swiper-item class="swiper-item1" bind:tap="handlePage3">
     <image bind:tap="handlePage2" class="page-img" mode="widthFix" src="{{imageUrl}}md/13.png?t={{Timestamp}}"></image>
-  </swiper-item>
-</swiper>
-
     <view class="page-click1" catch:tap="handleTap1"></view>
     <view class="page-click2" catch:tap="handleTap2"></view>
+  </swiper-item>
+</swiper>

src/pages/8/index.ts

@@ -5,6 +5,7 @@ Page({
     float1: false,
   },
   onLoad() {},
+  time: null as any,
   handleTap1() {
     wx.navigateBack();
   },
@@ -12,8 +13,12 @@ Page({
     this.setData({
       float1: true,
     });
+    this.time = setTimeout(() => {
+      this.handleFloat1();
+    }, 2000);
   },
   handleFloat1() {
+    clearInterval(this.time);
     wx.reLaunch({
       url: "/pages/1/index",
     });

src/utils/page.ts

@@ -54,14 +54,14 @@ function page(config: WechatMiniprogram.Page.Instance<WechatMiniprogram.IAnyObje
       if (url.includes('doctor/pages')) {
         return {
           title: "世界本该如此美好 现在也属于你",
-          path: "/pages/1/index",
+          path: "/pages/start/index",
           // imageUrl: `${getApp().globalData.imageUrl}1/1.png?t=${Timestamp}`,
         };
       }
 
       return {
         title: "世界本该如此美好 现在也属于你",
-        path: "/pages/1/index",
+        path: "/pages/start/index",
         // imageUrl: `${getApp().globalData.imageUrl}1/1.png?t=${Timestamp}`,
       };
     }