xuesinan
/
ts-program
forked from TALL/check-work
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

细节修改

master
lucky 5 years ago
parent
431d1d006b
commit
16929b3654
8 changed files with 178 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/join-bg.jpg
  2. 1
      src/common/portrait.styl
  3. 1
      src/components/Banner/Banner.vue
  4. 42
      src/components/Index/IndexNewList.vue
  5. 55
      src/views/FirstPage/FirstPage.vue
  6. 10
      src/views/IncubationPlatform/Children/MakerSpace.vue
  7. 8
      src/views/IncubationPlatform/Children/place/EntitySpace.vue
  8. 123
      src/views/NewPlatform/components/NewModel.vue

BIN
src/assets/join-bg.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 KiB

1
src/common/portrait.styl
View File

@ -364,7 +364,6 @@
.fill-width{
width:100%;
text-align: center;
background: #fff;
img{
width: 85%;

1
src/components/Banner/Banner.vue
View File

@ -59,6 +59,7 @@ export default {
// max-height: 440px;
overflow: hidden;
position: relative;
height: 170px;
}
#banner-box {

42
src/components/Index/IndexNewList.vue
View File

@ -5,7 +5,7 @@
-->
<template>
<div class="index-wrap">
<div :class="i === 1 ? 'index-wrap' : 'index-wrap1'">
<div class="d-flex flex-column" v-if="i === 0">
<div class="d-flex flex-nowrap align-center baseColor">
<span class="font-bold-24">行业资讯</span>
@ -23,27 +23,30 @@
</div>
<a-divider class="my-3" />
</div>
<div class="d-flex flex-nowrap align-center baseColor" v-else>
<span class="font-bold-24">活动公告</span>
<img class="bullhorn ml-4" src="@/assets/bullhorn.png" />
<div class="flex-1"></div>
<a-button
@click="$router.push('/Activity')"
class="d-flex align-end font-16 baseColor pa-0"
style="display: inline-block;"
type="link"
>
more
<a-icon style="font-size:12px" type="right" />
</a-button>
<div class="d-flex flex-column" v-else>
<div class="d-flex flex-nowrap align-center baseColor">
<span class="font-bold-24">活动公告</span>
<img class="bullhorn ml-4" src="@/assets/bullhorn.png" />
<div class="flex-1"></div>
<a-button
@click="$router.push('/Activity')"
class="d-flex align-end font-16 baseColor pa-0"
style="display: inline-block;"
type="link"
>
more
<a-icon style="font-size:12px" type="right" />
</a-button>
</div>
<a-divider class="my-3" />
</div>
<div class="policy-box" v-if="lists && lists[i].news && lists[i].news.length>0">
<div :key="index" class="div-box mb-2" v-for="(item, index) in lists[i].news">
<div @click="jumpDetails(item)" class="d-flex flex-nowrap" style="cursor: pointer">
<div class="time d-flex flex-column align-center mr-5" v-if="item.releaseTime">
<!-- <div class="time d-flex flex-column align-center mr-5" v-if="item.releaseTime">
<span class="font-20">{{ monthEnglish[item.releaseTime.split('-')[1] - 1] }}.</span>
<span class="font-bold-32 day">{{ item.releaseTime.split(' ')[0].split('-')[2] }}</span>
</div>
</div>-->
<div class="d-flex flex-1 flex-column">
<div class="item-title">{{ item.title }}</div>
<div class="original"></div>
@ -94,6 +97,13 @@ export default {
opacity: 1;
}
.index-wrap1 {
width: 96%;
margin: 15px auto 15px auto;
overflow: hidden;
opacity: 1;
}
.bullhorn {
width: 24px;
height: 24px;

55
src/views/FirstPage/FirstPage.vue
View File

@ -9,22 +9,27 @@
<div class="inner">
<a-row>
<a-col :span="18">
<a-row class="mr-8">
<a-col :span="8" class="fill-width d-flex flex-nowrap flex-row justify-space-between">
<div :key="platform.id" @click="$router.push(platform.path)" class="platform-box" v-for="platform in platforms">
<div class="d-flex flex-column align-center pointer">
<img :src="platform.url" />
<div class="platform-txt mt-3">{{ platform.firstName }}</div>
<div class="platform-txt">{{ platform.secondName }}</div>
<a-row>
<a-col :key="server.id" :span="8" v-for="server in services">
<div @click="$router.push(server.path)" class="mr-8 d-flex pointer">
<div class="server-box d-flex fill-width">
<img :src="server.url" style="width:100%" />
</div>
</div>
</a-col>
</a-row>
<a-row class="mt-8">
<a-col :key="server.id" :span="8" v-for="server in services">
<div @click="$router.push(server.path)" class="mr-8 d-flex pointer">
<div class="server-box d-flex fill-width">
<img :src="server.url" />
<a-row class="mt-8 mr-8">
<a-col :span="8" class="fill-width d-flex flex-nowrap flex-row justify-space-between">
<div
:key="platform.id"
@click="$router.push(platform.path)"
class="platform-box"
v-for="platform in platforms"
>
<div class="d-flex flex-column align-center pointer">
<img :src="platform.url" style="width:60%" />
<div class="platform-txt mt-3">{{ platform.firstName }}</div>
<div class="platform-txt">{{ platform.secondName }}</div>
</div>
</div>
</a-col>
@ -43,10 +48,22 @@
</a-row>-->
</a-col>
<a-col :span="6">
<div class="white mr-8 d-flex flex-column justify-center">
<index-new-list :i="1" :lists="lists" />
</div>
</a-col>
</a-row>
<a-row class="mt-8">
<a-col :span="24">
<div class="white mr-8 d-flex flex-column justify-center">
<index-new-list :i="0" :lists="lists" />
</div>
</a-col>
<!-- <a-col :span="12">
<div class="white mr-8 d-flex flex-column justify-center">
<index-new-list :i="1" :lists="lists" />
</div>
</a-col>-->
</a-row>
</div>
</div>
@ -114,13 +131,13 @@ export default {
path: '/NewPlatform/Develop',
url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210119/index04.png',
},
{
id: '08',
firstName: '知识平台',
secondName: '',
path: '/Knowledge',
url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210119/index05.png',
},
// {
// id: '08',
// firstName: '知识平台',
// secondName: '',
// path: '/Knowledge',
// url: 'https://www.sxwikionline.com/gateway/greenvalley/uploads/upload/20210119/index05.png',
// },
],
lists: [
{

10
src/views/IncubationPlatform/Children/MakerSpace.vue
View File

@ -9,6 +9,7 @@
<!-- </div> -->
<div class="inner">
<div>
<!-- style="background: -webkit-linear-gradient(white,#f7f7f6,#e0e0e0);" -->
<div class="d-flex flex-column white">
<div class="font-bold-32 title-color py-3 px-2">众创空间介绍</div>
<div class="pa-3 font-16 line-height-36" style="text-indent: 2em">
@ -37,7 +38,7 @@
<div style="margin-top: 30px">
<div class="d-flex flex-column">
<p class="font-bold-32 title-color">加入流程</p>
<div class="fill-width">
<div class="fill-width join-bg">
<img src="~assets/zckj01.png" />
</div>
</div>
@ -141,4 +142,11 @@ export default {
.inner {
margin: 0 auto 40px;
}
.join-bg {
width: 100%;
height: 100%;
background: url('../../../assets/join-bg.jpg') no-repeat;
background-size: 100% 100%;
}
</style>

8
src/views/IncubationPlatform/Children/place/EntitySpace.vue
View File

@ -59,9 +59,7 @@
</div>
<div class="center-content d-flex flex-column">
<div>发酵工程中试基地位于山西维尔乳制品有限公司，基地具有发酵乳制品等生产加工条件，可提供微生物发酵实验及相关中试。</div>
<div>
超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。
</div>
<div>超高压食品加工中试基地位于太原市小店区正阳街43号的山西力德福科技有限公司。基地具有非热杀菌保鲜生产线、超高压设备制造生产线及中试车间，可提供超高压加工实验及相关中试和产业化服务。</div>
<div>
干果精深加工中试基地位于吕梁的交城天娇红农业科技有限公司
，拥有300余万元的先进分析检测仪器设备及免洗干枣生产车间、浓缩枣汁生产车间等生产加工条件，可提供相关中试研究。
@ -253,7 +251,7 @@ export default {
.ent-name {
position: absolute;
left: 0;
width: 30%;
width: 50%;
height: 24px;
top: 50%;
margin-top: -12px;
@ -269,7 +267,7 @@ export default {
.ent-mainBusiness {
position: absolute;
left: 60%;
width: 20%;
width: 30%;
height: 24px;
top: 50%;
margin-top: -12px;

123
src/views/NewPlatform/components/NewModel.vue
View File

@ -1,19 +1,48 @@
<template>
<div>
<a-button @click="showModal" type="primary">{{ str }}</a-button>
<a-modal :confirm-loading="confirmLoading" :title="title" :visible="visible" @cancel="handleCancel" @ok="handleOk" width="50%">
<div style="text-align:center">
<a-button @click="showModal" type="primary">{{ str }}</a-button>
</div>
<a-modal
:confirm-loading="confirmLoading"
:title="title"
:visible="visible"
@cancel="handleCancel"
@ok="handleOk"
width="50%"
>
<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-input placeholder="请输入单位名称..." v-model.trim="platform.companyName" />
</a-form-item>
<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-input placeholder="请输入单位性质..." v-model.trim="platform.companyType" />
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" class="fill-width">
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
class="fill-width"
>
<span class="title-color" style="margin-left: 5%">社会信用代码或组织机构代码：</span>
<a-input placeholder="请输入社会信用代码或组织机构代码..." style="margin-left: 27.5%" v-model.trim="platform.code" />
<a-input
placeholder="请输入社会信用代码或组织机构代码..."
style="margin-left: 27.5%"
v-model.trim="platform.code"
/>
</a-form-item>
<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-select @change="handlePosition" placeholder="请选择所属领域" v-model.trim="platform.position">
<a-select-option value="1">功能食品协同创新中心</a-select-option>
<a-select-option value="2">现代医药</a-select-option>
@ -22,16 +51,38 @@
<a-select-option value="5">其他</a-select-option>
</a-select>
</a-form-item>
<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-input placeholder="请输入单位负责人..." v-model.trim="platform.ower" />
</a-form-item>
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="单位邮箱">
<a-input :initial-value="platform.email" placeholder="请输入单位邮箱..." v-decorator="['email', { rules: emailRules }]" />
<a-form-item
:label-col="formItemLayout.labelCol"
:wrapper-col="formItemLayout.wrapperCol"
label="单位邮箱"
>
<a-input
:initial-value="platform.email"
placeholder="请输入单位邮箱..."
v-decorator="['email', { rules: emailRules }]"
/>
</a-form-item>
<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.contact" />
</a-form-item>
<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
@change="changePhone"
placeholder="请输入联系电话.."
@ -39,31 +90,63 @@
v-decorator="['phone', { initialValue: platform.phone, rules: phoneRules }]"
/>
</a-form-item>
<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
>
<div class="d-flex flex-nowrap">
<a-input placeholder="图片验证码" type="number" v-model="codeNum" />
<img :src="picCode.imageBase64" @click="changePicCode" class="code_img ml-2" v-if="picCode && picCode.imageBase64" />
<img
:src="picCode.imageBase64"
@click="changePicCode"
class="code_img ml-2"
v-if="picCode && picCode.imageBase64"
/>
<a-button @click="changePicCode" class="code_img ml-2" size="small" v-else>获取验证码</a-button>
<!-- <a-input v-decorator="['account', { rules: rules.account }]" /> -->
</div>
</a-form-item>
<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
>
<div class="d-flex flex-nowrap">
<a-input placeholder="请输入验证码" type="number" v-model="platform.message" />
<a-button class="code_img ml-2" disabled type="primary" v-if="showInterval">重新发送 {{ interval }}</a-button>
<a-button :disabled="isTel === false" @click="getCode" class="code_img ml-2" type="primary" v-else>获取验证码</a-button>
<a-button
class="code_img ml-2"
disabled
type="primary"
v-if="showInterval"
>重新发送 {{ interval }}</a-button>
<a-button
:disabled="isTel === false"
@click="getCode"
class="code_img ml-2"
type="primary"
v-else
>获取验证码</a-button>
</div>
</a-form-item>
<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-upload
:action="action"
:default-file-list="fileList"
:before-upload="beforeUpload"
:default-file-list="fileList"
@change="fileChange"
list-type="picture"
name="files"
>
<a-button> <a-icon type="upload" />点击上传附件 </a-button>
<a-button>
<a-icon type="upload" />点击上传附件
</a-button>
</a-upload>
</a-form-item>
</a-form>

Write Preview
Loading…
Cancel
Save