From 4c4358f93b4b31788a546988badddedea755021c Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Sun, 10 Nov 2024 19:15:27 +0800
Subject: [PATCH 1/2] fix: backtop icon changees

---
 src/packages/backtop/demo.taro.tsx        | 42 +++++++++--------------
 src/packages/backtop/demos/taro/demo1.tsx |  8 ++---
 src/packages/backtop/demos/taro/demo5.tsx | 21 ++++++------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/src/packages/backtop/demo.taro.tsx b/src/packages/backtop/demo.taro.tsx
index 55f9442071..ae980ec231 100644
--- a/src/packages/backtop/demo.taro.tsx
+++ b/src/packages/backtop/demo.taro.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import Taro from '@tarojs/taro'
 import { ScrollView, View } from '@tarojs/components'
-import { Cell } from '@nutui/nutui-react-taro'
 import { useTranslate } from '@/sites/assets/locale/taro'
 import Header from '@/sites/components/header'
 import Demo1 from './demos/taro/demo1'
@@ -21,39 +20,32 @@ const BackTopDemo = () => {
     },
   })
   const demoStyle = {
-    height: '100%',
+    height: 'auto',
     minHeight: 'auto',
   }
 
   return (
-    <View
-      style={{
-        position: 'relative',
-      }}
-    >
-      <Header />
+    <>
       {harmonyAndRn() ? (
-        <Demo5>
-          <View
+        <>
+          <View style={{ position: 'relative' }}>
+            <Header />
+            <Demo5 />
+          </View>
+        </>
+      ) : (
+        <>
+          <Header />
+          <ScrollView
             className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}
-            style={{ height: 'auto' }}
+            style={demoStyle}
           >
             <View className="h2">{translated.title}</View>
-            {new Array(24).fill(0).map((_, index) => {
-              return <Cell key={index}>我是测试数据{index}</Cell>
-            })}
-          </View>
-        </Demo5>
-      ) : (
-        <ScrollView
-          className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}
-          style={demoStyle}
-        >
-          <View className="h2">{translated.title}</View>
-          <Demo1 />
-        </ScrollView>
+            <Demo1 />
+          </ScrollView>
+        </>
       )}
-    </View>
+    </>
   )
 }
 
diff --git a/src/packages/backtop/demos/taro/demo1.tsx b/src/packages/backtop/demos/taro/demo1.tsx
index 878d60a36a..86a1f8d7ef 100644
--- a/src/packages/backtop/demos/taro/demo1.tsx
+++ b/src/packages/backtop/demos/taro/demo1.tsx
@@ -1,8 +1,7 @@
 import React from 'react'
-import { View, Icon } from '@tarojs/components'
+import { View } from '@tarojs/components'
 import { BackTop, Cell } from '@nutui/nutui-react-taro'
-// @TODO 暂不支持
-// import { Top } from '@nutui/icons-react-taro'
+import { Top } from '@nutui/icons-react-taro'
 
 const Demo1 = () => {
   return (
@@ -24,8 +23,7 @@ const Demo1 = () => {
             alignItems: 'center',
           }}
         >
-          <Icon size={12} type="search" />
-          {/* <Top size={12} /> */}
+          <Top size={12} />
           <View style={{ fontSize: '12px' }}>顶部</View>
         </View>
       </BackTop>
diff --git a/src/packages/backtop/demos/taro/demo5.tsx b/src/packages/backtop/demos/taro/demo5.tsx
index 330e352245..0d11a23e2b 100644
--- a/src/packages/backtop/demos/taro/demo5.tsx
+++ b/src/packages/backtop/demos/taro/demo5.tsx
@@ -2,16 +2,14 @@
  * JDRN 端最佳实践
  */
 import React, { useRef, useState } from 'react'
-import { ScrollView, View, Icon } from '@tarojs/components'
-import { BackTop } from '@nutui/nutui-react-taro'
+import Taro from '@tarojs/taro'
+import { ScrollView, View } from '@tarojs/components'
+import { BackTop, Cell } from '@nutui/nutui-react-taro'
+import { Top } from '@nutui/icons-react-taro'
 import pxTransform from '@/utils/px-transform'
 import { harmony, rn } from '@/utils/platform-taro'
-import { BasicComponent } from '@/utils/typings'
-// @TODO 暂不支持
-// import { Top } from '@nutui/icons-react-taro'
 
-const Demo5 = (props: BasicComponent) => {
-  const { children } = props
+const Demo5 = () => {
   const [scrollRes, setScrollRes] = useState<any>(null)
   const sv = useRef<any>(null)
 
@@ -31,9 +29,13 @@ const Demo5 = (props: BasicComponent) => {
         ref={sv}
         // @TODO RN 端暂不支持
         // trapScroll={true}
+        className={`demo ${Taro.getEnv() === 'WEB' ? 'web' : ''}`}
         style={{ height: 'auto' }}
       >
-        {children}
+        <View className="h2">基础用法</View>
+        {new Array(24).fill(0).map((_, index) => {
+          return <Cell key={index}>我是测试数据{index}</Cell>
+        })}
       </ScrollView>
       <BackTop
         threshold={200}
@@ -57,8 +59,7 @@ const Demo5 = (props: BasicComponent) => {
             alignItems: 'center',
           }}
         >
-          <Icon size={12} type="search" />
-          {/* <Top size={12} /> */}
+          <Top size={12} />
           <View style={{ fontSize: pxTransform(12) }}>顶部</View>
         </View>
       </BackTop>

From b63e1c01615197fcc3aaa1d2aab45657a48257d2 Mon Sep 17 00:00:00 2001
From: hanyuxinting <hanyuxinting@sina.cn>
Date: Sun, 10 Nov 2024 22:15:21 +0800
Subject: [PATCH 2/2] fix: backtop icon changes

---
 src/packages/backtop/demos/taro/demo5.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/packages/backtop/demos/taro/demo5.tsx b/src/packages/backtop/demos/taro/demo5.tsx
index 0d11a23e2b..59c528d2a3 100644
--- a/src/packages/backtop/demos/taro/demo5.tsx
+++ b/src/packages/backtop/demos/taro/demo5.tsx
@@ -60,7 +60,6 @@ const Demo5 = () => {
           }}
         >
           <Top size={12} />
-          <View style={{ fontSize: pxTransform(12) }}>顶部</View>
         </View>
       </BackTop>
     </View>