rose 5 years ago
parent
commit
69a65f81c4
  1. 2
      src/common/portrait.styl
  2. 2
      src/components/Introduce/SettledModel.vue
  3. 15
      src/components/PlatformList/Fruit.vue
  4. 23
      src/components/PlatformList/PlatformList.vue
  5. 33
      src/views/Activity/Activity.vue
  6. 2
      src/views/FirstPage/FirstPage.vue
  7. 37
      src/views/IncubationPlatform/Children/place/EntitySpace.vue
  8. 11
      src/views/NewPlatform/Children/AchDet.vue
  9. 34
      src/views/Policy/components/PolicyList.vue

2
src/common/portrait.styl

@ -357,7 +357,7 @@
// other // other
.inner { .inner {
width: 90%; width: 1rem;
margin: 0 auto; margin: 0 auto;
} }

2
src/components/Introduce/SettledModel.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<a-button @click="showModal" type="primary">加入我们</a-button> <a-button style="width:90%" @click="showModal" type="primary">加入我们</a-button>
<a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%"> <a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%">
<a-form :form="form" v-if="current === 0"> <a-form :form="form" v-if="current === 0">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称" required> <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="公司名称" required>

15
src/components/PlatformList/Fruit.vue

@ -4,10 +4,10 @@
<div <div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index" :key="index"
class="item-box" class="item-box1"
v-for="(item, index) in list" v-for="(item, index) in list"
> >
<p @click="detail(item.id)" class="font-24 my-3" style="cursor: pointer">{{ item.name }}</p> <p @click="detail(item.id)" class="font-20 my-1" style="cursor: pointer">{{ item.name }}</p>
<p <p
@click="detail(item.id)" @click="detail(item.id)"
class="font-16" class="font-16"
@ -115,6 +115,9 @@ export default {
margin: 40px 0; margin: 40px 0;
text-align: right; text-align: right;
} }
p{
margin: 10px
}
.item-box { .item-box {
position: relative; position: relative;
@ -139,4 +142,12 @@ export default {
margin-bottom: 0 !important; margin-bottom: 0 !important;
margin-top: 0.3rem; margin-top: 0.3rem;
} }
.item-box1 {
position: relative;
width: 100%;
background: #fff;
border-radius: 4px;
padding: 0 1rem;
}
</style> </style>

23
src/components/PlatformList/PlatformList.vue

@ -228,13 +228,7 @@ export default {
text-align: right; text-align: right;
} }
// .item-box {
// width: 41%;
// margin-right: 6%;
// border-radius: 4px;
// // position: relative;
// margin-bottom: 30px;
// }
.title { .title {
text-align: center; text-align: center;
@ -246,20 +240,6 @@ export default {
font-size: 24px; font-size: 24px;
} }
@media screen and (min-width: 1400px) and (max-width: 1650px) {
.title {
height: 48px;
font-size: 20px;
}
}
@media only screen and (max-width: 1400px) {
.title {
height: 48px;
font-size: 16px;
}
}
.margin-0 { .margin-0 {
margin-right: 0 !important; margin-right: 0 !important;
} }
@ -269,4 +249,5 @@ export default {
width: 100%; width: 100%;
border: none; border: none;
} }
</style> </style>

33
src/views/Activity/Activity.vue

