Commit fca4814a authored by 杨硕's avatar 杨硕

活动详情ui优化

parent 746a1ea5
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
type="primary" type="primary"
:disabled="registrationButton" :disabled="registrationButton"
@click="handleAdd" @click="handleAdd"
>我要报名</el-button> ><span class="top-button-title">我要报名</span></el-button>
<el-image v-if="image" style="width: 100px;height: 80px" :src="registration" /> <el-image v-if="image" style="width: 62px;height: 62px" :src="registration" />
</div> </div>
<el-form ref="form" :model="form" label-width="auto" class="form"> <el-form ref="form" :model="form" label-width="auto" class="form">
<el-row> <el-row>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="form.registrationWay === '1' ? '报名人数:' : '限制人数:'"> <el-form-item :label="form.registrationWay === '1' ? '报名人数:' : '限制人数:'">
<span class="formdate-text">{{ registrationNumber }}</span> <span class="formdate-text">{{ registrationNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-dialog :close-on-click-modal="false" class="signupDialog" title="我要报名" :visible.sync="open" width="40%" append-to-body> <el-dialog :close-on-click-modal="false" class="signupDialog" title="我要报名" :visible.sync="open" width="40%" append-to-body>
<el-form ref="addForm" :rules="rules" :model="addForm" label-width="auto"> <el-form ref="addForm" :rules="rules" :model="addForm" label-width="auto">
<el-form-item label="参与企业" prop="signUpDept"> <el-form-item label="参与企业" prop="signUpDept">
<el-select v-model="addForm.signUpDept" style="width: 100%" placeholder="请输入参与企业"> <el-select size="medium" v-model="addForm.signUpDept" class="input" placeholder="请输入参与企业">
<el-option <el-option
v-for="item in enterprises" v-for="item in enterprises"
:key="item.id" :key="item.id"
...@@ -107,18 +107,18 @@ ...@@ -107,18 +107,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model.trim="addForm.contact" maxlength="30" placeholder="请输入联系人" /> <el-input size="medium" class="input" v-model.trim="addForm.contact" maxlength="30" placeholder="请输入联系人" />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input v-model.trim="addForm.phone" maxlength="16" placeholder="请输入联系电话" /> <el-input size="medium" class="input" v-model.trim="addForm.phone" maxlength="16" placeholder="请输入联系电话" />
</el-form-item> </el-form-item>
<el-form-item label="参与人数" prop="peopleNumber"> <el-form-item label="参与人数" prop="peopleNumber">
<el-input v-model.trim="addForm.peopleNumber" maxlength="10" oninput="value=value.replace(/\D/g,'')" placeholder="请输入参与人数" /> <el-input size="medium" class="input" v-model.trim="addForm.peopleNumber" maxlength="10" oninput="value=value.replace(/\D/g,'')" placeholder="请输入参与人数" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="footer"> <div class="footer">
<el-button @click="open=false">关闭</el-button> <el-button class="cancelBtn" @click="open=false">关闭</el-button>
<el-button type="primary" @click="add">确定</el-button> <el-button class="confirmBtn" type="primary" @click="add">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
// 我要报名按钮 // 我要报名按钮
registrationButton: false, registrationButton: false,
// 已报名图片 // 已报名图片
registration: require('@/assets/image/registrationStatus.png'), registration: require('@/assets/image/yibaoming.png'),
// 活动总限制人数 // 活动总限制人数
peopleTotal: 0, peopleTotal: 0,
// 活动目前人数 // 活动目前人数
...@@ -505,6 +505,8 @@ export default { ...@@ -505,6 +505,8 @@ export default {
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
color: #707070; color: #707070;
-webkit-background-clip: text; -webkit-background-clip: text;
max-width: 1203px;
text-overflow:ellipsis;
} }
.item.el-form-item__label{ .item.el-form-item__label{
color: #333333; color: #333333;
...@@ -523,7 +525,7 @@ export default { ...@@ -523,7 +525,7 @@ export default {
} }
} }
.form{ .form{
margin-top: 40px; margin-top: 15px;
} }
.details-body{ .details-body{
margin-top: 12px; margin-top: 12px;
...@@ -553,6 +555,7 @@ export default { ...@@ -553,6 +555,7 @@ export default {
} }
} }
.signupDialog{ .signupDialog{
padding: 0px 67px;
.footer{ .footer{
padding: 20px 10px 0 0; padding: 20px 10px 0 0;
float: right; float: right;
...@@ -565,4 +568,23 @@ export default { ...@@ -565,4 +568,23 @@ export default {
color: #333333; color: #333333;
-webkit-background-clip: text; -webkit-background-clip: text;
} }
.top-button-title{
font-size: 15px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #FFFFFF;
-webkit-background-clip: text;
}
::v-deep.el-row{
margin-bottom: 4px;
}
.input{
width: 362px;
height: 36px;
line-height: 32px;
background: #FFFFFF;
border-radius: 6px 6px 6px 6px;
opacity: 1;
border: 1px solid #E4E4E4;
}
</style> </style>
...@@ -161,7 +161,6 @@ export default { ...@@ -161,7 +161,6 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.messageCenter-module{ .messageCenter-module{
width: 1126px;
//margin: auto; //margin: auto;
.info-top{ .info-top{
display: flex; display: flex;
...@@ -189,7 +188,7 @@ export default { ...@@ -189,7 +188,7 @@ export default {
font-size: 15px; font-size: 15px;
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
padding: 0 30px; margin-left: 60px;
cursor: pointer; cursor: pointer;
display: block; display: block;
float: left; float: left;
...@@ -230,7 +229,7 @@ export default { ...@@ -230,7 +229,7 @@ export default {
border-color: #F18F18 border-color: #F18F18
} }
.table{ .table{
width: 100%; width: 1066px;
margin-bottom: 28px; margin-bottom: 28px;
} }
} }
......
...@@ -88,7 +88,6 @@ export default { ...@@ -88,7 +88,6 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.myDeclaration-module{ .myDeclaration-module{
width: 1126px;
//margin: auto; //margin: auto;
.el-divider--horizontal{ .el-divider--horizontal{
background-color: black!important; background-color: black!important;
...@@ -109,6 +108,7 @@ export default { ...@@ -109,6 +108,7 @@ export default {
} }
.body{ .body{
padding-top: 30px; padding-top: 30px;
padding-right:30px;
::v-deep.el-table th{ ::v-deep.el-table th{
background-color: white!important; background-color: white!important;
} }
......
<template> <template>
<div class="personalCenter-module"> <div class="personalCenter-module">
<div class="topHeader"> <div class="topHeader">
<HomeSearch/> <HomeSearch />
<nav-list :list="navList" :current-menu="'/personalCenter/index'"/> <nav-list :list="navList" :current-menu="'/personalCenter/index'" />
</div> </div>
<div class="personalCenter-content"> <div class="personalCenter-content">
<div class="body"> <div class="body">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="1"> <el-col :span="1">
<i class="el-icon-arrow-left" style="color: #1A78E5;font-weight: bold;padding-top: 40px" <i
@click="handleGoBack"/> class="el-icon-arrow-left"
style="color: #1A78E5;font-weight: bold;padding-top: 40px"
@click="handleGoBack"
/>
<!-- <el-button type="primary" icon="el-icon-arrow-left" circle @click="handleGoBack" />--> <!-- <el-button type="primary" icon="el-icon-arrow-left" circle @click="handleGoBack" />-->
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -40,25 +43,25 @@ ...@@ -40,25 +43,25 @@
<el-col :span="18"> <el-col :span="18">
<div class="right-region"> <div class="right-region">
<div v-if="choseMenu === '个人信息'"> <div v-if="choseMenu === '个人信息'">
<personal-info/> <personal-info />
</div> </div>
<div v-if="choseMenu === '关联企业'"> <div v-if="choseMenu === '关联企业'">
<AffiliatedEnterprises/> <AffiliatedEnterprises />
</div> </div>
<div v-if="choseMenu === '我的收藏'"> <div v-if="choseMenu === '我的收藏'">
<my-collection/> <my-collection />
</div> </div>
<div v-if="choseMenu === '我的申报'"> <div v-if="choseMenu === '我的申报'">
<my-declaration/> <my-declaration />
</div> </div>
<div v-if="choseMenu === '我的活动'"> <div v-if="choseMenu === '我的活动'">
<my-activities/> <my-activities />
</div> </div>
<div v-if="choseMenu === '修改密码'"> <div v-if="choseMenu === '修改密码'">
<change-password @changeRouter="changeRouter"/> <change-password @changeRouter="changeRouter" />
</div> </div>
<div v-if="choseMenu === '消息中心'"> <div v-if="choseMenu === '消息中心'">
<message-center/> <message-center />
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -78,8 +81,8 @@ import myDeclaration from './components/myDeclaration' ...@@ -78,8 +81,8 @@ import myDeclaration from './components/myDeclaration'
import personalInfo from './components/personalInfo' import personalInfo from './components/personalInfo'
import HomeSearch from '@/views/homePage/components/searchHome/index' import HomeSearch from '@/views/homePage/components/searchHome/index'
import NavList from '@/views/homePage/components/NavList/index' import NavList from '@/views/homePage/components/NavList/index'
import {myMessage} from '@/views/personalCenter/apis' import { myMessage } from '@/views/personalCenter/apis'
import {idGetImg} from '@/views/OneClickService/apis' import { idGetImg } from '@/views/OneClickService/apis'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import headImg from '../../assets/image/touxiang.png' import headImg from '../../assets/image/touxiang.png'
...@@ -101,13 +104,13 @@ export default { ...@@ -101,13 +104,13 @@ export default {
loading: true, // 头像遮罩 loading: true, // 头像遮罩
choseMenu: '个人信息', // 选择的模块 choseMenu: '个人信息', // 选择的模块
options: [ options: [
{name: '个人信息'}, { name: '个人信息' },
{name: '关联企业'}, { name: '关联企业' },
{name: '我的收藏'}, { name: '我的收藏' },
{name: '我的申报'}, { name: '我的申报' },
{name: '我的活动'}, { name: '我的活动' },
{name: '修改密码'}, { name: '修改密码' },
{name: '消息中心'} { name: '消息中心' }
], ],
form: { form: {
// img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', // img: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
...@@ -115,25 +118,25 @@ export default { ...@@ -115,25 +118,25 @@ export default {
nickName: '' nickName: ''
}, },
personalCenterList: [ personalCenterList: [
{img: require('@/assets/image/gongju-pic1.jpg'), name: '石家庄政务服务'}, { img: require('@/assets/image/gongju-pic1.jpg'), name: '石家庄政务服务' },
{img: require('@/assets/image/gongju-pic2.jpg'), name: '石家庄政务服务'}, { img: require('@/assets/image/gongju-pic2.jpg'), name: '石家庄政务服务' },
{img: require('@/assets/image/gongju-pic3.jpg'), name: '石家庄政务服务'}, { img: require('@/assets/image/gongju-pic3.jpg'), name: '石家庄政务服务' },
{img: require('@/assets/image/gongju-pic4.jpg'), name: '石家庄政务服务'}, { img: require('@/assets/image/gongju-pic4.jpg'), name: '石家庄政务服务' },
{img: require('@/assets/image/gongju-pic5.jpg'), name: '石家庄政务服务'}, { img: require('@/assets/image/gongju-pic5.jpg'), name: '石家庄政务服务' },
{img: require('@/assets/image/gongju-pic6.jpg'), name: '石家庄政务服务'} { img: require('@/assets/image/gongju-pic6.jpg'), name: '石家庄政务服务' }
] ]
} }
}, },
computed: { computed: {
navList() { navList() {
const navArray = [ const navArray = [
{menuName: '首页', path: '/', query: {}}, { menuName: '首页', path: '/', query: {}},
{menuName: '政策直达', path: '/PolicyDirect/index', query: {}}, { menuName: '政策直达', path: '/PolicyDirect/index', query: {}},
{menuName: '服务共享', path: '/ServiceShare/index'}, { menuName: '服务共享', path: '/ServiceShare/index' },
{menuName: '企业诉求', path: '/EnterpriseAppeal/index', query: {}}, { menuName: '企业诉求', path: '/EnterpriseAppeal/index', query: {}},
{menuName: '一键办事', path: '/OneClickService/index', query: {}}, { menuName: '一键办事', path: '/OneClickService/index', query: {}},
{menuName: '活动信息', path: '/activityInformation/index', query: {}}, { menuName: '活动信息', path: '/activityInformation/index', query: {}},
{menuName: '个人中心', path: '/personalCenter/index', query: {}} { menuName: '个人中心', path: '/personalCenter/index', query: {}}
] ]
return navArray return navArray
} }
......
...@@ -7,17 +7,19 @@ ...@@ -7,17 +7,19 @@
<el-row> <el-row>
<el-col :span="1"> <el-col :span="1">
<!--<el-button class="back-button" type="primary" icon="el-icon-arrow-left" circle @click="handleGoBack" />--> <!--<el-button class="back-button" type="primary" icon="el-icon-arrow-left" circle @click="handleGoBack" />-->
<i class="el-icon-arrow-left" style="color: #1A78E5;font-weight: bold;padding-top: 40px" @click="handleGoBack" /> <i class="el-icon-arrow-left" @click="handleGoBack" />
</el-col> </el-col>
<el-col :span="23"> <el-col :span="23">
<div style="background-color: #ffffff;padding: 50px 30px 20px 30px;min-height: 500px"> <div style="background-color: #ffffff;padding: 29px 30px 20px 30px;min-height: 500px">
<div class="info-top"> <div class="info-top">
<div class="title">消息详情</div> <div class="title">消息详情</div>
<el-button type="text" class="updataBtn" @click="handleDel">删除</el-button> <el-button type="text" class="updataBtn" @click="handleDel">
<i class="el-icon-delete-solid" />
删除</el-button>
</div> </div>
<!-- <el-divider />--> <!-- <el-divider />-->
<div class="body"> <div class="body">
<div class="title">{{ form.title }}</div> <div class="form-title">{{ form.title }}</div>
<div class="value">{{ form.content }}</div> <div class="value">{{ form.content }}</div>
<div class="time">{{ form.createTime }}</div> <div class="time">{{ form.createTime }}</div>
</div> </div>
...@@ -106,7 +108,8 @@ export default { ...@@ -106,7 +108,8 @@ export default {
width: 100%; width: 100%;
} }
.messageDetails-content{ .messageDetails-content{
padding: 310px 120px 40px; width: 1400px;
padding: 312px 120px 34px;
//margin-top: 30px; //margin-top: 30px;
.back-button { .back-button {
margin-top: 30px; margin-top: 30px;
...@@ -120,13 +123,18 @@ export default { ...@@ -120,13 +123,18 @@ export default {
.title{ .title{
font-weight: bold; font-weight: bold;
font-size: 17px; font-size: 17px;
color: #333333;
} }
.updataBtn{ .updataBtn{
font-size: 15px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #1A78E5;
-webkit-background-clip: text;
} }
} }
.body{ .body{
padding-top: 40px; padding-top: 34px;
.title{ .title{
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
...@@ -134,13 +142,41 @@ export default { ...@@ -134,13 +142,41 @@ export default {
padding-bottom: 35px; padding-bottom: 35px;
} }
.value{ .value{
text-indent: 2em; font-size: 15px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 25px;
-webkit-background-clip: text;
} }
.time{ .time{
padding-top: 30px; padding-top: 30px;
float: right; float: right;
font-size: 15px;
font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400;
color: #333333;
line-height: 24px;
-webkit-background-clip: text;
}
.form-title{
text-align: center;
font-size: 19px;
font-family: Source Han Sans CN-Bold, Source Han Sans CN;
font-weight: bold;
color: #333333;
-webkit-background-clip: text;
line-height: 24px;
padding-bottom: 36px;
} }
} }
} }
.el-icon-arrow-left{
color: #1A78E5;
font-weight: bold;
padding-top: 41px;
float: right;
margin-right: 20px;
}
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment