diff --git a/package-lock.json b/package-lock.json index 9ea84263c..2120e68b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3811,6 +3811,11 @@ "require-from-string": "^1.1.0" } }, + "countup.js": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.0.8.tgz", + "integrity": "sha512-pW3xwwD+hB+xmtI16xFcuLS0D5hSQqPQWkZOdgpKQyzxCquDNo2VCFPkRw12vmvdpnicXVTcjmYiakG6biwINg==" + }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", @@ -7286,8 +7291,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "optional": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "aproba": { "version": "1.2.0", @@ -7308,14 +7312,12 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "optional": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7330,20 +7332,17 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "optional": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "optional": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "optional": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-util-is": { "version": "1.0.2", @@ -7460,8 +7459,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "optional": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.5", @@ -7473,7 +7471,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7488,7 +7485,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7496,14 +7492,12 @@ "minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "optional": true + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "minipass": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7522,7 +7516,6 @@ "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", - "optional": true, "requires": { "minimist": "^1.2.5" } @@ -7584,8 +7577,7 @@ "npm-normalize-package-bin": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "optional": true + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" }, "npm-packlist": { "version": "1.4.8", @@ -7613,8 +7605,7 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "optional": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "object-assign": { "version": "4.1.1", @@ -7626,7 +7617,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "optional": true, "requires": { "wrappy": "1" } @@ -7704,8 +7694,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "optional": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safer-buffer": { "version": "2.1.2", @@ -7741,7 +7730,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7761,7 +7749,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7805,14 +7792,12 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "optional": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "optional": true + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" } } }, @@ -14977,6 +14962,14 @@ "object-assign": "^4.1.1" } }, + "react-countup": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/react-countup/-/react-countup-6.1.0.tgz", + "integrity": "sha512-0tN65l4ksaNa4rm8ZKshpGxbIHQ4RAh8TGaKYp06EZ7nZw+haXpW3dQTVDhTey9+10jDkJgdzyXKDmC96c1M8g==", + "requires": { + "countup.js": "^2.0.8" + } + }, "react-datepicker": { "version": "2.14.1", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.14.1.tgz", diff --git a/package.json b/package.json index 04142cb4d..428105bad 100644 --- a/package.json +++ b/package.json @@ -84,6 +84,7 @@ "react-color": "^2.18.0", "react-content-loader": "^3.1.1", "react-cookies": "^0.1.1", + "react-countup": "^6.1.0", "react-datepicker": "^2.14.1", "react-dev-utils": "^9.2.0-next.80", "react-dom": "^16.13.1", diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx index 3d63a9cbb..115393afb 100644 --- a/src/forge/AboutUs/AboutUs.jsx +++ b/src/forge/AboutUs/AboutUs.jsx @@ -1,42 +1,91 @@ import React , { useEffect , useState } from 'react'; import { TPMIndexHOC} from '../../modules/tpm/TPMIndexHOC'; -import { Timeline} from 'antd'; +import { Timeline, Carousel } from 'antd'; +import CountUp from 'react-countup'; import './AboutUs.scss'; +import subititle from './image/subtitle.png'; +import achievements from './image/achievements.png'; +import earth from './image/earth.png'; +import computer from './image/computer.png'; +import position from './image/position.png'; +import quan1 from './image/quan1.png'; +import quan2 from './image/quan2.png'; +import img1 from './image/img1.png'; +import img2 from './image/img2.png'; +import img3 from './image/img3.png'; +import img4 from './image/img4.png'; +import img5 from './image/img5.png'; +import img6 from './image/img6.png'; +import img7 from './image/img7.png'; +import img8 from './image/img8.png'; +import img9 from './image/img9.png'; +import img10 from './image/img10.png'; +import img11 from './image/img11.png'; +import img12 from './image/img12.png'; +import img13 from './image/img13.png'; +import img14 from './image/img14.png'; +import img15 from './image/img15.png'; +import img16 from './image/img16.png'; +import img17 from './image/img17.png'; +import img18 from './image/img18.png'; +import img19 from './image/img19.png'; +import img20 from './image/img20.png'; function AboutUs(){ + const countUpProps = { + redraw: true, + start: 0, + duration: 2, + suffix: "+" + }; + const [selectTitle, setSelectTitle] = useState(1); + //用于刷新组件 + const [flush, setFlush] = useState(false); + useEffect(()=>{ + document.addEventListener("scroll", scrollListener); + return( + document.removeEventListener("scroll", scrollListener) + ) + },[]) + + function scrollListener(e){ + console.log('111', e,e.srcElement.documentElement.scrollTop); + } + return(
-
- - - - - -
关于我们平台统计加入我们合作单位
+
+ setSelectTitle(1)}>关于我们 + setSelectTitle(2)}>平台统计 + setSelectTitle(3)}>加入我们 + setSelectTitle(4)}>合作单位
-
+
{/* 关于我们 */}
-
关于我们
- {/* 简介 */} -
-
-

