rose 5 years ago
parent
commit
99d354fee5
  1. 11
      src/common/portrait.styl
  2. 2
      src/components/FooterPage/FriendShip.vue
  3. 2
      src/components/Introduce/AddShopping.vue
  4. 11
      src/components/Introduce/ContactUs.vue
  5. 2
      src/components/Introduce/IntentionModel.vue
  6. 2
      src/components/Introduce/Model.vue
  7. 4
      src/components/Introduce/SettledModel.vue
  8. 4
      src/components/PlatformList/Fruit.vue
  9. 16
      src/components/PlatformList/PlatformList.vue
  10. 2
      src/views/Activity/components/Enroll.vue
  11. 2
      src/views/Cart/CartModel.vue
  12. 2
      src/views/Challenge/components/Enroll.vue
  13. 14
      src/views/Community/Posting.vue
  14. 22
      src/views/ContactUs/ContactUs.vue
  15. 11
      src/views/IncubationPlatform/Children/place/EntitySpace.vue
  16. 13
      src/views/IncubationPlatform/Children/place/InformationFilling.vue
  17. 2
      src/views/IncubationPlatform/components/AddModel.vue
  18. 2
      src/views/Industry/Children/Serve.vue
  19. 4
      src/views/NewPlatform/Children/Platform.vue
  20. 10
      src/views/NewPlatform/Children/Service.vue
  21. 23
      src/views/NewPlatform/Children/Share.vue
  22. 9
      src/views/NewPlatform/Children/ShareChild/Institute.vue
  23. 8
      src/views/NewPlatform/components/NewModel.vue

11
src/common/portrait.styl

