From ad35ce84c1f7b609d6b7bdd39531c40b35dbd22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BA=9A=E7=90=AA?= <wangyaqi988@163.com>
Date: Fri, 15 Nov 2024 20:03:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=80=82=E9=85=8D=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  2 +-
 pages/component/text/text-props.uvue          |  4 +--
 pages/tabBar/template.uvue                    |  6 ++--
 pages/template/half-screen/half-screen.uvue   | 31 ++++++++++++-------
 .../scroll-fold-nav/scroll-fold-nav.uvue      |  2 +-
 .../swiper-vertical-video.uvue                |  2 +-
 6 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/pages.json b/pages.json
index 5e6eb321..16be72fb 100644
--- a/pages.json
+++ b/pages.json
@@ -1909,7 +1909,7 @@
 			}
 		},
 		// #endif
-		// #ifdef APP-ANDROID || APP-IOS || WEB
+		// #ifdef APP-ANDROID || APP-IOS || WEB || MP
 		{
 			"path": "pages/template/custom-long-list/custom-long-list",
 			"style": {
diff --git a/pages/component/text/text-props.uvue b/pages/component/text/text-props.uvue
index 248c72dd..19b3d70b 100644
--- a/pages/component/text/text-props.uvue
+++ b/pages/component/text/text-props.uvue
@@ -64,9 +64,7 @@
         <text class="uni-subtitle-text">依次为lt gt amp apos nbsp ensp emsp效果</text>
       </view>
       <view class="text-box">
-        <!-- #ifndef MP-WEIXIN -->
-        <text :decode="true">&lt; &gt; &amp; &apos;</text>
-        <!-- #endif -->
+        <text :decode="true">&lt; &gt; &amp; &apos;</text>
         <text :decode="true">uni-app&nbsp;x，终极跨平台方案</text>
         <text :decode="true">uni-app&ensp;x，终极跨平台方案</text>
         <text :decode="true">uni-app&emsp;x，终极跨平台方案</text>
diff --git a/pages/tabBar/template.uvue b/pages/tabBar/template.uvue
index f465baef..496153eb 100644
--- a/pages/tabBar/template.uvue
+++ b/pages/tabBar/template.uvue
@@ -195,14 +195,16 @@
             open: false,
             pages: [] as Page[],
           },
-          // #endif
+          // #endif
+          // #ifdef APP || WEB
           {
             id: 'schema',
             url: 'schema',
             name: '打开外部链接',
             open: false,
             pages: [] as Page[],
-          },
+          },
+          // #endif
           // #ifdef WEB
           {
             id: 'browser-element',
diff --git a/pages/template/half-screen/half-screen.uvue b/pages/template/half-screen/half-screen.uvue
index 6e9f8d66..b1d54c3a 100644
--- a/pages/template/half-screen/half-screen.uvue
+++ b/pages/template/half-screen/half-screen.uvue
@@ -1,5 +1,5 @@
 <template>
-  <view id="page" class="page">
+  <view ref="page" class="page">
     <text
       style="margin: 10px">半屏弹窗，演示了弹出层内scroll-view滚动到顶时由滚变拖。本效果是通过监听TouchEvent实现，当半屏窗口移动时禁用scroll-view的滚动，避免两者的冲突。</text>
     <button class="bottomButton" @click="switchHalfScreen(true)">打开弹窗</button>
@@ -56,7 +56,7 @@
             //this.scrollNode?.setAttribute('scroll-y', 'false');
             this.scrollNode?.setAttribute('direction', 'none');
             // #endif
-            // #ifdef WEB
+            // #ifdef WEB || MP
             this.scrollDirection = 'none';
             // #endif
             this.halfNode?.style?.setProperty('transform', 'translateY(' + offset.toFixed(2) + 'px)');
@@ -71,7 +71,7 @@
             //this.scrollNode?.setAttribute('scroll-y', 'true');
             this.scrollNode?.setAttribute('direction', 'vertical');
             // #endif
-            // #ifdef WEB
+            // #ifdef WEB || MP
             this.scrollDirection = 'vertical';
             // #endif
             this.halfNode?.style?.setProperty('transform', 'translateY(' + offset.toFixed(2) + 'px)');
@@ -110,7 +110,7 @@
         //this.scrollNode?.setAttribute('scroll-y', 'true');
         this.scrollNode?.setAttribute('direction', 'vertical');
         // #endif
-        // #ifdef WEB
+        // #ifdef WEB || MP
         this.scrollDirection = 'vertical';
         // #endif
         this.halfScreenY = 0;
@@ -150,7 +150,7 @@
         //this.scrollNode?.setAttribute('scroll-y', 'true');
         this.scrollNode?.setAttribute('direction', 'vertical');
         // #endif
-        // #ifdef WEB
+        // #ifdef WEB || MP
         this.scrollDirection = 'vertical';
         // #endif
         this.halfScreenY = 0;
@@ -164,24 +164,31 @@
     },
     onReady() {
       this.halfNode = this.$refs['halfScreen'] as UniElement;//uni.getElementById('halfScreen');
-      this.scrollNode = this.$refs['halfScroll'] as UniElement;//uni.getElementById('halfScroll');
-
-      this.halfHeight = this.halfNode!.getBoundingClientRect().height;
-      this.totalHeight = uni.getElementById('page')?.getBoundingClientRect()?.height ?? 0;//uni.getWindowInfo().windowHeight
-      this.halfNode?.style?.setProperty('top', this.totalHeight.toFixed(2)+'px');
+      this.scrollNode = this.$refs['halfScroll'] as UniElement;//uni.getElementById('halfScroll');
+      this.halfNode!.getBoundingClientRectAsync().then((rect: DOMRect) => {
+          this.halfHeight = rect.height
+      });
+      (this.$refs['page'] as UniElement).getBoundingClientRectAsync().then((rect: DOMRect) => {
+          this.totalHeight = rect.height
+          this.halfNode?.style?.setProperty('top', this.totalHeight.toFixed(2)+'px');
+      });
     },
