diff --git a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx index e16e7da..06ef1ce 100644 --- a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx +++ b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx @@ -71,9 +71,9 @@ const Layout = memo(({ 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 && } diff --git a/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx b/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx index aefe028..fe35923 100644 --- a/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx +++ b/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%; @@ -519,8 +523,8 @@ const RobotList = memo<{ mobile?: boolean }>(() => { renderItem={() => ( -
- +
+
@@ -540,7 +544,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => { )} - style={{marginTop: '10px', padding: '0 50px'}} + style={{marginTop: '10px', padding: '0 50px', height: 'calc(100vh - 150px)', overflowY: 'scroll'}} />
@@ -552,9 +556,9 @@ const RobotList = memo<{ mobile?: boolean }>(() => { 返回形象列表 -
+
-
+
@@ -606,13 +610,13 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
-
+
- +
@@ -664,7 +668,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- +
@@ -724,17 +728,14 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- +
- -
- -
+
@@ -756,10 +757,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- -
- -
+
@@ -789,7 +787,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
-
+
声音设置 diff --git a/DigitalHumanWeb/tsconfig.json b/DigitalHumanWeb/tsconfig.json index 3ba5398..e140d47 100644 --- a/DigitalHumanWeb/tsconfig.json +++ b/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,