Merge remote-tracking branch 'origin/main'

# Conflicts:
#	DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx

DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx

@@ -71,9 +71,9 @@ const Layout = memo<LayoutProps>(({ children, nav }) => {
   const { isPWA } = usePlatform();
   const theme = useTheme();
   const { styles, cx } = useStyles()
-  console.log(window?.location?.pathname,'3837373666router--------------------------------------------')
+  console.log(window, window.location, window?.location?.pathname,'3837373666router--------------------------------------------')
   const { showCloudPromotion } = useServerConfigStore(featureFlagsSelectors);
-  const pathName = window?.location?.pathname
+  const pathName = window?.location?.pathname ?? '/welcome'
   return (
     <>
       {showCloudPromotion && <CloudBanner />}

DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx

@@ -76,7 +76,7 @@ const useStyles = createStyles(({ css }) => ({
     box-shadow: 1px 0px 12px 0px rgba(42, 77, 255, 0.19);
     border: none;
     border-radius: 8px;
-    padding: 10px 0;
+    padding: 0px;
     width: 100%;
     height: 100%;
     overflow: auto;
@@ -123,6 +123,10 @@ const useStyles = createStyles(({ css }) => ({
     box-sizing: border-box;
     border: 1px solid #0044FF;
   `,
+  iconRobotImg: css`
+    width: 48px;
+    height: 195px !important;
+  `,
   iconImg: css`
     width: 48px;
     height: 48px;
@@ -172,7 +176,7 @@ const useStyles = createStyles(({ css }) => ({
     border-radius: 8px;
   `,
   robotImg: css`
-    margin: 30px 0;
+    margin: 20px 0;
     width: 100%;
     .ant-image {
       width: 100%;
@@ -520,8 +524,8 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
             renderItem={() => (
               <List.Item className={styles.listStyle}>
                 <Card className={styles.cardStyle} style={{padding: '0 !important'}}>
-                    <div style={{background: '#EFEFEF', padding: '40px 0', textAlign: 'center'}}>
-                        <Image className={cx(styles.iconImg)} preview={false} src="/images/robot.png" />
+                    <div style={{background: '#EFEFEF', padding: '20px 0', textAlign: 'center'}}>
+                        <Image className={cx(styles.iconRobotImg)} preview={false} src="/images/robot.png" />
                     </div>
                     <div style={{marginTop: '30px'}}>
                       <Flex justify='space-between' style={{height: '100%'}}>
@@ -541,7 +545,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                 </Card>
               </List.Item>
             )}
-            style={{marginTop: '10px', padding: '0 50px'}}
+            style={{marginTop: '10px', padding: '0 50px', height: 'calc(100vh - 150px)', overflowY: 'scroll'}}
           />
         </div>
       </div>
@@ -554,9 +558,9 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
               返回形象列表
           </Button>
         </Flex>
-        <div style={{height: '100%', padding: '0 150px 0 50px'}}>
+        <div style={{padding: '0 150px 0 50px', height: 'calc(100vh - 160px)', overflowY: 'scroll'}} >
             <Flex gap={30} justify='space-between' style={{height: '100%'}}>
-              <div style={{height: '85%', width: '6%'}}>
+              <div style={{height: 'calc(100vh - 160px)', width: '6%'}}>
                 <Card className={styles.cardStyle} style={{padding: '0', textAlign: 'center'}}>
                   <div className={styles.robotAvatarLeftContainer}>
                       <div className={styles.robotAvatarLeft}>
@@ -608,13 +612,13 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                   </div>
                 </Card>
               </div>
-              <div style={{height: '85%', width: '52%'}}>
+              <div style={{height: 'calc(100vh - 160px)', width: '52%'}}>
                 <Card className={styles.cardRobotStyle} style={{height: '120px', padding: '0 !important'}}>
                       <Carousel infinite={false}
                       // afterChange={afterChange}
                       ref={carouselRef}>
                         <div>
-                            <Flex gap={50}>
+                            <Flex gap={25}>
                                 <div>
                                     <div className={styles.soundCardAvatar}>
                                        <Image className={cx(styles.iconImg)} preview={false} src="/images/robot2.png"  style={{marginBotom: '5px', marginTop: '12px'}} />
@@ -666,7 +670,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                             </Flex>
                         </div>
 <div>
-                            <Flex gap={50}>
+                            <Flex gap={25}>
                                 <div>
                                     <div className={styles.soundCardAvatar}>
                                        <Image className={cx(styles.iconImg)} preview={false} src="/images/robot2.png"  style={{marginBotom: '5px', marginTop: '12px'}} />
@@ -726,17 +730,14 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                       </div>
                 </Card>
                 <div className={styles.robotImg}>
-                  <Image preview={false} src="/images/robot_img.png"  style={{height: '600px', width: '100%'}}/>
+                  <Image preview={false} src="/images/robot_img.png"  style={{height: 'calc(100vh - 440px)', width: '100%'}}/>
                 </div>
                 <Card className={styles.cardRobotStyle} style={{height: '120px', padding: '0 !important'}}>
                       <Carousel infinite={false}
                       // afterChange={afterChange}
                       ref={carouselBgRef}>
                         <div>
-                            <Flex gap={30}>
-                                <div>
-                                    <Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
-                                </div>
+                            <Flex gap={25}>
                                 <div>
                                     <Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
                                 </div>
@@ -758,10 +759,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                             </Flex>
                         </div>
                         <div>
-                            <Flex gap={30}>
-                                <div>
-                                    <Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
-                                </div>
+                            <Flex gap={25}>
                                 <div>
                                     <Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
                                 </div>
@@ -791,7 +789,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
                       </div>
                 </Card>
               </div>
-              <div style={{height: '85%',width: '42%'}}>
+              <div style={{height: 'calc(100vh - 160px)',width: '42%'}}>
                 <Card className={styles.cardStyle} style={{ padding: '0' }}>
                   <div className={styles.robotSetHead}>
                     声音设置

DigitalHumanWeb/tsconfig.json

@@ -5,7 +5,7 @@
     "lib": ["dom", "dom.iterable", "esnext", "webworker"],
     "allowJs": true,
     "skipLibCheck": true,
-    "strict": true,
+    "strict": false,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,