@ -358,10 +358,7 @@
} }
// other // other
.inner {
width: 1rem;
margin: 0 auto;
}
.pointer{ .pointer{
cursor:pointer; cursor:pointer;
@ -571,10 +568,10 @@ h2{
.search-background { .search-background {
background: #fff background: #fff
// border: 1px solid rgba(0, 0, 0, 0.06); // border: 1px solid rgba(0, 0, 0, 0.06);
height: auto;
padding: 0 1.4rem; padding: 0.4rem 1.4rem;
width: 100%; width: 100%;
margin: 0.5rem auto 1rem; margin: 0.5rem auto 0.5rem;
line-height: 1.2rem; line-height: 1.2rem;
} }

2
src/components/FooterPage/FriendShip.vue

@ -85,7 +85,7 @@ export default {
} }
.inner { .inner {
width: 90%; width: 90%;
margin: 0 auto
padding 0.9rem 0 padding 0.9rem 0
} }
</style> </style>

2
src/components/Introduce/AddShopping.vue

@ -4,7 +4,7 @@
{{ str }} {{ str }}
</a-button> </a-button>
<a-icon id="ddd" type="shopping-cart" /> <a-icon id="ddd" type="shopping-cart" />
<a-modal width="50%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel"> <a-modal width="80%" :title="title" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
<a-form :form="form"> <a-form :form="form">
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="需求描述"> <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="需求描述">
<a-textarea v-model.trim="describe" style="height: 120px" placeholder="请输入需求描述..." /> <a-textarea v-model.trim="describe" style="height: 120px" placeholder="请输入需求描述..." />

11
src/components/Introduce/ContactUs.vue

@ -79,13 +79,14 @@ export default {
.contact-right { .contact-right {
height: 100%; height: 100%;
border-radius:0.3rem 0.3rem 0 0
width: 360px; width: 360px;
padding: 0 24px; padding: 0 20px;
div { div {
margin-top: 24px; margin-top: 22px;
height: 24px; height: 22px;
line-height: 24px; line-height: 22px;
position: relative; position: relative;
p { p {
@ -95,7 +96,7 @@ export default {
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
line-height: 24px; line-height: 22px;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
opacity: 1; opacity: 1;
} }

2
src/components/Introduce/IntentionModel.vue

@ -7,7 +7,7 @@
:visible="visible" :visible="visible"
@cancel="handleCancel" @cancel="handleCancel"
@ok="handleOk" @ok="handleOk"
width="70%" width="80%"
> >
<a-form :form="form"> <a-form :form="form">
<a-form-item <a-form-item

2
src/components/Introduce/Model.vue

@ -7,7 +7,7 @@
<template> <template>
<div> <div>
<a-button @click="showModal" type="primary" style="width:100%;height:2.5rem">立即加入</a-button> <a-button @click="showModal" type="primary" style="width:100%;height:2.5rem">立即加入</a-button>
<a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk(type)" title="招聘信息" width="50%"> <a-modal :confirm-loading="confirmLoading" :visible="visible" @cancel="handleCancel" @ok="handleOk(type)" title="招聘信息" width="80%">
<a-form :form="form"> <a-form :form="form">
<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>
<a-input placeholder="请输入姓名" v-model.trim="recruit.name" /> <a-input placeholder="请输入姓名" v-model.trim="recruit.name" />

4
src/components/Introduce/SettledModel.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<a-button style="width:30%" @click="showModal" type="primary">加入我们</a-button> <a-button @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="80%">
<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>
<a-input placeholder="请输入公司名称..." v-model.trim="platform.company" /> <a-input placeholder="请输入公司名称..." v-model.trim="platform.company" />

4
src/components/PlatformList/Fruit.vue

@ -19,7 +19,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="inner"> <div>
<a-pagination <a-pagination
:current="achCurrent" :current="achCurrent"
:page-size="pageSize" :page-size="pageSize"
@ -112,7 +112,7 @@ export default {
<style lang="stylus" scoped> <style lang="stylus" scoped>
.pagination { .pagination {
margin: 40px 0; margin: 0.8rem 0;
text-align: right; text-align: right;
} }
p{ p{

16
src/components/PlatformList/PlatformList.vue

@ -1,20 +1,20 @@
<template> <template>
<div> <div>
<div class="inner d-flex flex-wrap"> <div class=" d-flex flex-wrap">
<div <div
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index" :key="index"
@click="jump(item)" @click="jump(item)"
class="item-box mb-8 d-flex flex-column pointer" class="item-box mb-2 d-flex flex-column pointer"
v-for="(item, index) in list" v-for="(item, index) in list"
> >
<img :src="item.picUrl" :title="item.name" class="con-img" v-if="item.picUrl" /> <img :src="item.picUrl" :title="item.name" class="con-img" v-if="item.picUrl" />
<img :src="item.visitLocation" :title="item.name" class="con-img" v-else /> <img :src="item.visitLocation" :title="item.name" class="con-img" v-else />
<p class="font-24 my-4 title">{{ item.name }}</p> <p class="font-18 title" style="margin-bottom:0.3rem">{{ item.name }}</p>
<p class="font-16 baseColor" style="text-align: right; cursor: pointer">了解更多</p> <p class="font-14 baseColor" style="text-align: right; cursor: pointer;margin:0">了解更多</p>
</div> </div>
</div> </div>
<div class="inner"> <div>
<a-pagination <a-pagination
:current="current" :current="current"
:page-size="pageSize" :page-size="pageSize"
@ -224,7 +224,7 @@ export default {
<style lang="stylus" scoped> <style lang="stylus" scoped>
.pagination { .pagination {
margin: 40px 0; margin: 0.8rem 0;
text-align: right; text-align: right;
} }
@ -234,10 +234,10 @@ export default {
text-align: center; text-align: center;
// position: absolute; // position: absolute;
// bottom: 0; // bottom: 0;
height: 90px; height: 2.1rem;
width: 100%; width: 100%;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-size: 24px; font-size: 14px;
} }
.margin-0 { .margin-0 {

2
src/views/Activity/components/Enroll.vue

@ -8,7 +8,7 @@
:visible="visible" :visible="visible"
@cancel="handleCancel" @cancel="handleCancel"
@ok="handleOk" @ok="handleOk"
width="50%" width="80%"
> >
<a-form :form="form"> <a-form :form="form">
<a-form-item <a-form-item

2
src/views/Cart/CartModel.vue

@ -6,7 +6,7 @@
<template> <template>
<div> <div>
<a-modal :confirm-loading="confirmLoading" :visible="showModel" @cancel="handleCancel" @ok="handleOk()" title="电话验证" width="50%"> <a-modal :confirm-loading="confirmLoading" :visible="showModel" @cancel="handleCancel" @ok="handleOk()" title="电话验证" width="80%">
<a-form :form="form"> <a-form :form="form">
<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>
<a-input placeholder="请输入手机号" type="tel" v-model="tel" /> <a-input placeholder="请输入手机号" type="tel" v-model="tel" />

2
src/views/Challenge/components/Enroll.vue

@ -2,7 +2,7 @@
<div> <div>
<a-button class="mt-2" @click="showModal" type="primary" style="width:100%">需求征集</a-button> <a-button class="mt-2" @click="showModal" type="primary" style="width:100%">需求征集</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="80%">
<a-form :form="form"> <a-form :form="form">
<!-- 需求名称 --> <!-- 需求名称 -->
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="需求名称"> <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="mb-3" label="需求名称">

14
src/views/Community/Posting.vue

@ -2,13 +2,13 @@
<div class="wrap"> <div class="wrap">
<!-- {{ str }} --> <!-- {{ str }} -->
<h2>标题</h2> <h2>标题</h2>
<a-input style="margin-bottom: 20px" v-model.trim="title" /> <a-input style="margin-bottom: 1rem" v-model.trim="title" />
<h2>封面图片</h2> <h2>封面图片</h2>
<a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files"> <a-upload :action="action" :default-file-list="fileList" @change="fileChange" list-type="picture" name="files">
<a-button v-show="fileList.length === 0"> <a-icon type="upload" />点击上传 </a-button> <a-button v-show="fileList.length === 0"> <a-icon type="upload" />点击上传 </a-button>
</a-upload> </a-upload>
<h2 style="margin-top: 20px">内容</h2> <h2 style="margin-top: 1rem">内容</h2>
<div class="edit_container" style="height: auto; margin-bottom: 40px"> <div class="edit_container" style="height: auto; margin-bottom: 2rem">
<quill-editor <quill-editor
:options="editorOption" :options="editorOption"
@blur="onEditorBlur($event)" @blur="onEditorBlur($event)"
@ -122,14 +122,14 @@ export default {
<style lang="stylus" > <style lang="stylus" >
.wrap { .wrap {
width: 90%; width: 90%;
min-height: 1037px; min-height: 30rem;
margin: 80px auto 28px auto; margin: 1rem auto ;
overflow: hidden; overflow: hidden;
opacity: 1; opacity: 1;
} }
.ql-editor { .ql-editor {
min-height: 400px; min-height: 300px;
max-height: 600px; max-height: 400px;
} }
</style> </style>

22
src/views/ContactUs/ContactUs.vue

@ -1,15 +1,19 @@
<template> <template>
<div class="inner"> <div>
<!-- 联系我们 --> <!-- 联系我们 -->
<div> <div class="white">
<p class="font-bold-24 title-color" style="margin:0.3rem auto ">联系我们</p> <p class="font-bold-24 title-color inner" style="margin:0.3rem auto ">联系我们</p>
<contact /> <contact />
</div> </div>
<!-- 加入我们 --> <!-- 加入我们 -->
<div> <div class="white mt-2">
<p class="font-bold-24 title-color">加入我们</p> <div class="inner">
<rich-text :title="title" /> <p class="font-bold-24 title-color" style="margin:0.3rem 0">加入我们</p>
<model class="mt-8" /> <rich-text :title="title" />
<model class="mt-6" />
</div>
</div> </div>
</div> </div>
</template> </template>
@ -34,7 +38,9 @@ export default {
<style scoped lang="stylus"> <style scoped lang="stylus">
.inner { .inner {
margin: 1rem auto !important; width:90%
margin: 0 auto !important;
padding :0.8rem 0rem
} }
p { p {

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

@ -318,12 +318,19 @@ export default {
} }
.add-mol {
position: absolute;
bottom: 7%;
left: 20%;
}
.set-mol { .set-mol {
width 35% position: absolute;
// margin 0 auto bottom: 7%;
left: 50%;
} }
// @media only screen and (max-width: 1500px) { // @media only screen and (max-width: 1500px) {
// .set-mol { // .set-mol {
// left: 35%; // left: 35%;

13
src/views/IncubationPlatform/Children/place/InformationFilling.vue

@ -8,12 +8,9 @@
<template> <template>
<div> <div>
<h-nav /> <h-nav />
<div class="inner my-1"> <div class="">
<bread-crumb :arr="arr" />
</div>
<div class="inner">
<div style="border: 1px solid #e8e8e8;"> <div style="border: 1px solid #e8e8e8;">
<div class="white" id="custom-mount" style="min-height: 600px"></div> <div class="white" id="custom-mount" style="min-height: 600px;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -26,7 +23,7 @@ import WebOfficeSDK from '@/assets/js/web-office-sdk-v1.1.2.es.js';
export default { export default {
name: 'InformationFilling', name: 'InformationFilling',
components: { HNav, BreadCrumb }, components: { HNav},
data() { data() {
return { return {
arr: [ arr: [
@ -63,7 +60,5 @@ export default {
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.inner {
margin: 10px auto 15px;
}
</style> </style>

2
src/views/IncubationPlatform/components/AddModel.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<a-button @click="showModal" style="height: 100%; width: 100%" type="primary" v-if="value !== 1">{{ str }}</a-button> <a-button @click="showModal" style="height: 100%; width: 100%" type="primary" v-if="value !== 1">{{ str }}</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="80%">
<p style="text-align: center" v-show="value === 1"> <p style="text-align: center" v-show="value === 1">
<a-radio-group style="margin-bottom: 20px !important" v-model="platform.val"> <a-radio-group style="margin-bottom: 20px !important" v-model="platform.val">
<a-radio :value="2" style="margin-right: 100px">实体空间</a-radio> <a-radio :value="2" style="margin-right: 100px">实体空间</a-radio>

2
src/views/Industry/Children/Serve.vue

@ -12,7 +12,7 @@
<div <div
:class="(index + 1) % 3 === 0 ? 'margin-0' : ''" :class="(index + 1) % 3 === 0 ? 'margin-0' : ''"
:key="index" :key="index"
class="item-box mb-8" class="item-box mb-2"
v-for="(item, index) in list" v-for="(item, index) in list"
> >
<img <img

4
src/views/NewPlatform/Children/Platform.vue

@ -13,7 +13,7 @@
<div style="padding-bottom: 50px"> <div style="padding-bottom: 50px">
<div class="d-flex flex-column align-center"> <div class="d-flex flex-column align-center">
<div :key="index" @click="jump(item.url)" class="content-box" v-for="(item, index) in list"> <div :key="index" @click="jump(item.url)" class="content-box" v-for="(item, index) in list">
<img :src="item.imgUrl" /> <img style="border-radius:0.5rem 0.5rem 0 0;" :src="item.imgUrl" />
<div class="con-title">{{ item.title }}</div> <div class="con-title">{{ item.title }}</div>
<div class="con-con">{{ item.content }}</div> <div class="con-con">{{ item.content }}</div>
</div> </div>
@ -110,5 +110,7 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 16px; font-size: 16px;
font-weight: bold
border-radius: 0 0 0.5rem 0.5rem
} }
</style> </style>

10
src/views/NewPlatform/Children/Service.vue

@ -13,18 +13,14 @@
:class="(index + 1) % 4 === 0 ? 'margin-0' : ''" :class="(index + 1) % 4 === 0 ? 'margin-0' : ''"
:key="index" :key="index"
class="item-box mb-4 pointer" class="item-box mb-2 pointer"
v-for="(item, index) in list" v-for="(item, index) in list"
> >
<img @click="showModal(item.id)" :src="item.picUrl" style="height:5rem; width: 100%; border: 1px solid #ccc" /> <img @click="showModal(item.id)" :src="item.picUrl" style="height:5rem; width: 100%; border: 1px solid #ccc" />
<p class="font-20 my-4" style="text-align: center"> <p class="font-20 my-1" style="text-align: center">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</p> </p>
<!-- <p <div v-if="item.intro === null? false: item.intro.length>15" class="font-16 textColor item-intro">
class="font-16 my-4 textColor line-height-30 item-content"
v-if="item.intro"
>{{ item.intro }}</p> -->
<div v-if="item.intro === null? false: item.intro.length>15" class="font-16 textColor item-intro mb-2">
{{ item.intro.slice(0,15) }} {{ item.intro.slice(0,15) }}
<a-button <a-button
@click="showIntro(index)" @click="showIntro(index)"

23
src/views/NewPlatform/Children/Share.vue

@ -201,19 +201,8 @@ export default {
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.inner {
margin: 10px auto 15px;
}
.search-background {
background: rgba(0, 0, 0, 0.02);
border: 1px solid rgba(0, 0, 0, 0.06);
height: auto;
padding: 0 20px;
width: 82%;
margin: 40px auto;
line-height: 44px;
}
.item-search { .item-search {
width: 100%; width: 100%;
@ -236,14 +225,4 @@ export default {
.act-color { .act-color {
color: #13ACC4 !important; color: #13ACC4 !important;
} }
.search-background {
background: #fff
// border: 1px solid rgba(0, 0, 0, 0.06);
height: auto;
padding: 0 1.4rem;
width: 100%;
margin: 0.5rem auto 1rem;
line-height: 1.2rem;
}
</style> </style>

9
src/views/NewPlatform/Children/ShareChild/Institute.vue

@ -1,9 +1,6 @@
<template> <template>
<div> <div>
<h-nav /> <h-nav />
<div class="inner my-1">
<bread-crumb :arr="arr" />
</div>
<!-- <banner :show-page="showPage" /> --> <!-- <banner :show-page="showPage" /> -->
<div class="inner ins-box"> <div class="inner ins-box">
<p class="font-bold-24 item-title" v-if="description">{{ shareName }}</p> <p class="font-bold-24 item-title" v-if="description">{{ shareName }}</p>
@ -112,7 +109,7 @@ import IntentionModel from 'components/Introduce/IntentionModel.vue';
export default { export default {
name: 'Institute', name: 'Institute',
components: { HNav, BreadCrumb, AddShopping, IntentionModel }, components: { HNav, AddShopping, IntentionModel },
data() { data() {
return { return {
id: 0, id: 0,
@ -247,13 +244,13 @@ export default {
<style lang="stylus" scoped> <style lang="stylus" scoped>
.inner { .inner {
margin: 10px auto 15px; margin: 10px 1rem 15px;
} }
.ins-box { .ins-box {
min-height: 500px; min-height: 500px;
height: auto; height: auto;
margin: 40px auto; margin: 40px 1rem;
} }
.pagination { .pagination {

8
src/views/NewPlatform/components/NewModel.vue

@ -9,7 +9,7 @@
:visible="visible" :visible="visible"
@cancel="handleCancel" @cancel="handleCancel"
@ok="handleOk" @ok="handleOk"
width="50%" width="80%"
> >
<a-form :form="form"> <a-form :form="form">
<a-form-item <a-form-item
@ -30,11 +30,11 @@
:label-col="formItemLayout.labelCol" :label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol" :wrapper-col="formItemLayout.wrapperCol"
class="fill-width" class="fill-width"
label="社会信用代码或组织机构代码:"
> >
<span class="title-color" style="margin-left: 5%">社会信用代码或组织机构代码</span> <!-- <span class="title-color">社会信用代码或组织机构代码</span> -->
<a-input <a-input
placeholder="请输入社会信用代码或组织机构代码..." placeholder="请输入社会信用代码或组织机构代码..."
style="margin-left: 27.5%"
v-model.trim="platform.code" v-model.trim="platform.code"
/> />
</a-form-item> </a-form-item>

Loading…
Cancel
Save