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 @@ - + 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 @@