Skip to content

B
beyond-clouds-front
Commit cd087891 by yanju
Options

修复细节 个人中心

parent e78ef7be
Showing with 277 additions and 69 deletions
components/pc/alertsMessage/alertsCard.vue
......@@ -42,7 +42,7 @@ export default {
},
created(){
this.$axios.$get(config.api.get.Message.list,{params:{page:1,
size:7
size:4
}}).then((response)=>{
/* console.log(response);
let message1 = [];
......@@ -64,6 +64,8 @@ export default {
}
},
methods:{
handleRead(){
this.$axios.$put(config.api.put.Message.readAll).then((response)=>{
if(this.message.length!==0) {
......
components/pc/answerCard.vue
......@@ -32,7 +32,8 @@
</div>
<div class="label-box">
<p v-for="(val,index) in tags" :key="val.tagId">{{val.tagName}}</p>
<p v-if="isMy&&status===0" class="label-box__pass">正常</p>
<p v-if="isMy&&status===-1" class="label-box__zero">被锁定</p>
</div>
</div>
</div>
......@@ -82,7 +83,7 @@
userNick:'',
viewNumber:'',
showCard:true,
status:0
}
},
created(){
......@@ -102,6 +103,7 @@
this.tags = info.tags;
this.userNick = info.userNick;
this.viewNumber = info.viewNumber;
this.status = info.status;
}
if(this.info.itemId){
this.questionTitle = info.title;
......@@ -299,6 +301,18 @@
}
> .label-box{
margin-left:32*$length;
.label-box__err{
color:#fff;
background-color: #f11818;
}
.label-box__zero{
color:#fff;
background-color: #ff780091;
}
.label-box__pass{
color:#fff;
background-color: #11ef1fb0;
}
> p{
display: inline-block;
margin-right:10*$length;
......
components/pc/errorCard.vue
<template>
<div class="error-card-notfound">
<div class="not-found">
<img src="../../assets/svg/four.jpg" alt="">
<img src="../../assets/svg/zero.jpg" alt="">
<img class="rotating" src="../../assets/svg/four.jpg" alt="">
<div class="box-404">
<img src="../../assets/svg/404.png" alt="">
</div>
<p class="not-found-content">加载失败，请重新尝试</p>
<button class="reload" @click="reload">刷新页面</button>
<button class="reload" @click="reload">返回首页</button>
</div>
</div>
</template>
......@@ -15,7 +16,7 @@ export default {
name: "errorCard",
methods:{
reload(){
location.reload()
this.$router.replace('/')
}
}
}
......@@ -25,13 +26,23 @@ export default {
.error-card-notfound{
height: 100%;
width: 100%;
background-color: #fff;
background-image: $bgImage;
margin: 0 auto;
@extend %flex-row-center;
.not-found{
text-align: center;
.box-404{
width:442*$length;
height:200*$length;
margin:0 auto;
@extend %flex-row-center;
img{
display: inline-block;
width:442*$length;
height:auto;
}
}
.rotating{
transform: rotate(25deg);
margin-top: 25*$length;
......@@ -39,7 +50,7 @@ export default {
.not-found-content{
padding-top: 20*$length;
padding-bottom: 47*$length;
@include fontStyle(16,22,500,#333,center);
@include fontStyle(16,22,500,#666,center);
}
.reload{
display: block;
......
components/pc/pageHeader.vue
......@@ -171,6 +171,11 @@
AlertsCard
},
validate ({ params }) {
// Must be a number
return /^\d+$/.test(params.id)
},
created(){
this.route = this.$route.name;
this.progressShow = true;
......@@ -183,6 +188,11 @@
this.detailType = type;
});
this.changeHeader();
if(!this.$store.state.userProfile.userId){
if(this.$route.path.indexOf('personal-center') !== -1||this.$route.path.indexOf('release') !== -1){
this.$router.replace('/')
}
}
},
watch:{
$route(route){
......@@ -192,6 +202,11 @@
setTimeout(()=>{
this.progressShow = false;
},900)
if(!this.$store.state.userProfile.userId){
if(this.$route.path.indexOf('personal-center') !== -1||this.$route.path.indexOf('release') !== -1){
this.$router.replace('/')
}
}
}
},
......
components/pc/projectCard.vue
......@@ -17,6 +17,9 @@
</div>
<div class="label-box" v-if="cardType===1">
<p v-for="(val,index) in cardTags" :key="val.tagId">{{val.tagName}}</p>
<p v-if="isMy&&status===-1" class="label-box__err">被锁定</p>
<p v-if="isMy&&status===0" class="label-box__zero">待审核</p>
<p v-if="isMy&&status===1" class="label-box__pass">审核通过</p>
</div>
</div>
......@@ -44,6 +47,8 @@
</div>
<div class="label-box" v-if="cardType===2">
<p v-for="(val,index) in cardTags" :key="val.tagId">{{val.tagName}}</p>
<p v-if="isMy&&status===0" class="label-box__pass">正常</p>
<p v-if="isMy&&status===-1" class="label-box__zero">被锁定</p>
</div>
</div>
</div>
......@@ -104,7 +109,7 @@
cardTags:[],
cardTime:'',
cardUser:'',
status:0,
cardStar:'',
cardLike:'',
cardView:'',
......@@ -114,6 +119,25 @@
this.dateGet2Info();
},
computed:{
cardState(){
if(this.status===0){
if(this.cardType===1){
return '待审核'
}
if(this.cardType===2){
}
}
if(this.status===1){
}
if(this.status===-1){
}
}
},
methods:{
dateGet2Info(){
let info = this.info;
......@@ -127,6 +151,8 @@
this.cardView = info.viewNumber;
this.cardUser = info.userNick;
this.cardType = 2;
this.status = info.status;
}
if(this.info.projectId){
this.cardName = info.projectName;
......@@ -139,6 +165,8 @@
this.cardTime = dateConvert(info.createTime);
this.cardUser = info.author;
this.cardType = 1;
this.status = info.status;
}
if(this.info.contentId){
this.cardName = info.title;
......@@ -291,6 +319,8 @@
margin-left:5*$length;
@extend %flex-row-spb;
justify-content: flex-start;
> p{
margin-bottom: 8*$length;
margin-right:10*$length;
......@@ -305,6 +335,20 @@
color:rgba(0,170,230,1);
}
}
.label-box__err{
color:#fff;
background-color: #f11818;
}
.label-box__zero{
color:#fff;
background-color: #ff780091;
}
.label-box__pass{
color:#fff;
background-color: #11ef1fb0;
}
}
}
......@@ -354,6 +398,7 @@
flex-wrap:wrap;
@extend %flex-row-spb;
justify-content: flex-start;
> p{
margin-bottom: 8*$length;
margin-right:10*$length;
......@@ -368,6 +413,18 @@
color:rgba(0,170,230,1);
}
}
.label-box__err{
color:#fff;
background-color: #f11818;
}
.label-box__zero{
color:#fff;
background-color: #ff780091;
}
.label-box__pass{
color:#fff;
background-color: #11ef1fb0;
}
}
}
}
......
components/pc/socialContactCard.vue
......@@ -26,6 +26,8 @@
<div class="header-r">
<yun-icon v-if="userId===$store.state.userProfile.userId" name="down_arrow" size="6px" color="#999" @click.native.stop="clickToShowDrop"></yun-icon>
<p v-if="isMy&&status===-1" class="label-box__pass">正常</p>
<p v-if="isMy&&status===-1" class="label-box__zero">被锁定</p>
<dropdown v-if="showDrop">
<li @click="dateDeleteCard(postId)" ref="deleteButton">删除</li>
</dropdown>
......@@ -125,6 +127,10 @@
pageType:{
type:String,
default:''
},
isMy:{
type:Boolean,
default:false
}
},
......@@ -155,6 +161,7 @@
followedAuthor:false,
followLoading:false,
showCommentCon:false,
status:0,
}
},
......@@ -272,6 +279,7 @@
this.userAvatar = info.userAvatar;
this.followedAuthor = info.followedAuthor;
this.commentNumber = info.commentNumber;
this.status = info.status;
}
},
dateDeleteCard(id){
......@@ -399,6 +407,32 @@
}
.header-r{
position:relative;
.label-box__err{
color:#fff;
background-color: #f11818;
}
.label-box__zero{
color:#fff;
background-color: #ff780091;
}
.label-box__pass{
color:#fff;
background-color: #11ef1fb0;
}
> p{
position: absolute;
width:30px;
top:3px;
right:30*$length;
display: inline-block;
margin-right:10*$length;
padding:2*$length 8*$length;
background-color: #F4F8FA;
@include border-radius(2*$length);
@include fontStyle(12,16,500,#999,center);
@extend %animate-transition;
@extend %cursorPointer;
}
}
}
......
layouts/error.vue
......@@ -17,6 +17,10 @@ export default {
components: {
ErrorCard
},
created() {
},
methods:{
close(){
window.opener = null;
......@@ -29,11 +33,15 @@ export default {
<style lang="scss" scoped>
.error-card__wrap{
position: fixed;
top: 50%;
transform: translateY(-55%);
top: 0;
bottom:0;
width: 100%;
text-align: center;
@extend %flex-row-center;
background-image: $bgImage;
.error-card{
margin: 0 auto;
img{
......
pages/answer/release/index.vue
......@@ -4,12 +4,12 @@
<card-container
title="以发布的问题"
width="302px"
height="270px"
style="padding-bottom: 20px"
>
<div class="answer-release_List" v-for="val in questionList" :key="val.questionId" :info="val">
<div class="answer-box" @click="toDetail(val.questionId)">
<p>{{val.questionTitle}}</p>
<p style="color: #999">{{val.category}}</p>
<p class="answer-box__title">{{val.questionTitle}}</p>
<p class="answer-box__type" style="color: #999">{{val.category}}</p>
</div>
</div>
</card-container>
......@@ -18,6 +18,7 @@
width="302px"
height="400px"
style="margin-top: 16px"
v-if="false"
></card-container>
</div>
<div class="answer-release-container__r">
......@@ -371,9 +372,15 @@
@extend %flex-row-spb;
@extend %cursorPointer;
.answer-box__title {
width: 60%;
width: 70%;
@extend %nowrap;
}
.answer-box__type{
width: 30%;
@extend %nowrap;
@include fontStyle(13, 17, 500, #999, right);
}
&:hover {
color: #00AAE6;
}
......
pages/blog/index.vue
......@@ -151,7 +151,6 @@ export default {
};
this.$axios.$get(config.api.get.User.hotBloggers,{params:params})
.then((response)=>{
console.log(response);
this.hotBloggerList = response.data.dataList;
});
},
......
pages/blog/release/index.vue
......@@ -4,16 +4,17 @@
<card-container
title="已发布的博客"
width="302px"
height="400px"
style="padding-bottom: 10px"
>
<div class="blog-release_List" v-for="val in blogList" :key="val.blogId" :info="val">
<div class="blog-box" @click="toDetail(val.blogId)">
<p>{{val.blogTitle}}</p>
<p style="color: #999">{{val.category}}</p>
<p class="blog-box__title">{{val.blogTitle}}</p>
<p class="blog-box__type" style="color: #999">{{val.category}}</p>
</div>
</div>
</card-container>
<card-container
v-if="false"
title="博客草稿箱"
width="302px"
height="400px"
......@@ -518,8 +519,14 @@ export default {
@extend %cursorPointer;
.blog-box__title {
width: 60%;
width: 70%;
@extend %nowrap;
}
.blog-box__type{
width: 30%;
@extend %nowrap;
@include fontStyle(13, 17, 500, #999, right);
}
&:hover {
......
pages/personal-center/home/dynamic.vue
<template>
<div>
<release-card style="margin-top: 16px" @listenReleaseState="dataGetDynamic(1)"></release-card>
<social-card pageType="my" @listenSocialCardState="dataGetDynamic(1)" v-for="(val,index) in rightList" :key="val.postId" :info="val"></social-card>
<social-card :isMy="true" @listenSocialCardState="dataGetDynamic(1)" v-for="(val,index) in rightList" :key="val.postId" :info="val"></social-card>
<pagination key="container5" style="margin:20px auto;" :pages="pages" v-on:listenPageChange="changePage"></pagination>
</div>
</template>
......
pages/personal-center/message.vue
......@@ -15,29 +15,29 @@
<p class="line" v-if="selected==='全部'"></p>
</div>
<div class="left__item">
<p class="abs"></p>
<p class="word">评论</p>
<p class="line" v-if="selected==='评论'"></p>
</div>
<div class="left__item">
<p class="abs"></p>
<p class="word">喜欢</p>
<p class="line" v-if="selected==='评论'"></p>
</div>
<div class="left__item">
<p class="abs"></p>
<p class="word">粉丝</p>
<p class="line" v-if="selected==='评论'"></p>
</div>
<div class="left__item">
<p class="abs"></p>
<p class="word">公告</p>
<p class="line" v-if="selected==='评论'"></p>
</div>
<!-- <div class="left__item">-->
<!-- <p class="abs"></p>-->
<!-- <p class="word">评论</p>-->
<!-- <p class="line" v-if="selected==='评论'"></p>-->
<!-- </div>-->
<!-- <div class="left__item">-->
<!-- <p class="abs"></p>-->
<!-- <p class="word">喜欢</p>-->
<!-- <p class="line" v-if="selected==='评论'"></p>-->
<!-- </div>-->
<!-- <div class="left__item">-->
<!-- <p class="abs"></p>-->
<!-- <p class="word">粉丝</p>-->
<!-- <p class="line" v-if="selected==='评论'"></p>-->
<!-- </div>-->
<!-- <div class="left__item">-->
<!-- <p class="abs"></p>-->
<!-- <p class="word">公告</p>-->
<!-- <p class="line" v-if="selected==='评论'"></p>-->
<!-- </div>-->
</div>
<p class="tab__right">
全部标记为已读
......@@ -59,10 +59,11 @@
import NoticeCard from '../../components/pc/noticeCard';
import NavWrap from "../../components/pc/nav/navWrap";
import config from "../../action/config";
export default {
data(){
return{
data() {
return {
list: [
{
label: '我的消息',
......@@ -70,36 +71,81 @@
id: '我的消息'
}
],
selected:'全部'
selected: '全部'
}
},
components:{
components: {
NoticeCard, NavWrap
NoticeCard,NavWrap
},
created() {
this.dataGetMessages()
},
methods: {
dataGetMessages() {
this.$axios.$get(config.api.get.Message.list, {
params: {
page: 1,
size: 7
}
}).then((response) => {
this.message = response.data.dataList;
console.log(response.data.dataList);
});
},
methods:{
showAlert(){
dataPutRead() {
this.$axios.$put(config.api.put.Message.read).then((response) => {
if (this.message.length !== 0) {
this.$message({
type: 'success',
message: '已全部标记已读'
});
this.flag = 4
} else {
this.$message({
type: 'warning',
message: '没有未读信息'
});
}
})
},
// $alert 使用方法
this.$alert('确认清空消息列表？', '', {
confirmButtonText: '确定',
// callback: action => {
// this.$message({
// type: 'info',
// message: `action: ${ action }`,
// confirmButtonPosition: 'left',
// });
// }
dataPutReadAll() {
this.$axios.$put(config.api.put.Message.readAll).then((response) => {
if (this.message.length !== 0) {
this.$message({
type: 'success',
message: '已全部标记已读'
});
this.flag = 4
} else {
this.$message({
type: 'warning',
message: '没有未读信息'
});
}
})
},
dataDeleteMessage() {
this.$axios.$delete(config.api.delete.Messages.delete).then((response) => {
this.$message({
type: 'success',
message: '已全部清空'
});
this.message.length = 0;
})
},
mounted(){
mounted() {
// this.$popupbox();
// message 使用方法
......@@ -111,6 +157,7 @@
}
}
}
</script>
<style lang="scss" scoped>
......
pages/project/release/index.vue
......@@ -4,16 +4,17 @@
<card-container
title="已发布项目"
width="302px"
height="400px"
style="padding-bottom: 10px"
>
<div class="project-release_List" v-for="val in projectList" :key="val.projectId" :info="val">
<div class="project-box" @click="toDetail(val.projectId)">
<p>{{val.projectName}}</p>
<p style="color: #999">{{val.category}}</p>
<p class="project-box__title">{{val.projectName}}</p>
<p class="project-box__type" style="color: #999">{{val.category}}</p>
</div>
</div>
</card-container>
<card-container
v-if="false"
title="项目草稿箱"
width="302px"
height="400px"
......@@ -513,9 +514,15 @@ export default {
@extend %flex-row-spb;
@extend %cursorPointer;
.project-box__title {
width: 60%;
width: 70%;
@extend %nowrap;
}
.project-box__type{
width: 30%;
@extend %nowrap;
@include fontStyle(13, 17, 500, #999, right);
}
&:hover {
color: #00AAE6;
}
......
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