diff --git a/src/assets/banner.png b/src/assets/banner.png
deleted file mode 100644
index 2090cf8..0000000
Binary files a/src/assets/banner.png and /dev/null differ
diff --git a/src/assets/banner01.png b/src/assets/banner01.png
deleted file mode 100644
index 199770f..0000000
Binary files a/src/assets/banner01.png and /dev/null differ
diff --git a/src/assets/banner02.png b/src/assets/banner02.png
deleted file mode 100644
index ebbc9b8..0000000
Binary files a/src/assets/banner02.png and /dev/null differ
diff --git a/src/assets/image.png b/src/assets/image.png
new file mode 100644
index 0000000..9d187bd
Binary files /dev/null and b/src/assets/image.png differ
diff --git a/src/assets/join-space.png b/src/assets/join-space.png
deleted file mode 100644
index a0f271b..0000000
Binary files a/src/assets/join-space.png and /dev/null differ
diff --git a/src/common/portrait.styl b/src/common/portrait.styl
index 2c5f13e..0168ef0 100644
--- a/src/common/portrait.styl
+++ b/src/common/portrait.styl
@@ -69,6 +69,11 @@
padding-right: 24px;
}
+.px-10{
+ padding-left: 40px;
+ padding-right: 40px;
+}
+
.py-1{
padding-top: 4px;
padding-bottom: 4px;
diff --git a/src/components/HeadNav/HeadNav.vue b/src/components/HeadNav/HeadNav.vue
index 93ae349..ce87d73 100644
--- a/src/components/HeadNav/HeadNav.vue
+++ b/src/components/HeadNav/HeadNav.vue
@@ -1,7 +1,7 @@
-
+

-
+
-
-
-
- 点击查看购物车!
-
-
-
-
-
-
+
+
+
+
+ 点击查看购物车!
+
+
+
+
+
+
+
@@ -202,32 +203,43 @@ export default {
height: 80px;
width: 100%;
background: white;
- position: relative;
-}
-
-.icon-head {
- font-size: 24px;
- position: absolute;
- top: 28px;
- cursor: pointer;
-}
-
-.li-box {
- line-height: 80px;
- position: absolute;
- height: 80px;
- top: 0;
- left: 250px;
+ // position: relative;
}
.list-down {
margin-right: 20px;
+ font-size: 16px;
color: rgba(0, 0, 0, 0.65);
}
.logo-img {
height: 50px;
- margin-top: 15px;
- margin-left: 48px;
+}
+
+.icon-head {
+ font-size: 24px;
+}
+
+.icon-head-right {
+ margin-right: 32px;
+}
+
+@media only screen and (max-width: 1400px) {
+ .list-down {
+ margin-right: 18px;
+ font-size: 14px;
+ }
+
+ .logo-img {
+ height: 44px;
+ }
+
+ .icon-head {
+ font-size: 24px;
+ }
+
+ .icon-head-right {
+ margin-right: 24px;
+ }
}
diff --git a/src/components/Rotation/Rotation.vue b/src/components/Rotation/Rotation.vue
index 2faea94..e9251fc 100644
--- a/src/components/Rotation/Rotation.vue
+++ b/src/components/Rotation/Rotation.vue
@@ -14,7 +14,7 @@ import { queryRotation } from 'config/api';
export default {
data() {
return {
- time: 3000,
+ time: 10000,
lists: [],
};
},
diff --git a/src/store/modules/home/state.js b/src/store/modules/home/state.js
index 91245d7..c34d6b0 100644
--- a/src/store/modules/home/state.js
+++ b/src/store/modules/home/state.js
@@ -33,7 +33,7 @@ const state = {
},
achCurrent: 1, // 知识产权与技术转移转化服务平台-成果列表页数
achId: 0, // 知识产权与技术转移转化服务平台-成果详情页Id
- listState: 0, // 科技资源开放共享服务平台-列表展示数据(0:实验室,1:仪器//默认0, 2:研究院,3:产品)
+ listState: 0, // 科技资源开放共享服务平台-列表展示数据(0:成果,1:仪器//默认0, 2:研究院,3:产品)
shareCurrent: 1, // 科技资源开放共享服务平台-列表当前处于第几页
labList: [], // 科技资源开放共享服务平台-实验室所选类型
LabIpt: {
diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue
index b8d620f..da7b229 100644
--- a/src/views/Activity/ActDetails.vue
+++ b/src/views/Activity/ActDetails.vue
@@ -19,7 +19,11 @@
-
+
diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue
index 6fd42ec..2864e34 100644
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@@ -37,8 +37,11 @@
地点:{{ item.address }}
-
- 报名已结束
+ 报名已结束
+
@@ -172,6 +175,18 @@ export default {
this.setActDetail(item);
this.$router.push('/ActDetails');
},
+
+ // 转换时间戳
+ formatDate() {
+ var date = new Date('2020-04-07 18:08:58');
+ // 有三种方式获取
+ var time1 = date.getTime();
+ var time2 = date.valueOf();
+ var time3 = Date.parse(date);
+ console.log(time1); //1586254138000
+ console.log(time2); //1586254138000
+ console.log(time3); //1586254138000
+ },
},
};
diff --git a/src/views/Activity/components/Enroll.vue b/src/views/Activity/components/Enroll.vue
index b767d45..cd689cb 100644
--- a/src/views/Activity/components/Enroll.vue
+++ b/src/views/Activity/components/Enroll.vue
@@ -1,26 +1,332 @@
-
立即报名
+
立即报名
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
获取验证码
+
+
+
+
+
+
+
重新发送 {{ interval }}
+
获取验证码
+
+
+
+
-
+
diff --git a/src/views/FirstPage/FirstPage.vue b/src/views/FirstPage/FirstPage.vue
index ec033b6..20f7666 100644
--- a/src/views/FirstPage/FirstPage.vue
+++ b/src/views/FirstPage/FirstPage.vue
@@ -89,16 +89,10 @@ export default {
},
{
id: '07',
- firstName: '知识培训服务平台',
- secondName: '',
+ firstName: '知识培训与科技人才',
+ secondName: '服务平台',
url: '/NewPlatform/NewService',
},
- {
- id: '08',
- firstName: '知识培训服务平台',
- secondName: '',
- url: '/Knowledge',
- },
],
lists: [
{
diff --git a/src/views/IncubationPlatform/Children/Incubator.vue b/src/views/IncubationPlatform/Children/Incubator.vue
index e0001e6..9e32fa3 100644
--- a/src/views/IncubationPlatform/Children/Incubator.vue
+++ b/src/views/IncubationPlatform/Children/Incubator.vue
@@ -5,7 +5,10 @@
-
+
+
+

+
diff --git a/src/views/IncubationPlatform/Children/MakerSpace.vue b/src/views/IncubationPlatform/Children/MakerSpace.vue
index cf6e604..ba2191e 100644
--- a/src/views/IncubationPlatform/Children/MakerSpace.vue
+++ b/src/views/IncubationPlatform/Children/MakerSpace.vue
@@ -1,6 +1,8 @@
-
+
+
+
diff --git a/src/views/IncubationPlatform/Children/Services.vue b/src/views/IncubationPlatform/Children/Services.vue
index 2e346b4..c9ea66d 100644
--- a/src/views/IncubationPlatform/Children/Services.vue
+++ b/src/views/IncubationPlatform/Children/Services.vue
@@ -8,7 +8,7 @@
服务流程
-

+
diff --git a/src/views/IncubationPlatform/components/AddModel.vue b/src/views/IncubationPlatform/components/AddModel.vue
index d9c5653..706a506 100644
--- a/src/views/IncubationPlatform/components/AddModel.vue
+++ b/src/views/IncubationPlatform/components/AddModel.vue
@@ -1,6 +1,12 @@
diff --git a/src/views/Industry/Children/Union.vue b/src/views/Industry/Children/Union.vue
index 8529933..984c1a2 100644
--- a/src/views/Industry/Children/Union.vue
+++ b/src/views/Industry/Children/Union.vue
@@ -5,7 +5,7 @@
-
创新挑战
+
产业创新联盟
山西绿谷生物科技股份有限公司立足功能食品、生物医药和大健康产业,聚焦“创新”、聚力“孵化”、聚合“产业”,
致力建设集创新链、孵化链和产业链为一体,产学研协同、多学科交叉、大中小企业融通、
diff --git a/src/views/NewPlatform/Children/AchDet.vue b/src/views/NewPlatform/Children/AchDet.vue
index d935164..87c58e1 100644
--- a/src/views/NewPlatform/Children/AchDet.vue
+++ b/src/views/NewPlatform/Children/AchDet.vue
@@ -1,11 +1,11 @@
-
![]()
-
+
![]()
+
{{ obj.name }}
-
+
成果名字:
学科分类:
联系人:
@@ -16,16 +16,38 @@
{{ obj.name }}
-
{{ obj.classification }}
+
{{ obj.classification === 0 ? '中医药学' : '' }}
- {{ item.contactsName }}
+ {{ item.contactsName }}
- {{ item.contactsPhone }}
+ {{ item.contactsPhone }}
+
+
+ {{ obj.layout === 0 ? '产权转让' :
+ obj.layout === 1 ? '资金入股' :
+ obj.layout === 2 ? '技术入股' :
+ obj.layout === 3 ? '合作开发' :
+ obj.layout === 0 ? '技术服务' : '其他'}}
+
+
+ {{ obj.performance === 0 ? '国际标准' :
+ obj.performance === 1 ? '国家标准' :
+ obj.performance === 2 ? '行业标准' :
+ obj.performance === 3 ? '地方标准' :
+ obj.performance === 4 ? '企业标准' :
+ obj.performance === 5 ? '新技术' :
+ obj.performance === 6 ? '新工艺' :
+ obj.performance === 7 ? '新产品' :
+ obj.performance === 8 ? '新材料' :
+ obj.performance === 9 ? '新装备' :
+ obj.performance === 10 ? '农业、生物新品种' :
+ obj.performance === 11 ? '矿产新品种' : '其他应用技术'}}
+
+
+ {{ obj.stage === 0 ? '初期阶段' :
+ obj.stage === 1 ? '中期阶段' : '成熟应用阶段' }}
-
{{ obj.layout }}
-
{{ obj.performance }}
-
{{ obj.stage }}
@@ -90,7 +112,6 @@ export default {
}
.equ-info {
- height: 300px;
border-bottom: 1px solid rgba(0, 0, 0, 0.14901960784313725);
position: relative;
diff --git a/src/views/NewPlatform/Children/Platform.vue b/src/views/NewPlatform/Children/Platform.vue
index 29dae31..c6ad203 100644
--- a/src/views/NewPlatform/Children/Platform.vue
+++ b/src/views/NewPlatform/Children/Platform.vue
@@ -62,7 +62,7 @@ export default {
url: '/NewPlatform/Transfer',
},
{
- title: '创新服务',
+ title: '知识培训与科技人才服务平台',
content: '技术培训、管理培训、知识讲座',
imgUrl: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210104/f5fb570cfd7547279138a591818325e0.jpg',
url: '/NewPlatform/Develop',
diff --git a/src/views/NewPlatform/Children/Service.vue b/src/views/NewPlatform/Children/Service.vue
index a12321d..a887031 100644
--- a/src/views/NewPlatform/Children/Service.vue
+++ b/src/views/NewPlatform/Children/Service.vue
@@ -8,7 +8,7 @@
服务流程
-

+
diff --git a/src/views/NewPlatform/Children/ShareChild/InsDet.vue b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
index c5a3409..522729a 100644
--- a/src/views/NewPlatform/Children/ShareChild/InsDet.vue
+++ b/src/views/NewPlatform/Children/ShareChild/InsDet.vue
@@ -22,10 +22,16 @@
{{ obj.specifications }}
{{ obj.performance }}
- {{ item.contactsName }}、
+
+ {{ item.contactsName }}
+ 、
+
- {{ item.contactsPhone }}、
+
+ {{ item.contactsPhone }}
+ 、
+
@@ -39,7 +45,10 @@
{{ obj.companyname }}
{{ obj.identifier }}
- {{ item.contactsName }}、
+
+ {{ item.contactsName }}
+ 、
+
@@ -165,6 +174,7 @@ export default {
opacity: 1;
p {
+ height: 24px;
margin-bottom: 6px;
}
}
@@ -177,6 +187,7 @@ export default {
opacity: 1;
p {
+ height: 24px;
margin-bottom: 6px;
}
}
diff --git a/src/views/Policy/components/PolicyList.vue b/src/views/Policy/components/PolicyList.vue
index e0efdfd..14dd928 100644
--- a/src/views/Policy/components/PolicyList.vue
+++ b/src/views/Policy/components/PolicyList.vue
@@ -9,9 +9,10 @@
- 部委
- 山西
- 山西转型综改示范区
+ 国家
+ 山西省
+ 山西省综改区
+ 太原市