diff --git a/README.md b/README.md index b9d12b6..f66fd7d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# green-valley +# wiki ## Project setup ``` diff --git a/package-lock.json b/package-lock.json index e142424..57f71d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "green-valley", + "name": "wiki", "version": "0.1.0", "lockfileVersion": 2, "requires": true, @@ -24586,8 +24586,8 @@ }, "moment": { "version": "2.29.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", - "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" + "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&sync_timestamp=1601983423917&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz", + "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=" }, "move-concurrently": { "version": "1.0.1", diff --git a/package.json b/package.json index f44ffc0..07f305d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "green-valley", + "name": "wiki", "version": "0.1.0", "private": true, "scripts": { diff --git a/src/assets/arrow.png b/src/assets/arrow.png deleted file mode 100644 index 8d121ac..0000000 Binary files a/src/assets/arrow.png and /dev/null differ diff --git a/src/assets/build.png b/src/assets/build.png deleted file mode 100644 index a7129cb..0000000 Binary files a/src/assets/build.png and /dev/null differ diff --git a/src/assets/bullhorn.png b/src/assets/bullhorn.png deleted file mode 100644 index 2b3a466..0000000 Binary files a/src/assets/bullhorn.png and /dev/null differ diff --git a/src/assets/fwcs01.png b/src/assets/fwcs01.png new file mode 100644 index 0000000..5d045d6 Binary files /dev/null and b/src/assets/fwcs01.png differ diff --git a/src/assets/fwcs02.png b/src/assets/fwcs02.png new file mode 100644 index 0000000..408b662 Binary files /dev/null and b/src/assets/fwcs02.png differ diff --git a/src/assets/fwcs03.png b/src/assets/fwcs03.png new file mode 100644 index 0000000..cda2156 Binary files /dev/null and b/src/assets/fwcs03.png differ diff --git a/src/assets/image.jpeg b/src/assets/image.jpeg deleted file mode 100644 index 74710e5..0000000 Binary files a/src/assets/image.jpeg and /dev/null differ diff --git a/src/assets/image.png b/src/assets/image.png deleted file mode 100644 index 9d187bd..0000000 Binary files a/src/assets/image.png and /dev/null differ diff --git a/src/assets/index01.png b/src/assets/index01.png new file mode 100644 index 0000000..696e4a8 Binary files /dev/null and b/src/assets/index01.png differ diff --git a/src/assets/index02.png b/src/assets/index02.png new file mode 100644 index 0000000..8118895 Binary files /dev/null and b/src/assets/index02.png differ diff --git a/src/assets/index03.png b/src/assets/index03.png new file mode 100644 index 0000000..a6e60a4 Binary files /dev/null and b/src/assets/index03.png differ diff --git a/src/assets/index04.png b/src/assets/index04.png new file mode 100644 index 0000000..072e520 Binary files /dev/null and b/src/assets/index04.png differ diff --git a/src/assets/index05.png b/src/assets/index05.png new file mode 100644 index 0000000..89a2cdd Binary files /dev/null and b/src/assets/index05.png differ diff --git a/src/assets/index06.png b/src/assets/index06.png new file mode 100644 index 0000000..4317f46 Binary files /dev/null and b/src/assets/index06.png differ diff --git a/src/assets/jiagou.png b/src/assets/jiagou.png deleted file mode 100644 index 97fd08b..0000000 Binary files a/src/assets/jiagou.png and /dev/null differ diff --git a/src/assets/join-us.png b/src/assets/join-us.png deleted file mode 100644 index c19b566..0000000 Binary files a/src/assets/join-us.png and /dev/null differ diff --git a/src/assets/logo-h.png b/src/assets/logo-h.png new file mode 100644 index 0000000..00022cb Binary files /dev/null and b/src/assets/logo-h.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 5421d53..d0e6a06 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/logo_bottom.png b/src/assets/logo_bottom.png index 5d24d80..5b0f71b 100644 Binary files a/src/assets/logo_bottom.png and b/src/assets/logo_bottom.png differ diff --git a/src/assets/new01.png b/src/assets/new01.png deleted file mode 100644 index 25abc35..0000000 Binary files a/src/assets/new01.png and /dev/null differ diff --git a/src/assets/new02.png b/src/assets/new02.png deleted file mode 100644 index 3aafb78..0000000 Binary files a/src/assets/new02.png and /dev/null differ diff --git a/src/assets/server01.png b/src/assets/server01.png deleted file mode 100644 index 18af48b..0000000 Binary files a/src/assets/server01.png and /dev/null differ diff --git a/src/assets/server02.png b/src/assets/server02.png deleted file mode 100644 index 379c297..0000000 Binary files a/src/assets/server02.png and /dev/null differ diff --git a/src/assets/server03.png b/src/assets/server03.png deleted file mode 100644 index 8704faf..0000000 Binary files a/src/assets/server03.png and /dev/null differ diff --git a/src/assets/settleIn.png b/src/assets/settleIn.png deleted file mode 100644 index f923591..0000000 Binary files a/src/assets/settleIn.png and /dev/null differ diff --git a/src/common/portrait.styl b/src/common/portrait.styl index b7f8244..046ac89 100644 --- a/src/common/portrait.styl +++ b/src/common/portrait.styl @@ -39,6 +39,10 @@ padding-bottom: 40px; } +.pt-10 { + padding-top: 40px; +} + .px-1{ padding-left: 4px; padding-right: 4px; @@ -99,6 +103,11 @@ padding-bottom: 20px; } +.py-8{ + padding-top: 32px; + padding-bottom: 32px; +} + .py-10{ padding-top: 40px; padding-bottom: 40px; @@ -138,6 +147,31 @@ margin-bottom: 20px; } +.my-6{ + margin-top: 24px; + margin-bottom: 24px; +} + +.my-7{ + margin-top: 28px; + margin-bottom: 28px; +} + +.my-8{ + margin-top: 32px; + margin-bottom: 32px; +} + +.my-9{ + margin-top: 36px; + margin-bottom: 36px; +} + +.my-10{ + margin-top: 40px; + margin-bottom: 40px; +} + .mt-1{ margin-top: 4px; } @@ -263,6 +297,11 @@ background: white; } +.grey { + background: #DCDCDC; +} + + // flex .d-flex{ display: flex; @@ -300,6 +339,10 @@ justify-content: space-between; } +.justify-space-around{ + justify-content: space-around; +} + .align-center{ align-items: center } @@ -378,6 +421,19 @@ img{ font-size: 32px; } +.font-bold-30{ + font-size: 30px; + font-weight: bold; +} + +.font-30{ + font-size: 30px; +} + +.font-26{ + font-size: 26px; +} + .font-bold-24{ font-size: 24px; font-weight: bold; @@ -387,6 +443,15 @@ img{ font-size: 24px; } +.font-22{ + font-size: 22px; +} + +.font-bold-22{ + font-size: 22px; + font-weight: bold; +} + .font-20{ font-size: 20px; } @@ -396,6 +461,15 @@ img{ font-weight: bold; } +.font-bold-18{ + font-size: 18px; + font-weight: bold; +} + +.font-18{ + font-size: 18px; +} + .font-bold-16{ font-size: 16px; font-weight: bold; @@ -429,7 +503,7 @@ h2{ } .baseColor{ - color: #13ACC4 + color: #007CC1 } .bg{ @@ -437,24 +511,34 @@ h2{ } .ant-btn { - color: #13acc4 !important; - border-color: #13acc4 !important; + color: #E77816 !important; + border-color: #E77816 !important; } .ant-btn-primary{ - background-color: #13ACC4 - border-color: #13ACC4; + background-color: #E77816 + border-color: #E77816; color: #fff!important; } +.ant-btn-primary:hover, .ant-btn-primary:focus{ + color: #E77816; + background-color: #E77816 +} + .ant-btn-link:hover, .ant-btn-link:focus{ - color: #13ACC4; + color: #E77816; + background-color: #E77816 } .ant-btn-link{ border-color: transparent!important; } +.ant-btn-primary:active, .ant-btn-primary.active{ + background-color: #E77816!important; +} + .ant-btn-primary-disabled, .ant-btn-primary.disabled, .ant-btn-primary[disabled], .ant-btn-primary-disabled:hover, .ant-btn-primary.disabled:hover, .ant-btn-primary[disabled]:hover, .ant-btn-primary-disabled:focus, .ant-btn-primary.disabled:focus, .ant-btn-primary[disabled]:focus, .ant-btn-primary-disabled:active, .ant-btn-primary.disabled:active, .ant-btn-primary[disabled]:active, .ant-btn-primary-disabled.active, .ant-btn-primary.disabled.active, .ant-btn-primary[disabled].active{ border-color: #d9d9d9!important; color: rgba(0, 0, 0, 0.25)!important; @@ -470,13 +554,15 @@ h2{ } .base-bg{ - background: #13ACC4 + background: #007CC1 } .second-base-bg{ background: #AACD06 } + + // 文字颜色 .white--text{ color: #fff diff --git a/src/components/FooterPage/FooterPage.vue b/src/components/FooterPage/FooterPage.vue index 3b94734..30294e0 100644 --- a/src/components/FooterPage/FooterPage.vue +++ b/src/components/FooterPage/FooterPage.vue @@ -8,7 +8,7 @@
发现
创新挑战 - 创新平台 + 服务超市 孵化平台 产业平台 在线社区 @@ -17,15 +17,13 @@
资讯
行业资讯 活动公告 - 国家政策 - 行业资讯 - 省级政策 + 政策查询
联系我们
我要入驻 人才招聘 -
400-789-789
+
400-789-789
- + {{ item.name }}   - + {{ con.title }} @@ -20,7 +30,11 @@ - + @@ -38,23 +52,23 @@ export default { list: [ { name: '创新政策', - url: '', + url: '/Policy', }, { name: '服务超市', - url: '', + url: '/ServiceMarket/Institute', children: [ { title: '智慧创新研究院', - url: '', + url: '/ServiceMarket/Institute', }, { title: '科技创新服务', - url: '', + url: '/ServiceMarket/InnovativeService', }, { title: '合作伙伴', - url: '', + url: '/ServiceMarket/Partner', }, ], }, diff --git a/src/components/Introduce/AddShopping.vue b/src/components/Introduce/AddShopping.vue new file mode 100644 index 0000000..7673787 --- /dev/null +++ b/src/components/Introduce/AddShopping.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/components/Introduce/IntentionModel.vue b/src/components/Introduce/IntentionModel.vue new file mode 100644 index 0000000..d400434 --- /dev/null +++ b/src/components/Introduce/IntentionModel.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/components/Rotation/Rotation.vue b/src/components/Rotation/Rotation.vue index e9251fc..f860213 100644 --- a/src/components/Rotation/Rotation.vue +++ b/src/components/Rotation/Rotation.vue @@ -1,6 +1,5 @@