-    onResize() {
-      this.halfHeight = this.halfNode?.getBoundingClientRect()?.height ?? 0;
+    onResize() {
+      this.halfNode?.getBoundingClientRectAsync().then((rect: DOMRect) => {
+          this.halfHeight = rect.height
+      });
       this.totalHeight = uni.getWindowInfo().windowHeight;
       this.halfNode?.style?.setProperty('top', this.totalHeight.toFixed(2)+'px');
       this.halfNode?.style?.setProperty('visibility', 'hidden');
     },
     onBackPress(): boolean {
+      // #ifndef MP
       if('visible' == this.halfNode?.style?.getPropertyValue('visibility')){
         this.switchHalfScreen(false);
         return true;
       }
       return false;
+      // #endif
     }
   }
 </script>
diff --git a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
index e64cb41c..c848c062 100644
--- a/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
+++ b/pages/template/scroll-fold-nav/scroll-fold-nav.uvue
@@ -49,7 +49,7 @@
       }
     },
     onLoad() {
-      // #ifdef APP
+      // #ifdef APP || MP
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
       // #endif
       this.nviBarHeight = NAVIBARHEIGHT + this.statusBarHeight;
diff --git a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
index d462a9a0..c3d2cc4c 100644
--- a/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
+++ b/pages/template/swiper-vertical-video/swiper-vertical-video.uvue
@@ -87,7 +87,7 @@
     onReady() {
       // 一启动完成，就播放第一个
       this.doPlay(0);
-      // #ifdef APP
+      // #ifdef APP || MP
       //App端适配不同状态栏高度
       let backElement = this.$refs['back'] as UniElement;
       backElement.style.setProperty('top', uni.getSystemInfoSync().statusBarHeight+'px');
-- 
GitLab