From cd837f7efcfaf427b478236c5cd2eb98e78d170b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 11 七月 2025 17:30:31 +0800
Subject: [PATCH] fix: s
---
src/Home/data.source.js | 12 +++---
src/Home/Footer.jsx | 6 +-
.gitignore | 28 ++++++++------
.umirc.ts | 4 +-
src/Home/less/feature5.less | 5 +-
package.json | 3 +
.env | 1
.env.production | 1
src/Home/Content9.jsx | 4 +-
src/Home/less/content9.less | 30 ++++++++++++++
pnpm-lock.yaml | 11 +++++
11 files changed, 76 insertions(+), 29 deletions(-)
diff --git a/.env b/.env
new file mode 100644
index 0000000..ea388df
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+UMI_APP_PUBLIC_PATH=/
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..8dc1696
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+UMI_APP_PUBLIC_PATH=/v2/
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ec0cabb..dcb69b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,17 @@
-/node_modules
-/.env.local
-/.umirc.local.ts
-/config/config.local.ts
-/src/.umi
-/src/.umi-production
-/src/.umi-test
-/.umi
-/.umi-production
-/.umi-test
-/dist
-/.mfsu
+node_modules
+.env.local
+.umirc.local.ts
+config/config.local.ts
+src/.umi
+src/.umi-production
+src/.umi-test
+.umi
+.umi-production
+.umi-test
+dist
+.mfsu
.swc
+
+*.zip
+
+*.local
\ No newline at end of file
diff --git a/.umirc.ts b/.umirc.ts
index cabc224..ccd2c9e 100644
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -1,5 +1,5 @@
import { defineConfig } from '@umijs/max';
-
+console.log('env', process.env.UMI_APP_PUBLIC_PATH);
export default defineConfig({
antd: {},
access: {},
@@ -11,7 +11,7 @@
slave: {},
},
base: '/v2/',
- publicPath: '/v2/',
+ publicPath: process.env.UMI_APP_PUBLIC_PATH,
// layout: {
// title: '@umijs/max',
// },
diff --git a/package.json b/package.json
index 87ec41d..8922df6 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"private": true,
"author": "",
"scripts": {
- "build": "max build",
+ "build": "cross-env NODE_ENV=production REACT_APP_ENV=production UMI_ENV=production max build",
"dev": "max dev",
"format": "prettier --cache --write .",
"postinstall": "max setup",
@@ -30,6 +30,7 @@
"@types/file-saver": "^2.0.7",
"@types/react": "^18.0.33",
"@types/react-dom": "^18.0.11",
+ "cross-env": "^7.0.3",
"husky": "^9",
"lint-staged": "^13.2.0",
"prettier": "^2.8.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 72effd5..6c3e663 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,6 +55,9 @@
'@types/react-dom':
specifier: ^18.0.11
version: 18.3.7(@types/react@18.3.23)
+ cross-env:
+ specifier: ^7.0.3
+ version: 7.0.3
husky:
specifier: ^9
version: 9.1.7
@@ -4625,6 +4628,14 @@
object-assign: 4.1.1
dev: false
+ /cross-env@7.0.3:
+ resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+ engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+ hasBin: true
+ dependencies:
+ cross-spawn: 7.0.6
+ dev: true
+
/cross-spawn@7.0.6:
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
engines: {node: '>= 8'}
diff --git a/src/Home/Content9.jsx b/src/Home/Content9.jsx
index 1804863..48b2016 100644
--- a/src/Home/Content9.jsx
+++ b/src/Home/Content9.jsx
@@ -1,6 +1,6 @@
-import React from 'react';
-import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
import QueueAnim from 'rc-queue-anim';
+import OverPack from 'rc-scroll-anim/lib/ScrollOverPack';
+import React from 'react';
import { getChildrenToRender } from './utils';
class Content9 extends React.PureComponent {
diff --git a/src/Home/Footer.jsx b/src/Home/Footer.jsx
index a603526..504aec1 100644
--- a/src/Home/Footer.jsx
+++ b/src/Home/Footer.jsx
@@ -39,15 +39,15 @@
</Title>
<div className="contact-item">
<PhoneOutlined style={{ fontSize: 18, marginRight: 12 }} />
- <Text style={{ fontSize: 16 }}>400-123-4567</Text>
+ <Text style={{ fontSize: 16 }}>0574-83867368,0574-83867307</Text>
</div>
<div className="contact-item">
<MailOutlined style={{ fontSize: 18, marginRight: 12 }} />
- <Text style={{ fontSize: 16 }}>contact@example.com</Text>
+ <Text style={{ fontSize: 16 }}>nb-cyds@cnnbhr.com</Text>
</div>
<div className="contact-item">
<GlobalOutlined style={{ fontSize: 18, marginRight: 12 }} />
- <Text style={{ fontSize: 16 }}>www.example.com</Text>
+ <Text style={{ fontSize: 16 }}>www.cnnbhr.com</Text>
</div>
</Col>
diff --git a/src/Home/data.source.js b/src/Home/data.source.js
index 813c39f..8d4d92f 100644
--- a/src/Home/data.source.js
+++ b/src/Home/data.source.js
@@ -201,8 +201,8 @@
},
};
export const Content90DataSource = {
- wrapper: { className: 'home-page-wrapper content9-wrapper' },
- page: { className: 'home-page content9' },
+ wrapper: { className: 'home-page-wrapper content9-wrapper ' },
+ page: { className: 'home-page content9 hor' },
titleWrapper: {
className: 'title-wrapper',
children: [
@@ -214,7 +214,7 @@
],
},
block: {
- className: 'timeline',
+ className: 'timeline ',
children: [
{
name: 'block0',
@@ -544,7 +544,7 @@
img: {
className: 'content7-img',
children:
- 'https://zos.alipayobjects.com/rmsportal/xBrUaDROgtFBRRL.png',
+ 'https://hrvsnetfile.oss-cn-hangzhou.aliyuncs.com/NBHRXH/Review/20250609/4_154743149.JPG',
md: 10,
xs: 24,
},
@@ -595,7 +595,7 @@
md: 10,
xs: 24,
children:
- 'https://zos.alipayobjects.com/rmsportal/xBrUaDROgtFBRRL.png',
+ 'https://hrvsnetfile.oss-cn-hangzhou.aliyuncs.com/NBHRXH/Review/20250609/5_154752393.JPG',
},
},
},
@@ -638,7 +638,7 @@
md: 10,
xs: 24,
children:
- 'https://zos.alipayobjects.com/rmsportal/xBrUaDROgtFBRRL.png',
+ 'https://hrvsnetfile.oss-cn-hangzhou.aliyuncs.com/NBHRXH/Review/20250609/13_154905399.JPG',
},
},
},
diff --git a/src/Home/less/content9.less b/src/Home/less/content9.less
index 8d5f64e..75d5d64 100644
--- a/src/Home/less/content9.less
+++ b/src/Home/less/content9.less
@@ -7,10 +7,25 @@
overflow: initial;
}
.@{content9} {
- // min-height: 800px;
+ // min-height: 400px;
height: 1110px;
box-sizing: content-box;
padding: 64px 0 0;
+
+ &.hor {
+ height: 658px;
+ .timeline {
+ display: flex;
+ flex-wrap: wrap;
+ &:before {
+ display: none;
+ }
+
+ .block-wrapper {
+ width: 50%;
+ }
+ }
+ }
}
.timeline {
position: relative;
@@ -103,6 +118,19 @@
.@{content9} {
height: 722px;
padding: 64px 24px;
+
+ &.hor {
+ .timeline {
+ display: block;
+ &:before {
+ display: block;
+ }
+
+ .block-wrapper {
+ width: auto;
+ }
+ }
+ }
}
.timeline {
&:before {
diff --git a/src/Home/less/feature5.less b/src/Home/less/feature5.less
index bddc4c3..1da79cd 100644
--- a/src/Home/less/feature5.less
+++ b/src/Home/less/feature5.less
@@ -38,10 +38,11 @@
align-items: center;
}
&-text {
- padding: 24px 48px;
+ // padding: 24px 48px;
+ padding-left: 200px;
}
&-img {
- padding: 24px 48px;
+ // padding: 24px 48px;
}
.ant-tabs-tabpane {
margin-top: 40px;
--
Gitblit v1.9.1