@ -45,8 +45,8 @@
<div class="d-flex flex-nowrap justify-space-between"> <div class="d-flex flex-nowrap justify-space-between">
<p class="source-time"> <p class="source-time">
<span class="source" v-if="item.releaseTime"> <span class="source" v-if="item.releaseTime">
时间{{ item.releaseTime }} 时间{{ item.releaseTime.substring(5,16) }}
<span v-if="item.closeTime">-{{ item.closeTime }}</span> <span v-if="item.closeTime">-{{ item.closeTime.substring(5,16) }}</span>
</span> </span>
<span class="source" v-if="item.address">地点{{ item.address }}</span> <span class="source" v-if="item.address">地点{{ item.address }}</span>
</p> </p>
@ -225,17 +225,17 @@ export default {
.policy-box { .policy-box {
.list-box { .list-box {
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
// box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
margin-top: 0.5rem; margin-top: 0.3rem;
padding: 10px 1rem; padding: 0.2rem 0.3rem;
} }
} }
.item-title { .item-title {
margin-bottom: 10px; margin-bottom: 2px;
font-size: 16px; font-size: 16px;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
@ -305,13 +305,30 @@ export default {
} }
.date-day { .date-day {
font-size: 32px; font-size: 26px;
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
font-weight: bold; font-weight: bold;
padding-top 0.5rem padding-top 0.5rem
color: #13ACC4; color: #13ACC4;
} }
// .date-mon {
// font-size: 19px;
// // height: 20px;
// // line-height: 1rem;
// font-weight: 500;
// // padding-top 0.3rem
// color: #13ACC4;
// }
// .date-day {
// font-size: 1.2rem;
// height: 2rem;
// line-height: 2rem;
// font-weight: bold;
// // padding-top 0.5rem
// color: #13ACC4;
// }
.source-time { .source-time {
margin-bottom: 0; margin-bottom: 0;
} }

2
src/views/FirstPage/FirstPage.vue

@ -19,7 +19,7 @@
<el-carousel trigger="mousemove" arrow="nerver" indicator-position="none" :autoplay="false" type="card" height="10rem"> <el-carousel trigger="mousemove" arrow="nerver" indicator-position="none" :autoplay="false" type="card" height="10rem">
<el-carousel-item v-for="server in services" :key="server.id"> <el-carousel-item v-for="server in services" :key="server.id">
<div @click="$router.push(server.path)"> <div @click="$router.push(server.path)">
<img :src="server.url" style="width:30rem;height:10rem" /> <img :src="server.url" style="width:30rem;height:10rem;border-radius:0.8rem" />
</div> </div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>

37
src/views/IncubationPlatform/Children/place/EntitySpace.vue

@ -1,12 +1,8 @@
<template> <template>
<div> <div>
<h-nav /> <h-nav />
<div class="inner my-1">
<bread-crumb :arr="arr" />
</div>
<div class="top-box"> <div class="top-box">
<banner :show-page="49" /> <banner :show-page="49" />
<!-- <add-model :value="2" class="add-mol" style="height: 32px" /> -->
<settled-model :type-num="1" class="add-mol" ref="childModel" style="height: 32px" /> <settled-model :type-num="1" class="add-mol" ref="childModel" style="height: 32px" />
<a-button <a-button
@click="$router.push('/IncubationPlatform/MakerSpace/InformationFilling')" @click="$router.push('/IncubationPlatform/MakerSpace/InformationFilling')"
@ -132,7 +128,7 @@ import { searchEnt } from 'config/api';
export default { export default {
name: 'EntitySpace', name: 'EntitySpace',
components: { HNav, BreadCrumb, SettledModel, Banner, SettledEnterprise }, components: { HNav, SettledModel, Banner, SettledEnterprise },
data() { data() {
return { return {
title: '实体众创空间', title: '实体众创空间',
@ -312,29 +308,24 @@ export default {
} }
} }
.add-mol {
position: absolute;
bottom: 7%;
left: 25%;
}
.set-mol { .set-mol {
position: absolute; width 90%
bottom: 7%; // margin 0 auto
left: 33%;
} }
@media only screen and (max-width: 1500px) { // @media only screen and (max-width: 1500px) {
.set-mol { // .set-mol {
left: 35%; // left: 35%;
} // }
} // }
@media only screen and (max-width: 950px) { // @media only screen and (max-width: 950px) {
.set-mol { // .set-mol {
left: 40%; // left: 40%;
} // }
} // }
.center-img { .center-img {
width: 79%; width: 79%;

11
src/views/NewPlatform/Children/AchDet.vue

@ -1,10 +1,10 @@
<template> <template>
<div> <div>
<div class="inner" style="margin-top: 40px"> <!-- <div class="inner" style="margin-top: 40px">
<bread-crumb :arr="arr" /> <bread-crumb :arr="arr" />
</div> </div> -->
<div class="inner equ-box"> <div class="inner equ-box">
<div class="equ-info d-flex"> <div class="equ-info d-flex flex-column">
<img :src="obj.visitLocation" /> <img :src="obj.visitLocation" />
<div class="equ-info-box mb-5"> <div class="equ-info-box mb-5">
<p class="equ-name">{{ obj.name }}</p> <p class="equ-name">{{ obj.name }}</p>
@ -62,7 +62,7 @@ import BreadCrumb from 'components/BreadCrumb/BreadCrumb.vue';
export default { export default {
name: 'AchDet', name: 'AchDet',
components: { IntentionModel, AddShopping, BreadCrumb }, components: { IntentionModel, AddShopping },
data() { data() {
return { return {
typeOfPlatform: '成果详情', typeOfPlatform: '成果详情',
@ -105,6 +105,7 @@ export default {
<style lang="stylus" scoped> <style lang="stylus" scoped>
.equ-box { .equ-box {
width 100%!important
background: #fff; background: #fff;
padding: 20px; padding: 20px;
margin: 30px auto; margin: 30px auto;
@ -162,7 +163,7 @@ export default {
} }
.content-box { .content-box {
min-height: 400px; min-height: 2rem;
padding: 20px; padding: 20px;
font-size: 16px; font-size: 16px;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);

34
src/views/Policy/components/PolicyList.vue

@ -27,7 +27,7 @@
/> />
</a-input-group> </a-input-group>
<span> <span>
<div class="mt-5"> <div style="margin-top:2rem">
<a-checkbox :checked="pStatus.bw - 0 === 1" @click="changeStatus('bw')">国家</a-checkbox> <a-checkbox :checked="pStatus.bw - 0 === 1" @click="changeStatus('bw')">国家</a-checkbox>
<a-checkbox :checked="pStatus.sx - 0 === 1" @click="changeStatus('sx')">山西省</a-checkbox> <a-checkbox :checked="pStatus.sx - 0 === 1" @click="changeStatus('sx')">山西省</a-checkbox>
</div> </div>
@ -50,11 +50,15 @@
<p class="date-mon">{{ monthEnglish[item.publishTime.split('-')[1] - 1] }}.</p> <p class="date-mon">{{ monthEnglish[item.publishTime.split('-')[1] - 1] }}.</p>
<p class="date-day">{{ item.publishTime.split('-')[2] }}</p> <p class="date-day">{{ item.publishTime.split('-')[2] }}</p>
</div> </div>
<div class="d-flex flex-column flex-1"> <div class="d-flex flex-1">
<p @click="LookSource(item.id)" class="item-title pointer">{{ item.title }}</p> <p @click="LookSource(item.id)" class="item-title pointer">{{ item.title }}</p>
<div class="d-flex flex-nowrap align-center" style="color: #13ACC4" @click="LookSource(item.id)">
more
<a-icon class="ml-2" style="font-size:12px" type="arrow-right" />
</div>
<!-- <p @click="LookSource(item.id)" class="item-content pointer">{{ item.intro }}</p> --> <!-- <p @click="LookSource(item.id)" class="item-content pointer">{{ item.intro }}</p> -->
<!-- <p class="item-content" v-html="item.content"></p> --> <!-- <p class="item-content" v-html="item.content"></p> -->
<div class="d-flex flex-nowrap justify-space-between"> <!-- <div class="d-flex flex-nowrap justify-space-between">
<p class="source-time"> <p class="source-time">
<span <span
@click="openWin(item.titleUrl)" @click="openWin(item.titleUrl)"
@ -68,7 +72,7 @@
<a-icon type="arrow-right" style="margin-right: 1rem" /> <a-icon type="arrow-right" style="margin-right: 1rem" />
</span> </span>
</p> </p>
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
@ -192,10 +196,10 @@ export default {
} }
.search-list { .search-list {
height: 6.5em; height: 7.5em;
line-height: 1rem; line-height: 1rem;
background: #fff; background: #fff;
padding: 0 24px; padding: 0 1rem;
position: relative; position: relative;
} }
@ -213,12 +217,12 @@ export default {
background: #fff; background: #fff;
margin-top: 0.3rem; margin-top: 0.3rem;
padding: 1rem 0.3rem; padding: 0.2rem 0.3rem;
} }
} }
.item-title { .item-title {
margin-bottom: 10px; margin-bottom: 2px;
font-size: 16px; font-size: 16px;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
@ -280,19 +284,19 @@ export default {
.date-mon { .date-mon {
font-size: 19px; font-size: 19px;
height: 20px; // height: 20px;
line-height: 26px; // line-height: 1rem;
font-weight: 500; font-weight: 500;
padding-top 0.3rem // padding-top 0.3rem
color: #13ACC4; color: #13ACC4;
} }
.date-day { .date-day {
font-size: 32px; font-size: 1.2rem;
height: 56px; height: 2rem;
line-height: 56px; line-height: 2rem;
font-weight: bold; font-weight: bold;
padding-top 0.5rem // padding-top 0.5rem
color: #13ACC4; color: #13ACC4;
} }

Loading…
Cancel
Save