Skip to content

B
beyond-clouds-front
Commit b133e4cc by yanju
Options

修复细节问题

parent 39cefe78
Showing with 98 additions and 58 deletions
action/config.js
...@@ -53,6 +53,7 @@ export default { ...@@ -53,6 +53,7 @@ export default {
elites:'/api/user/elites',//社区精英 elites:'/api/user/elites',//社区精英
active:'/api/user/actives',//活跃用户 active:'/api/user/actives',//活跃用户
repliers:'/api/user/hotRepliers',//热门答主 repliers:'/api/user/hotRepliers',//热门答主
logout:'/api/user/logout',//注销登录
}, },
......
components/pc/banner.vue
<template> <template>
<div class="banner-card__wrap"> <div class="banner-card__wrap">
<div class="banner-card" v-if="bannerType===1"> <div class="banner-card" v-if="bannerType===1">
<img class="banner-card__img" :src="imgArr[currentImg]" :style="{opacity:imgOpacity}" alt="" > <a :href="linkArr[currentImg]">
<img class="banner-card__img" :src="imgArr[currentImg]" :style="{opacity:imgOpacity}" alt="" >
</a>
<div class="banner-card__left-arrow" @click="clickToGetPrePic"> <div class="banner-card__left-arrow" @click="clickToGetPrePic">
<p> <p>
...@@ -46,6 +49,10 @@ ...@@ -46,6 +49,10 @@
default:[], default:[],
type: Array type: Array
}, },
linkArr:{
default:[],
type: Array
},
playTime:{ playTime:{
default:3000, default:3000,
type: Number type: Number
...@@ -79,7 +86,6 @@ ...@@ -79,7 +86,6 @@
watch:{ watch:{
currentImg2(pev,now){ currentImg2(pev,now){
console.log(pev,now);
this.currentImg = this.currentImg2; this.currentImg = this.currentImg2;
} }
}, },
......
components/pc/nav/navCard.vue
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
if (this.$route.query.type) { if (this.$route.query.type) {
this.isBlue = this.$route.query.type===this.labelId; this.isBlue = this.$route.query.type===this.labelId;
} else { } else {
this.isBlue = this.$route.path.indexOf(this.navAddress) !== -1 &&(this.$route.path.indexOf('personal-center') === -1||this.$route.path.indexOf('search') === -1); this.isBlue = this.$route.path.indexOf(this.navAddress) !== -1 &&(this.$route.path.indexOf('personal-center') !== -1||this.$route.path.indexOf('search') !== -1);
} }
}, },
......
components/pc/pageHeader.vue
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<span :style="{color:route==='index'||route===''?'#00AAE6':'#666'}">首页</span> <span :style="{color:route==='index'||route===''?'#00AAE6':'#666'}">首页</span>
<div class="abs-line" v-if="route==='index'||route===''"></div> <div class="abs-line" v-if="route==='index'||route===''"></div>
</nuxt-link> </nuxt-link>
<nuxt-link tag="li" to="/project"> <nuxt-link tag="li" to="/project?type=all">
<span :style="{color:route==='project'?'#00AAE6':'#666'}">项目</span> <span :style="{color:route==='project'?'#00AAE6':'#666'}">项目</span>
<div class="abs-line" v-if="route==='project'"></div> <div class="abs-line" v-if="route==='project'"></div>
</nuxt-link> </nuxt-link>
<nuxt-link tag="li" to="/blog"> <nuxt-link tag="li" to="/blog?type=all">
<span :style="{color:route==='blog'?'#00AAE6':'#666'}">博客</span> <span :style="{color:route==='blog'?'#00AAE6':'#666'}">博客</span>
<div class="abs-line" v-if="route==='blog'"></div> <div class="abs-line" v-if="route==='blog'"></div>
</nuxt-link> </nuxt-link>
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
<span tag="span" to="/dynamic" :style="{color:route==='dynamic'?'#00AAE6':'#666'}">动态</span> <span tag="span" to="/dynamic" :style="{color:route==='dynamic'?'#00AAE6':'#666'}">动态</span>
<div class="abs-line" v-if="route==='dynamic'"></div> <div class="abs-line" v-if="route==='dynamic'"></div>
</nuxt-link> </nuxt-link>
<nuxt-link tag="li" to="/topic"> <nuxt-link tag="li" to="/topic?type=all">
<span :style="{color:route==='topic'?'#00AAE6':'#666'}">话题</span> <span :style="{color:route==='topic'?'#00AAE6':'#666'}">话题</span>
<div class="abs-line" v-if="route==='topic'"></div> <div class="abs-line" v-if="route==='topic'"></div>
</nuxt-link> </nuxt-link>
<nuxt-link tag="li" to="/answer"> <nuxt-link tag="li" to="/answer?type=all">
<span :style="{color:route==='answer'?'#00AAE6':'#666'}">问答</span> <span :style="{color:route==='answer'?'#00AAE6':'#666'}">问答</span>
<div class="abs-line" v-if="route==='answer'"></div> <div class="abs-line" v-if="route==='answer'"></div>
</nuxt-link> </nuxt-link>
<nuxt-link tag="li" to="/news"> <nuxt-link tag="li" to="/news?type=all">
<span :style="{color:route==='news'?'#00AAE6':'#666'}">资讯</span> <span :style="{color:route==='news'?'#00AAE6':'#666'}">资讯</span>
<div class="abs-line" v-if="route==='news'"></div> <div class="abs-line" v-if="route==='news'"></div>
</nuxt-link> </nuxt-link>
...@@ -76,29 +76,29 @@ ...@@ -76,29 +76,29 @@
<nuxt-link tag="span" to="/blog/release">写博客</nuxt-link> <nuxt-link tag="span" to="/blog/release">写博客</nuxt-link>
</li> </li>
<li> <li>
<nuxt-link tag="span" to="/dynamic">发布动态</nuxt-link> <nuxt-link tag="span" to="/dynamic?type=all">发布动态</nuxt-link>
</li> </li>
<li> <li>
<nuxt-link tag="span" to="/answer/release">我要提问</nuxt-link> <nuxt-link tag="span" to="/answer/release">我要提问</nuxt-link>
</li> </li>
<li> <!-- <li>-->
<nuxt-link tag="span" to="/news/release">资讯投稿</nuxt-link> <!-- <nuxt-link tag="span" to="/news/release">资讯投稿</nuxt-link>-->
</li> <!-- </li>-->
</ul> </ul>
<ul class="abs-box abs-box2" v-if="showHideBox2" @mouseover="changeStateShowBox(2)" @mouseleave="changeStateHideBox(2)"> <ul class="abs-box abs-box2" v-if="showHideBox2" @mouseover="changeStateShowBox(2)" @mouseleave="changeStateHideBox(2)">
<li> <li>
<nuxt-link tag="span" to="/personal-center/home/project">我的主页</nuxt-link> <nuxt-link tag="span" to="/personal-center/home/project">我的主页</nuxt-link>
</li> </li>
<li> <!-- <li>-->
<nuxt-link tag="span" to="/personal-center/like/support">我的喜欢</nuxt-link> <!-- <nuxt-link tag="span" to="/personal-center/like/support">我的喜欢</nuxt-link>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<nuxt-link tag="span" to="/personal-center/like/collect">我的收藏</nuxt-link> <!-- <nuxt-link tag="span" to="/personal-center/like/collect">我的收藏</nuxt-link>-->
</li> <!-- </li>-->
<li> <li>
<nuxt-link tag="span" to="/personal-center/person">我的关注</nuxt-link> <nuxt-link tag="span" to="/personal-center/person">我的关注</nuxt-link>
...@@ -217,13 +217,18 @@ ...@@ -217,13 +217,18 @@
this.$alert('确认注销登录？', '', { this.$alert('确认注销登录？', '', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: action => { callback: action => {
// 删除cookie this.$axios.$get(config.api.get.User.logout).then((response)=>{
Cookie.remove(config.default_data.KEY_COOKIE_TOKEN) if(response.code === 0 ){
// 移除登录信息 // 删除cookie
this.$store.commit('auth/logout') Cookie.remove(config.default_data.KEY_COOKIE_TOKEN)
// 移除用户信息 // 移除登录信息
this.$store.commit('userProfile/removeUser') this.$store.commit('auth/logout')
this.routeToHome(); // 移除用户信息
this.$store.commit('userProfile/removeUser')
this.routeToHome();
}
})
} }
}); });
}, },
......
components/pc/socialContactCard.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="header-l__info-bottom"> <div class="header-l__info-bottom">
<p class="date">{{createTime}}</p> <p class="date">{{createTime}}</p>
<p class="limits">该动态仅自己可见</p> <!-- <p class="limits">该动态仅自己可见</p>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
<div class="card-footer"> <div class="card-footer">
<div class="footer-item1"> <div class="footer-item1" @click="MessageAlert">
<yun-icon name="star" size="12px" ></yun-icon> <yun-icon name="star" size="12px" ></yun-icon>
<p class="star">收藏</p> <p class="star">收藏</p>
</div> </div>
<div class="footer-item2"> <div class="footer-item2" @click="MessageAlert">
<yun-icon name="share" size="12px" ></yun-icon> <yun-icon name="share" size="12px" ></yun-icon>
<p class="share">转发</p> <p class="share">转发</p>
</div> </div>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<yun-icon name="comment" size="12px" ></yun-icon> <yun-icon name="comment" size="12px" ></yun-icon>
<p class="comment">评论({{commentNumber}})</p> <p class="comment">评论({{commentNumber}})</p>
</div> </div>
<div class="footer-item4"> <div class="footer-item4" @click="MessageAlert">
<yun-icon name="like1" size="12px" ></yun-icon> <yun-icon name="like1" size="12px" ></yun-icon>
<p class="like1"> 收藏</p> <p class="like1"> 收藏</p>
</div> </div>
...@@ -243,6 +243,15 @@ ...@@ -243,6 +243,15 @@
}, },
methods:{ methods:{
MessageAlert(){
this.$message({
type:'info',
message:'该功能尚未启用'
})
},
clickToOpenBanner(index){ clickToOpenBanner(index){
this.showBanner = true; this.showBanner = true;
this.currentImg = index this.currentImg = index
......
pages/answer/index.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<div class="answer-container__right"> <div class="answer-container__right">
<div class="right__write-answer" @click="toRelease">我要提问</div> <div class="right__write-answer" @click="toRelease">我要提问</div>
<div class="right__search-answer"> <div class="right__search-answer" v-if="false">
<input type="text"> <input type="text">
<div @click="search"><yun-icon name="search" size="16px" color="#fff"></yun-icon></div> <div @click="search"><yun-icon name="search" size="16px" color="#fff"></yun-icon></div>
</div> </div>
...@@ -50,9 +50,8 @@ ...@@ -50,9 +50,8 @@
</div> </div>
<card-container <card-container
title="热门答主" title="热门答主"
more="更多"
width="302px" width="302px"
style="margin-top: 16px" style="margin-top: 16px;padding-bottom: 10px"
> >
<user-card style="padding-bottom: 2px;padding-top: 2px" v-for="(val,index) in repliersList" :key="val.userId" :info="val"></user-card> <user-card style="padding-bottom: 2px;padding-top: 2px" v-for="(val,index) in repliersList" :key="val.userId" :info="val"></user-card>
</card-container> </card-container>
...@@ -88,12 +87,6 @@ export default { ...@@ -88,12 +87,6 @@ export default {
} }
}, },
created() { created() {
this.$router.replace({
path: '/answer',
query: {
type: 'all'
}
});
this.getLabelTitle(); this.getLabelTitle();
this.dataGetQuestionCategory(); this.dataGetQuestionCategory();
this.dataGetHotRepliersList(); this.dataGetHotRepliersList();
......
pages/blog/index.vue
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
<div class="right__write-blog" @click="toRelease">写文章</div> <div class="right__write-blog" @click="toRelease">写文章</div>
<card-container <card-container
title="热门博主" title="热门博主"
label="换一换"
more="更多"
width="302px" width="302px"
style="margin-top: 16px;max-height: 446px;" style="margin-top: 16px;max-height: 446px;padding-bottom: 10px"
> >
<user-card v-for="(item, index) in hotBloggerList" :key="item.userId" :info="item"></user-card> <user-card v-for="(item, index) in hotBloggerList" :key="item.userId" :info="item"></user-card>
</card-container> </card-container>
...@@ -86,12 +84,6 @@ export default { ...@@ -86,12 +84,6 @@ export default {
} }
}, },
created() { created() {
this.$router.replace({
path: '/blog',
query: {
type: 'all'
}
});
this.dataGetBlogCategory(); this.dataGetBlogCategory();
this.getLabelTitle(); this.getLabelTitle();
this.dataGetHotTagsList(); this.dataGetHotTagsList();
......
pages/dynamic/index.vue
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
<h6>{{val.referenceCount}}</h6> <h6>{{val.referenceCount}}</h6>
</nuxt-link> </nuxt-link>
</card-container> </card-container>
<card-container style="margin-top:16px" title="推荐用户" label="换一换" more="更多"> <card-container style="margin-top:16px;padding-bottom: 10px" title="活跃用户" >
<user-card style="padding-bottom: 2px;padding-top: 2px" v-for="(val,index) in userList" :key="val.userId" :info="val"></user-card>
</card-container> </card-container>
</div> </div>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
import NavWrap from "../../components/pc/nav/navWrap"; import NavWrap from "../../components/pc/nav/navWrap";
import Pagination from '../../components/pc/pagination'; import Pagination from '../../components/pc/pagination';
import config from '../../action/config' import config from '../../action/config'
import UserCard from '../../components/pc/userCard2';
export default { export default {
...@@ -86,14 +88,16 @@ ...@@ -86,14 +88,16 @@
pages:1, pages:1,
paginationState:'complate', paginationState:'complate',
topicList:[], topicList:[],
userList:[],
} }
}, },
components:{ components:{
ReleaseCard,SocialCard,CardContainer,NavWrap,Pagination ReleaseCard,SocialCard,CardContainer,NavWrap,Pagination,UserCard
}, },
created() { created() {
this.dataGetHotTopic(); this.dataGetHotTopic();
this.dataGetActiveUser();
}, },
watch:{ watch:{
...@@ -111,6 +115,21 @@ ...@@ -111,6 +115,21 @@
this.$refs.pagination.setCurrentPage(1) this.$refs.pagination.setCurrentPage(1)
} }
}, },
dataGetActiveUser(){
this.$axios.$get(config.api.get.User.active,{
params:{
page:1,
size:5
}
}).then((response)=>{
if(response.code===0){
this.userList = response.data.dataList;
}
})
},
dataGetNewDynamic(currentPage){ dataGetNewDynamic(currentPage){
this.paginationState = 'loading'; this.paginationState = 'loading';
......
pages/index.vue
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<div class="home-container"> <div class="home-container">
<div class="home-container__l"> <div class="home-container__l">
<banner :imgArr="imgArr" style="margin-top: 40px"></banner> <banner :imgArr="imgArr" style="margin-top: 40px"></banner>
<card-container style="margin-top: 40px" title="项目推荐" label="换一换" more="查看更多" @listenCardConMore="changeRoute('/project')"> <card-container style="margin-top: 40px" title="项目推荐" more="查看更多" @listenCardConMore="changeRoute('/project')">
<project-card v-for="(val,index) in projectList" :key="val.projectId" :info="val"></project-card> <project-card v-for="(val,index) in projectList" :key="val.projectId" :info="val"></project-card>
</card-container> </card-container>
<card-container style="margin-top: 16px" title="精选博文" label="换一换" more="查看更多" @listenCardConMore="changeRoute('/blog')"> <card-container style="margin-top: 16px" title="精选博文" more="查看更多" @listenCardConMore="changeRoute('/blog')">
<project-card v-for="(val,index) in blogList" :key="val.blogId" :info="val"></project-card> <project-card v-for="(val,index) in blogList" :key="val.blogId" :info="val"></project-card>
</card-container> </card-container>
</div> </div>
<div class="home-container__r"> <div class="home-container__r">
<card-container style="margin-top: 40px" title="最新资讯" label="换一换" more="更多" @listenCardConMore="changeRoute('/news')"> <card-container style="margin-top: 40px" title="最新资讯" more="更多" @listenCardConMore="changeRoute('/news')">
<nuxt-link tag="div" :to="'/news/detail/'+val.contentId" class="information-wrap" v-for="(val,index) in newsList" :key="val.contentId"> <nuxt-link tag="div" :to="'/news/detail/'+val.contentId" class="information-wrap" v-for="(val,index) in newsList" :key="val.contentId">
<p class="information-time">{{dateConvert(val.createTime)}}</p> <p class="information-time">{{dateConvert(val.createTime)}}</p>
<p class="information-content">{{val.title}}</p> <p class="information-content">{{val.title}}</p>
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
</card-container> </card-container>
<card-container style="margin-top: 16px;padding-bottom:15px" title="社区精英" label="换一换" > <card-container style="margin-top: 16px;padding-bottom:15px" title="社区精英" >
<user-card style="padding-bottom: 2px;padding-top: 2px" v-for="(val,index) in elitesList" :key="val.userId" :info="val"></user-card> <user-card style="padding-bottom: 2px;padding-top: 2px" v-for="(val,index) in elitesList" :key="val.userId" :info="val"></user-card>
</card-container> </card-container>
<card-container style="margin-top: 16px" title="热门问答" label="换一换" more="更多" @listenCardConMore="changeRoute('/answer')"> <card-container style="margin-top: 16px" title="热门问答" more="更多" @listenCardConMore="changeRoute('/answer')">
<nuxt-link tag="div" :to="'/answer/detail/'+val.questionId" class="topic-content__c" v-for="(val,index) in answerList" :key="val.questionId" > <nuxt-link tag="div" :to="'/answer/detail/'+val.questionId" class="topic-content__c" v-for="(val,index) in answerList" :key="val.questionId" >
<p>{{val.questionTitle}}</p> <p>{{val.questionTitle}}</p>
<h6>{{val.replyNumber}}</h6> <h6>{{val.replyNumber}}</h6>
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
this.dataGetHotAnswerList(); this.dataGetHotAnswerList();
this.dataGetHotTopicList(); this.dataGetHotTopicList();
this.dataGetNewsList(); this.dataGetNewsList();
this.dataGetBanner();
}, },
components:{ components:{
...@@ -100,6 +101,22 @@ ...@@ -100,6 +101,22 @@
return dateConvert(time); return dateConvert(time);
}, },
dataGetBanner(){ //内容类型-0:幻灯，1:普通文章，3：广告
let params = {
page: 1,
size: 5,
type: 0
};
this.$axios.$get(config.api.get.Content.list + '/12/contents',
{
params: params
}).then((response) => {
this.bannerList = response.data.dataList;
console.log(this.bannerList);
})
},
dataGetHotBloggersList() { dataGetHotBloggersList() {
let params={ let params={
page: 1, page: 1,
......
pages/news/detail/_id.vue
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
<p class="num">122</p> <p class="num">122</p>
</div> </div>
<div class="article__footer"> <div class="article__footer">
<p class="link">原文链接：<a target="_blank" :href="articleDetail.link"> <span>{{articleDetail.link}}</span></a></p> <!-- <p class="link">原文链接：<a target="_blank" :href="articleDetail.link"> <span>{{articleDetail.link}}</span></a></p>-->
<p></p>
<p class="report" @click="$router.push({path:'/web/report',query:{type:'news',id:articleDetail.contentId}})">举报</p> <p class="report" @click="$router.push({path:'/web/report',query:{type:'news',id:articleDetail.contentId}})">举报</p>
<div class="project" v-if="false"> <div class="project" v-if="false">
<p> <p>
......
pages/news/index.vue
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<card-container <card-container
style="max-height: 426px;" style="max-height: 426px;"
title="行业资讯" title="行业资讯"
label="换一换"
width="302px" width="302px"
v-if="informationList.length>0" v-if="informationList.length>0"
......
pages/project/index.vue
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<div class="right__write-project" @click="toRelease">发布项目</div> <div class="right__write-project" @click="toRelease">发布项目</div>
<card-container <card-container
title="热门项目" title="热门项目"
label="整点更新"
more="更多项目" more="更多项目"
width="302px" width="302px"
height="446px" height="446px"
......
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