From 70119019f515aee4eae1b82d4d5d70cff16b38b5 Mon Sep 17 00:00:00 2001 From: lucky Date: Mon, 25 Jan 2021 14:12:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/platform.styl | 14 ++- src/components/PlatformList/PlatformList.vue | 20 ++- .../Children/MakerSpace.vue | 31 ++++- .../Children/place/EntitySpace.vue | 28 ++--- src/views/NewPlatform/Children/Core.vue | 4 +- src/views/NewPlatform/Children/Platform.vue | 3 +- src/views/NewPlatform/Children/Service.vue | 118 ++++++++++++++---- .../Children/ShareChild/Institute.vue | 11 +- 8 files changed, 164 insertions(+), 65 deletions(-) diff --git a/src/common/platform.styl b/src/common/platform.styl index c07ef2d..3eda30d 100644 --- a/src/common/platform.styl +++ b/src/common/platform.styl @@ -70,10 +70,11 @@ } .center-content { float: right; - margin: 160px 0; + margin: 80px 0; width: 79%; line-height: 36px; font-size: 16px; + } @@ -141,15 +142,24 @@ position: relative; padding: 0 9%; } + +.space-box:hover{ + box-shadow: 0 6px 6px rgba(0,0,0,0.16) +} + +.space-box:hover .introduce-title{ + margin-top: 20px; +} + .introduce-box { width: 60%; overflow: hidden; position: relative; background: #fff; - box-shadow: 0 3px 6px rgba(0,0,0,0.16) cursor: pointer; padding: 30px; } + .introduce-title { margin-top: 24px; font-size: 30px; diff --git a/src/components/PlatformList/PlatformList.vue b/src/components/PlatformList/PlatformList.vue index d15b164..10c1d0a 100644 --- a/src/components/PlatformList/PlatformList.vue +++ b/src/components/PlatformList/PlatformList.vue @@ -4,17 +4,14 @@

{{ item.name }}

-

了解更多→

+

了解更多→

@@ -231,14 +228,15 @@ export default { width: 20.5%; margin-right: 6%; border-radius: 4px; - position: relative; - margin-bottom: 50px; + // position: relative; + margin-bottom: 30px; } .title { text-align: center; - position: absolute; - bottom: 0; + // position: absolute; + // bottom: 0; + height: 48px; width: 100%; color: rgba(0, 0, 0, 0.85); font-size: 28px; @@ -267,7 +265,7 @@ export default { } .con-img { - height: 100%; + height: 270px; width: 100%; border: none; } diff --git a/src/views/IncubationPlatform/Children/MakerSpace.vue b/src/views/IncubationPlatform/Children/MakerSpace.vue index c1e5084..c9ba253 100644 --- a/src/views/IncubationPlatform/Children/MakerSpace.vue +++ b/src/views/IncubationPlatform/Children/MakerSpace.vue @@ -24,7 +24,10 @@
目前空间已引入科创咨询专业服务机构，并与多家 - 第三方专业机构 + 第三方专业机构 建立战略合作，聘请 创业导师 30余名，服务领域涵盖专业技术、企业管理、科创咨询、财务税务、法务咨询等，可随时为入孵企业提供针 对性、一对一创业辅导服务。 @@ -38,20 +41,36 @@
-
+
-

{{ item.title }}

+

{{ item.title }}

实体空间由 孵化场所、 公共实验室、 中试基地部分组成。

-

{{ item.content }}

+

{{ item.content }}

- +
-
+

{{ item.title }}

diff --git a/src/views/IncubationPlatform/Children/place/EntitySpace.vue b/src/views/IncubationPlatform/Children/place/EntitySpace.vue index 6351b40..e355b69 100644 --- a/src/views/IncubationPlatform/Children/place/EntitySpace.vue +++ b/src/views/IncubationPlatform/Children/place/EntitySpace.vue @@ -45,9 +45,10 @@ 拥有20万以上仪器设备26台套，包括AKTA蛋白纯化系统、多功能酶标仪、原子吸收光谱仪、 液相色谱仪、万级无菌工作间、P2实验室等多种高端、大型实验仪器设备；可提供生物医药、 食品检测、食用菌、肠道微生物等方面的科学实验、检验检测、小试中试等技术服务与科研成果转化。 -
-
- +
@@ -58,16 +59,15 @@
发酵工程中试基地位于山西维尔乳制品有限公司，基地具有发酵乳制品等生产加工条件，可提供微生物发酵实验及相关中试。
-
- 超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。 -
+
超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。
干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司 ，拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件，可提供相关中试研究。
-
-
- +
@@ -321,16 +321,6 @@ export default { } .center-img { - float: right; - margin-top: -150px; width: 79%; - margin-bottom: 160px; - text-align: left; - line-height: 36px; - font-size: 16px; - - img { - width: 80%; - } } diff --git a/src/views/NewPlatform/Children/Core.vue b/src/views/NewPlatform/Children/Core.vue index ce895fe..a324e81 100644 --- a/src/views/NewPlatform/Children/Core.vue +++ b/src/views/NewPlatform/Children/Core.vue @@ -150,13 +150,13 @@ export default { type: 'tree', data: this.treedata, top: '2%', - left: '12%', + left: '6%', bottom: '1%', right: '40%', symbolSize: 7, lineStyle: { width: 4 }, itemStyle: { borderWidth: 3, borderColor: '#AACD06' }, - label: { position: 'left', verticalAlign: 'middle', align: 'right', fontSize: 16 }, + label: { position: 'top', verticalAlign: 'middle', align: 'center', fontSize: 16 }, leaves: { label: { position: 'right', diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue index 28a6e92..5c05d21 100644 --- a/src/views/NewPlatform/Children/Platform.vue +++ b/src/views/NewPlatform/Children/Platform.vue @@ -115,7 +115,7 @@ export default { @media only screen and (max-width: 1650px) { .con-title { - font-size: 1rem; + font-size: 1.3rem; } } @@ -126,5 +126,6 @@ export default { display: flex; justify-content: center; align-items: center; + font-size: 16px; } diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue index 78e7692..2397d56 100644 --- a/src/views/NewPlatform/Children/Service.vue +++ b/src/views/NewPlatform/Children/Service.vue @@ -12,53 +12,129 @@
-
+
-

- {{ item.name }} +

+ {{ item.name }}

{{ item.intro }}

+ >了解更多→

-->
- + - + - + - - + + - +
- + 获取验证码
- +
- 重新发送 {{ interval }} - - 获取验证码 - + 重新发送 {{ interval }} + 获取验证码
- - + + - - - 点击上传附件 + + + + 点击上传附件 + diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue index de04691..c900048 100644 --- a/src/views/NewPlatform/Children/ShareChild/Institute.vue +++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue @@ -4,13 +4,18 @@
- +

{{ shareName }}

-
{{ description }}
+
{{ description }}

设备列表

-
+

{{ item.name }}

了解更多→

From 2290e9ead8cf407fbba921703f37eacaf7ecfe02 Mon Sep 17 00:00:00 2001 From: lucky Date: Mon, 25 Jan 2021 14:18:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Activity/components/Enroll.vue | 96 +++++++++++++++--- .../IncubationPlatform/Children/Products.vue | 11 ++- .../IncubationPlatform/Children/Services.vue | 98 ++++++++++++++++--- src/views/NewPlatform/Children/Share.vue | 22 +++-- .../Children/ShareChild/Institute.vue | 15 ++- src/views/NewPlatform/Children/Transfer.vue | 12 ++- src/views/User/Login.vue | 87 +++++++++++++--- 7 files changed, 279 insertions(+), 62 deletions(-) diff --git a/src/views/Activity/components/Enroll.vue b/src/views/Activity/components/Enroll.vue index 9b12796..7dc8719 100644 --- a/src/views/Activity/components/Enroll.vue +++ b/src/views/Activity/components/Enroll.vue @@ -2,44 +2,110 @@
立即报名 - + - + - + - +
- +
- + - - + + - +
- + 获取验证码
- +
- 重新发送 {{ interval }} - 获取验证码 + 重新发送 {{ interval }} + 获取验证码
diff --git a/src/views/IncubationPlatform/Children/Products.vue b/src/views/IncubationPlatform/Children/Products.vue index 353c1b2..97aad8c 100644 --- a/src/views/IncubationPlatform/Children/Products.vue +++ b/src/views/IncubationPlatform/Children/Products.vue @@ -16,11 +16,16 @@ @click="choose(index)" class="ins-name" v-for="(item, index) in productLists" - >{{ item.name }} + >{{ item.name }}
- +
diff --git a/src/views/IncubationPlatform/Children/Services.vue b/src/views/IncubationPlatform/Children/Services.vue index 1afb5df..3ae868f 100644 --- a/src/views/IncubationPlatform/Children/Services.vue +++ b/src/views/IncubationPlatform/Children/Services.vue @@ -42,36 +42,94 @@ v-show="total > 8" />
- + - + - + - - + + - +
- + 获取验证码
- +
- 重新发送 {{ interval }} - 获取验证码 + 重新发送 {{ interval }} + 获取验证码
- - + + - - 点击上传附件 + + + 点击上传附件 + diff --git a/src/views/NewPlatform/Children/Share.vue b/src/views/NewPlatform/Children/Share.vue index e72881c..46877c9 100644 --- a/src/views/NewPlatform/Children/Share.vue +++ b/src/views/NewPlatform/Children/Share.vue @@ -15,11 +15,16 @@ @click="choose(index, 0)" class="ins-name" v-for="(item, index) in laboratory" - >{{ item.name }} + >{{ item.name }}
- +
@@ -31,11 +36,16 @@ @click="choose(index, 1)" class="ins-name" v-for="(item, index) in instrument" - >{{ item.name }} + >{{ item.name }}
- +
diff --git a/src/views/NewPlatform/Children/ShareChild/Institute.vue b/src/views/NewPlatform/Children/ShareChild/Institute.vue index ada0872..e2309e4 100644 --- a/src/views/NewPlatform/Children/ShareChild/Institute.vue +++ b/src/views/NewPlatform/Children/ShareChild/Institute.vue @@ -21,7 +21,10 @@

了解更多→

-

人才团队带头人情况

+

人才团队带头人情况

姓名

@@ -36,7 +39,11 @@

工作单位

研究方向

-
+

{{ teamHead.name }}

男 @@ -84,12 +91,12 @@