zhouhongbo
/
JZ_QGNB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhouhongbo:96a8419abdd01199d22240af468713fe37c3ecb3
Branches Tags
zhouhongbo:main
..
compare: zhouhongbo:123c9b791f05673bfbd4aae87b7c098aafaae2b4
Branches Tags
zhouhongbo:main

3 Commits
96a8419abd ... 123c9b791f

Author SHA1 Message Date
lvchenpeng 123c9b791f Merge remote-tracking branch 'origin/main' 3 months ago
lvchenpeng 1624a1f271 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx
 3 months ago
lvchenpeng de37c102d4 样式修改 3 months ago
3 changed files with 21 additions and 23 deletions
Show Stats

4
DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx
Unescape Escape View File

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

38
DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx
Unescape Escape View File

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

2
DigitalHumanWeb/tsconfig.json
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save