简介

-
    GitLink（确实开源）是CCF官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
+
+
关于我们
+ {/* 简介 */} +
+
+

简介

+
    GitLink（确实开源）是CCF官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
+
+
-
- {/* 确实开源 一脉传承 */} -
+

确实开源 一脉传承

    本世纪以来，随着软件创新需求和应用规模的飞速增长，软件开发队伍、开发资源、可信评估呈现出规模化、开放化、持续化的新特点，软件开发活动面临协同难、复用难、评估难的制约，经典的工程化软件开发方法面临严峻挑战，严重影响了软件开发效率和质量的提升。在此背景下，国防科技大学联合国内多所知名高校、科研机构和软件企业，围绕开源创新开展了持续性探索，构建形成了以Trustie（确实）为代表的一系列开源创新服务基础设施。自2006年以来，Trustie经过三个阶段的演化发展，于2021年迎来全面升级：在计算机学会（CCF）的带领指导下，共同推进产学研用深度融合，共筑新一代开源创新服务平台GitLink！
-
+
+ + - }> + }>

Trustie 1.0阶段（2006年-2014年）

国防科技大学、北京大学、北京航空航天大学、中国科学院软件研究所等单位合作开展了基于网络的软件开发群体化方法与技术研究，揭示了以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，与软件开发工程化方法相结合，系统地提出了基于网络的软件开发群体化方法，并于2008年发布了可信的国家软件资源共享与协同生产环境（简称“Trustie v1.0”，中文简称“确实”），重点解决大规模软件协同开发、可信评估、运行监控和持续演化等问题。
@@ -59,49 +108,124 @@ function AboutUs(){
{/* 成果作用，确实有效 */} -
- -
-

成果作用，确实有效

+
+ +
+

成果作用，确实有效

    GitLink（确实开源）为我国创新型软件产业发展提供了关键技术支撑和实践指南，为各类开源创新活动以及我国军地开源社区建设提供了有效支撑，为推动开源创新发展和创新人才培养发挥了重要作用。    通过10多年的发展，GitLink平台显著提升了大型软件企业软件生产能力，支持了我国航空、航天、国防等多个关键领域的可信软件生产，为包括新一代人工智能启智社区、ARM绿色计算社区、科技部云计算与大数据木兰社区、科技委可控开源创造行动红山社区等的建设提供关键技术支撑，为我国关键领域开源社区生态建设发挥了重要作用！
{/* 平台统计 */} -
+
平台统计
- 联接海量群智资源，汇聚优秀开源组织，孵化优质创新成果 - - - - - - -
-

开发者

- 		-

组织

- 		-

仓库

-
+

联接海量群智资源，汇聚优秀开源组织，孵化优质创新成果

+ +
+
+ +

开发者

+
+
+ +

组织

+
+
+ +

仓库

+
+
{/* 加入我们 */} -
-
平台统计
- 联接海量群智资源，汇聚优秀开源组织，孵化优质创新成果 - +
+
+
加入我们
+

探索你的未来

+

GitLink团队在寻找新的小伙伴，期待着您的加入，让我们一起为开源创新贡献力量！

+ + {/* 轮播图 */} + +
+
+

前端开发工程师

+
+ 1、全日制本科及以上学历，5年以上Web前端开发经验，熟练使用Gulp、Webpack等构建工具；
+ 2、熟练掌握VUE编程，项目中使用过VUE；有前端模块化、组件化、自动化开发经验者优先；
+ 3、精通Java 、jQuery、Ajax、Json等技术，熟知各种前端框架，对vue，nodeJs等技术有所涉及；
+ 4、熟悉前端开发技术(HTML5、JS、JSON、XHTML、CSS3、ES6)，了解各项技术的相关标准，并严格按照标准进行开发；
+
+
+
+

后端开发工程师

+
+ 1、本科及以上学历，计算机科学与技术类，软件技术及其应用、软件工程专业相关专业；有金蝶人力资源系统项目实施经验优先
+ 2、3年以上Java开发相关经验、扎实的Java变成基础，参与过1个以上大/中兴高并发、高性能系统架构设计、开发和调优；
+ 3、熟练掌握Spring,SpringBoot,Spring MVC,MyBatis等开源框架，掌握MVC框架模式及BS架构；
+ 4、精通SQL、熟练使用MySQL,Oracle等数据库，并具有一定的SQL优化能力；熟悉Redis，MongoDB等常用NoSQL解决方案,了解各自的优缺点以及使用场景者优先。
+
+
+
+
+
+

软件测试工程师

+
+ 1、计算机相关专业本科以上学历（硬性要求）；
+ 2、一年以上软件测试经验，具有扎实的软件测试理论知识，深刻理解正规测试流程,并遵照执行测试流程；
+ 3、掌握多种软件测试方法，并能够独立编写测试用例及测试方案、测试报告；
+ 4、擅长功能测试，精通二进制等，能编写简单的代码，了解系统测试优先；
+ 5、有很强的质量和服务意识，沟通能力强，执行力好，能够承受较强的工作压力。
+
+
+
+

产品经理

+
+ 1、计算机、通讯或相关专业本科以上学历；3年以上工作经验。
+ 2、熟悉软件项目的管理流程，了解软件需求的调研方法，具备需求分析能力。
+ 3、能以专业的方式向客户提供技术咨询，良好的方案设计能力和文字功底；
+ 4、具备良好的交流、沟通和表达能力，良好的方案演示和介绍技巧；
+ 5、承受较强的工作压力，强烈的团队合作意识与工作责任心；
+ 6、有良好人际交往能力，工作积极主动，自信心强，有较强的学习能力
+
+
+
+ +

简历投递邮箱：zengyt@csxjy.

+
+
+ + {/* 合作单位 */} +
+
合作单位
+
- - - + + + + + + + + + + + + + + + + + + + + + + + + + +
-

开发者

- 		-

组织

- 		-

仓库

-
diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss index b3e9eccf5..3b4e1e7e3 100644 --- a/src/forge/AboutUs/AboutUs.scss +++ b/src/forge/AboutUs/AboutUs.scss @@ -1,7 +1,15 @@ .aboutUs_body{ font-size: 16px; + color: #182332; + font-family: PingFangSC-Regular, PingFang SC; & table{ text-align: center; + margin: 0 auto; + } + & .df{ + display: flex; + justify-content: space-around; + align-items: center; } } .aboutUs_head{ @@ -9,19 +17,22 @@ background-color: beige; } .aboutUs_title{ - display: flex; - justify-content: center; + width: 800px; height: 62px; - background: #FFFFFF; - box-shadow: 0px 2px 7px 2px rgba(7,26,70,0.12); + margin: 0 auto; + // justify-content: space-around; &>table{ width: 800px; font-weight: 400; } + & a.active{ + color: #466AFF; + height: 62px; + line-height: 62px; + border-bottom: 2px solid; + } } .aboutUs{ - width: 1200px; - margin: 0 auto; & .au_title{ font-size: 38px; font-weight: 500; @@ -32,25 +43,71 @@ } & .subtitle{ font-size: 20px; - font-weight: 500; + font-weight: bold; color: #000000; margin-bottom: 23px !important; } } .about_us{ + // 关于我们 + & .au_cont.df{ + justify-content: space-between; + } + & .au_bg{ background: linear-gradient(180deg, #F3F9FF 0%, rgba(255, 255, 255, 0) 100%);} & .cont1_introduction{ width: 472px; + &>div{ + line-height: 34px; + } + } + & .cont1_achievements{ + width: 581px; + & .subtitle.ml0{margin-left: 0;} + &>div{ + font-size: 15px; + line-height: 36px; + } + } + & .subtitleImg{ + width: 650px; + height: 330px; + } + & .achievementsImg{ + width: 507px; + height: 384px; } //时间轴 + & .inherit_items{ + position: relative; + & .quan1Img{ + width: 140px; + height: 167px; + position: absolute; + left: -290px; + top: 90px; + } + & .quan2Img{ + width: 100px; + height: 120px; + position: absolute; + right: -170px; + bottom: 80px; + } + } .inherit{ & .icon-a-yuanquan2x{ color: #466aff; } & .ant-timeline-item-tail{ border-left: 2px solid rgba(108, 134, 172, 0.42); + height: calc(100% - -30px); } & .ant-timeline-item:last-child .ant-timeline-item-tail{ display: block; + height: calc(100% - 18px); + } + & .ant-timeline-item-content{ + margin: 0 0 -15px 18px; } } .timeline_cont{ @@ -59,7 +116,7 @@ font-size: 20px; font-weight: 500; color: #466AFF; - margin: 45px 0 20px !important; + margin: 45px 0 30px !important; } &>div{ width: 980px; @@ -68,23 +125,129 @@ font-size: 15px; font-weight: 400; color: #182332; + line-height: 33px; &:after,&:before{ content: ""; position: absolute; - left: -10px; - top: 55px; - border-top: 6px solid transparent; - border-bottom: 6px solid transparent; - border-right: 10px solid #F5F7FA; + left: 21px; + top: 100px; + border-top: 10px solid transparent; + border-bottom: 10px solid transparent; + border-right: 14px solid #F5F7FA; } } } // 平台统计 &.statistics{ text-align: center; - & table{ + background: linear-gradient(180deg, #ECF3FF 0%, #FFFFFF 100%); + height: 640px; + overflow: hidden; + position: relative; + & .statistics_cont{ width: 1014px; - padding: 44px 150px; + height: 203px; + background: #FFFFFF; + opacity: 0.83; + position: absolute; + top: 230px; + left: 50%; + margin-left: -500px; + // justify-content: space-around; + & span{ + font-size: 48px; + font-weight: bold; + color: #1338D1; + } + & p{ + width: 111px; + height: 38px; + line-height: 38px; + border: 1px solid #182332; + margin: 0 auto; + font-size: 22px; + color: #1E1E1E; + } + } + & .earthImg{ + width: 1700px; + margin-top: -120px; + animation: moving 15s linear infinite; + } + @keyframes moving { + 0% { + transform: rotate(0deg); + } + 50% { + transform: rotate(180deg); + } + 100% { + transform: rotate(360deg); + } } } -} \ No newline at end of file +} +// 加入我们 +.join_us_bg{ + height: 710px; + margin-top: 40px; + background-image: url(./image/joinUs.png); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + & .au_cont{position: relative;} + & .joinUsImg{ + width: 610px; + height: 300px; + position: absolute; + top: 25px; + right: -40px; + } + & .df{ + display: flex !important; + justify-content: space-between; + margin-top: 30px; + } + & .position{ + width: 590px; + & p{ + justify-content: flex-start; + height: 60px; + background: #253DA0; + line-height: 60px; + padding-left: 20px; + & img{width: 30px;} + & span{ + font-weight: 500; + color: #FFFFFF; + line-height: 22px; + } + } + & div{ + height: 306px; + font-size: 14px; + line-height: 34px; + padding: 20px; + background: #FFFFFF;} + } + & .ant-carousel .slick-dots-bottom{bottom: -30px;} + & .ant-carousel .slick-dots li button{ + width: 12px; + height: 12px; + border-radius: 10px; + background: #466AFF; + } + & .delivery{height: 60px;line-height: 60px;} +} +//合作单位 +.unit{ + margin-bottom: 60px; + & img{ width: 224px;} +} +.au_cont{ + width: 1200px; + margin: 50px auto; + &.pl30 .subtitle{ + margin-left: -30px; + } +} diff --git a/src/forge/AboutUs/image/achievements.png b/src/forge/AboutUs/image/achievements.png new file mode 100644 index 000000000..5ffebdd34 Binary files /dev/null and b/src/forge/AboutUs/image/achievements.png differ diff --git a/src/forge/AboutUs/image/computer.png b/src/forge/AboutUs/image/computer.png new file mode 100644 index 000000000..d70c420cf Binary files /dev/null and b/src/forge/AboutUs/image/computer.png differ diff --git a/src/forge/AboutUs/image/earth.png b/src/forge/AboutUs/image/earth.png new file mode 100644 index 000000000..7cb766c1e Binary files /dev/null and b/src/forge/AboutUs/image/earth.png differ diff --git a/src/forge/AboutUs/image/img1.png b/src/forge/AboutUs/image/img1.png new file mode 100644 index 000000000..1ca1947ce Binary files /dev/null and b/src/forge/AboutUs/image/img1.png differ diff --git a/src/forge/AboutUs/image/img10.png b/src/forge/AboutUs/image/img10.png new file mode 100644 index 000000000..0e1d0934c Binary files /dev/null and b/src/forge/AboutUs/image/img10.png differ diff --git a/src/forge/AboutUs/image/img11.png b/src/forge/AboutUs/image/img11.png new file mode 100644 index 000000000..4c61dbe58 Binary files /dev/null and b/src/forge/AboutUs/image/img11.png differ diff --git a/src/forge/AboutUs/image/img12.png b/src/forge/AboutUs/image/img12.png new file mode 100644 index 000000000..5bb86e23f Binary files /dev/null and b/src/forge/AboutUs/image/img12.png differ diff --git a/src/forge/AboutUs/image/img13.png b/src/forge/AboutUs/image/img13.png new file mode 100644 index 000000000..251143525 Binary files /dev/null and b/src/forge/AboutUs/image/img13.png differ diff --git a/src/forge/AboutUs/image/img14.png b/src/forge/AboutUs/image/img14.png new file mode 100644 index 000000000..00293dffb Binary files /dev/null and b/src/forge/AboutUs/image/img14.png differ diff --git a/src/forge/AboutUs/image/img15.png b/src/forge/AboutUs/image/img15.png new file mode 100644 index 000000000..56228add7 Binary files /dev/null and b/src/forge/AboutUs/image/img15.png differ diff --git a/src/forge/AboutUs/image/img16.png b/src/forge/AboutUs/image/img16.png new file mode 100644 index 000000000..d3cbaa0cf Binary files /dev/null and b/src/forge/AboutUs/image/img16.png differ diff --git a/src/forge/AboutUs/image/img17.png b/src/forge/AboutUs/image/img17.png new file mode 100644 index 000000000..ba347abe6 Binary files /dev/null and b/src/forge/AboutUs/image/img17.png differ diff --git a/src/forge/AboutUs/image/img18.png b/src/forge/AboutUs/image/img18.png new file mode 100644 index 000000000..164122a23 Binary files /dev/null and b/src/forge/AboutUs/image/img18.png differ diff --git a/src/forge/AboutUs/image/img19.png b/src/forge/AboutUs/image/img19.png new file mode 100644 index 000000000..a3795f551 Binary files /dev/null and b/src/forge/AboutUs/image/img19.png differ diff --git a/src/forge/AboutUs/image/img2.png b/src/forge/AboutUs/image/img2.png new file mode 100644 index 000000000..a68c13203 Binary files /dev/null and b/src/forge/AboutUs/image/img2.png differ diff --git a/src/forge/AboutUs/image/img20.png b/src/forge/AboutUs/image/img20.png new file mode 100644 index 000000000..287d00e09 Binary files /dev/null and b/src/forge/AboutUs/image/img20.png differ diff --git a/src/forge/AboutUs/image/img3.png b/src/forge/AboutUs/image/img3.png new file mode 100644 index 000000000..d70e26c7d Binary files /dev/null and b/src/forge/AboutUs/image/img3.png differ diff --git a/src/forge/AboutUs/image/img4.png b/src/forge/AboutUs/image/img4.png new file mode 100644 index 000000000..867106fd7 Binary files /dev/null and b/src/forge/AboutUs/image/img4.png differ diff --git a/src/forge/AboutUs/image/img5.png b/src/forge/AboutUs/image/img5.png new file mode 100644 index 000000000..8c18d87ef Binary files /dev/null and b/src/forge/AboutUs/image/img5.png differ diff --git a/src/forge/AboutUs/image/img6.png b/src/forge/AboutUs/image/img6.png new file mode 100644 index 000000000..159e7608f Binary files /dev/null and b/src/forge/AboutUs/image/img6.png differ diff --git a/src/forge/AboutUs/image/img7.png b/src/forge/AboutUs/image/img7.png new file mode 100644 index 000000000..4036d1175 Binary files /dev/null and b/src/forge/AboutUs/image/img7.png differ diff --git a/src/forge/AboutUs/image/img8.png b/src/forge/AboutUs/image/img8.png new file mode 100644 index 000000000..35aa116e1 Binary files /dev/null and b/src/forge/AboutUs/image/img8.png differ diff --git a/src/forge/AboutUs/image/img9.png b/src/forge/AboutUs/image/img9.png new file mode 100644 index 000000000..632cde5f6 Binary files /dev/null and b/src/forge/AboutUs/image/img9.png differ diff --git a/src/forge/AboutUs/image/joinUs.png b/src/forge/AboutUs/image/joinUs.png new file mode 100644 index 000000000..a146c6496 Binary files /dev/null and b/src/forge/AboutUs/image/joinUs.png differ diff --git a/src/forge/AboutUs/image/position.png b/src/forge/AboutUs/image/position.png new file mode 100644 index 000000000..6b318af25 Binary files /dev/null and b/src/forge/AboutUs/image/position.png differ diff --git a/src/forge/AboutUs/image/quan1.png b/src/forge/AboutUs/image/quan1.png new file mode 100644 index 000000000..e515c401f Binary files /dev/null and b/src/forge/AboutUs/image/quan1.png differ diff --git a/src/forge/AboutUs/image/quan2.png b/src/forge/AboutUs/image/quan2.png new file mode 100644 index 000000000..bd6a264ee Binary files /dev/null and b/src/forge/AboutUs/image/quan2.png differ diff --git a/src/forge/AboutUs/image/subtitle.png b/src/forge/AboutUs/image/subtitle.png new file mode 100644 index 000000000..46e8b4de4 Binary files /dev/null and b/src/forge/AboutUs/image/subtitle.png differ