From 8a96b18133203a73bae56dc5c3d739b5061e912e Mon Sep 17 00:00:00 2001
From: wanganxp <wanganxp@gmail.com>
Date: Thu, 30 Nov 2023 01:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=AA=E8=BE=9E=E5=92=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/CSS.uvue                       | 22 ++++++++++-----------
 pages/template/half-screen/half-screen.uvue |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pages/tabBar/CSS.uvue b/pages/tabBar/CSS.uvue
index 1e1c5c3d..7b54a077 100644
--- a/pages/tabBar/CSS.uvue
+++ b/pages/tabBar/CSS.uvue
@@ -265,6 +265,16 @@
                 url: '/pages/CSS/padding/padding',
               },
             ] as Page[],
+          },
+          {
+            id: 'overflow',
+            name: 'overflow',
+            pages: [
+              {
+                name: 'overflow',
+                url: '/pages/CSS/overflow/overflow',
+              },
+            ] as Page[],
           },
           {
             id: 'text',
@@ -339,17 +349,7 @@
                 url: '/pages/CSS/transition/transition',
               },
             ] as Page[],
-          },
-          {
-            id: 'overflow',
-            name: 'overflow',
-            pages: [
-              {
-                name: 'overflow',
-                url: '/pages/CSS/overflow/overflow',
-              },
-            ] as Page[],
-          },
+          }
         ] as ListItem[],
         arrowUpIcon: '/static/icons/arrow-up.png',
         arrowDownIcon: '/static/icons/arrow-down.png',
diff --git a/pages/template/half-screen/half-screen.uvue b/pages/template/half-screen/half-screen.uvue
index da6ceadf..13dd1c0a 100644
--- a/pages/template/half-screen/half-screen.uvue
+++ b/pages/template/half-screen/half-screen.uvue
@@ -1,6 +1,6 @@
 <template>
 	<view id="page" class="page">
-		<text style="margin: 10px">半屏弹窗效果是通过监听TouchEvent实现，当半屏窗口移动时禁用scroll-view的滚动，避免两者的冲突。</text>
+		<text style="margin: 10px">半屏弹窗，演示了弹出层内scroll-view滚动到顶时由滚变拖。本效果是通过监听TouchEvent实现，当半屏窗口移动时禁用scroll-view的滚动，避免两者的冲突。</text>
 		<button class="bottomButton" @click="switchHalfScreen(true)">打开弹窗</button>
 		<view id="halfScreen" class="halfScreen" @touchstart="onHalfTouchStart" @touchmove="onHalfTouchMove" @touchend="onHalfTouchEnd">
 			<view class="halfTitle" >半屏弹窗标题</view>
-- 
GitLab