Skip to content

T
techbook
Commit f780d7b4 authored by anxixi's avatar anxixi
Browse files
Options

pc搜索等新功能及优化

parent 65de2c93
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 78 deletions
public/css/pc.scss
View file @ f780d7b4
......@@ -474,13 +474,15 @@
//height: calc(100vh - 110px);
//overflow-y: auto;
.breadcrumb {
padding: 7px 0;
padding: 3px 0;
color: #565B79;
font-size: 14px;
position: relative;
.transDiv{
position: absolute;
min-width: 100px;
min-width: 120px;
text-align: right;
padding-right: 20px;
right: 0;
top: 0;
}
......@@ -546,7 +548,7 @@
.contentPadding{
padding: 20px;
background: #fff;
margin-top: 10px;
margin-top: 15px;
border-radius:3px;
}
.tabPdding{
......@@ -916,6 +918,7 @@
.userImg{
position: relative;
cursor: pointer;
.userImg_vip{
position: absolute;
right: 3px;
......
src/components/index/PageTopindex.vue
View file @ f780d7b4
......@@ -177,7 +177,7 @@
{id:3,name:this.$t("topNav.activity"),path:'/activitylist',pathchild:'/eventdetail'},
{id:4,name:this.$t("topNav.topic"),path:'/topicList',pathchild:'/topicDetails'},
{id:6,name:'人脉',path:'/circleList',pathchild:'/networkSearch'},
{id:5,name:this.$t("topNav.match"),path:'/matchlist',pathchild:'/matchlist'},
{id:5,name:this.$t("topNav.match"),path:'//tabconnect',pathchild:'//tabconnect'},
{id:7,name:this.$t("topNav.article"),path:'/articleList',pathchild:'/articleDetail'},
{id:8,name:this.$t("topNav.industry"),path:'/industryReport',pathchild:'/industryReport'},
{id:2,name:this.$t("topNav.guess"),path:'/guesslist',pathchild:'/guessDetail'},
......
src/router.js
View file @ f780d7b4
......@@ -275,11 +275,11 @@ const router = new Router({
// component: resolve => require(['views/knowledge/computer/computerdetails.vue'], resolve),
// meta: {title: '知识资源详情'}
// },
{
path: '/matchlist',
component: resolve => require(['views/dockingpage/matchlist.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '对接'}
},
// {
// path: '/matchlist',
// component: resolve => require(['views/dockingpage/matchlist.vue'], resolve).catch(routerUtils.catchImport),
// meta: {title: '对接'}
// },
{
path: '/keySearchs',
component: resolve => require(['views/keySearchpage/keySearchs.vue'], resolve).catch(routerUtils.catchImport),
......
src/views/bigbusiness/pages/list.vue
View file @ f780d7b4
......@@ -5,7 +5,7 @@
<el-breadcrumb separator="/" v-if="!isbigBusinessBer">
<el-breadcrumb-item><a style="font-weight: bold">{{$t("topNav.findCustomer")}}</a></el-breadcrumb-item>
</el-breadcrumb>
<div class="transDiv" :style="isbigBusinessBer?'top:-46px;':''">
<div class="transDiv" :style="isbigBusinessBer?'top:-44px;':''">
<el-button type="text" class="transBtn" @click="handleTranslate">{{isTrans?$t("mobile.showOldActicle"):$t("mobile.translateTitle")}}</el-button>
<span class="ques">
<el-popover
......
src/views/findeventpage/eventlive.vue
View file @ f780d7b4
......@@ -105,6 +105,7 @@
},
beforeDestroy() { // 在组件生命周期结束的时候销毁。、
this.userHistory(1);
document.getElementsByTagName("body")[0].style.overflow = "auto";
},
created() {
this.getNickName();
......@@ -116,8 +117,8 @@
<style scoped lang="scss">
.event_iconchange{
position: fixed;
bottom: 50px;
right: 0px;
bottom: 65px;
right: 10px;
.event_iconchange_img{
width: 70px;
cursor: pointer;
......
src/views/findeventpage/newslist.vue
View file @ f780d7b4
......@@ -9,7 +9,7 @@
<p v-else><i @click="tohome(item)">{{item.empName}}</i>想与您交换名片</p>
<div class="gendisplay">
<p>{{item.createdTimeStr}}</p>
<p>
<p style="margin-right: 10px;">
<span v-if="item.messageType != 4 && item.messageType != 6" @click="getexecuteMessage(item,0,index)">忽略</span>
<span v-if="item.messageType != 4 && item.messageType != 6" @click="getexecuteMessage(item,1,index)">同意</span>
</p>
......@@ -149,14 +149,17 @@
background: #F8F8F8;
}
>div{
padding: 18px 14px;
margin: 0 14px;
padding: 18px 0;
font-size: 12px;
border-bottom: 1px solid #F2F2F2;
>p{
color: #1A1A1E;
margin-bottom: 10px;
>i{
color: #5D78FF;
margin-right: 5px;
font-weight: bold;
cursor: pointer;
}
}
......
src/views/findeventpage/userlist.vue
View file @ f780d7b4
......@@ -14,7 +14,7 @@
<i @click="tohome(item)" class="hover_cursor">{{item.empName}}</i>
<i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
</p>
<div v-if="item.empId != userInfo.empId">
<div style="margin-right: 10px;" v-if="item.empId != userInfo.empId">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
<btnbar v-if="item.isFriend != 2" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
</div>
......@@ -124,7 +124,7 @@
border: none;
}
>div{
border-bottom: 1px solid #E8E8E8;
border-bottom: 1px solid #F2F2F2;
padding: 10px 0;
>span{
display: inline-block;
......@@ -146,7 +146,7 @@
color:#1A1A1E;
font-size: 14px;
font-weight: bold;
width: calc(100% - 65px);
width: calc(100% - 75px);
margin-right: 10px;
line-height: 24px;
height: 24px;
......
src/views/index/pages/index.vue
View file @ f780d7b4
......@@ -371,7 +371,7 @@
<img v-if="index == 1" style="width: 24px;height: 22px;margin-top: 5px;" src="../../../assets/img/rankingindex2.png" alt="">
<img v-if="index == 2" style="width: 24px;height: 22px;margin-top: 5px;" src="../../../assets/img/rankingindex3.png" alt="">
<p style="line-height: 34px;width: 24px;text-align: center;" v-if="index>2">{{index+1}}</p>
<img @click="tohome(item.empId)" style="height: 34px;width: 34px;border-radius: 50%;margin: 0 20px;" :src="item.empLogo&&item.empLogo.length>1?item.empLogo:require('../../../assets/img/defaultlogo.png')" alt="">
<img @click="tohome(item.empId)" style="height: 34px;width: 34px;border-radius: 50%;margin: 0 20px;cursor: pointer;" :src="item.empLogo&&item.empLogo.length>1?item.empLogo:require('../../../assets/img/defaultlogo.png')" alt="">
<p class="ellipsisFont1" style="width: 90px;height: 34px;overflow: hidden;line-height: 34px;">{{item.nickName}}</p>
</div>
<div class="gendisplay" style="width: calc(100% - 210px);text-align: right;line-height: 34px;font-weight: normal;">
......
src/views/integralpage/integralguesslist.vue
View file @ f780d7b4
......@@ -189,14 +189,16 @@
this.$refs.login.isexpertVisible();
return
}
this.$router.push({path:'/userintegral'})
window.open(this.publicFun.getCurrentHrefEnv()+"#/userintegral");
// this.$router.push({path:'/userintegral'})
}else if(state == 3){
this.meguess = state;
if(!this.publicFun.getUserInfoCookieType()){
this.$refs.login.isexpertVisible();
return
}
this.$router.push({path:'/peoplehome/tabs/quiz'})
window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplehome/tabs/quiz");
// this.$router.push({path:'/peoplehome/tabs/quiz'})
}
},
......
src/views/integralpage/integralrule.vue
View file @ f780d7b4
......@@ -192,32 +192,32 @@
},
//积分规则
addexpert(){
if(this.expertData.integralTypeCode == 'ITV011' || this.expertData.integralTypeCode == 'ITV012'){
if(parseInt(this.expertData.minValue) <= 99 || parseInt(this.expertData.minValue) > 5000){
this.$message.error('最小积分100-5000，请重新输入');
return
}
if(parseInt(this.expertData.maxValue) <= 100 || parseInt(this.expertData.maxValue) > 5000){
this.$message.error('最大积分101-5000，请重新输入');
return
}
if(parseInt(this.expertData.minValue) >= parseInt(this.expertData.maxValue)){
this.$message.error('最大积分应大于最小积分，请重新输入');
return
}
}else{
if(this.expertData.ruleType == 2){
if(parseInt(this.expertData.integralValue) <= 0 || parseInt(this.expertData.integralValue) > 10000){
this.$message.error('每次上限次数1-10000，请重新输入');
return
}
}else{
if(parseInt(this.expertData.integralValue) <= 0 || parseInt(this.expertData.integralValue) > 1000){
this.$message.error('每次上限次数1-1000，请重新输入');
return
}
}
}
// if(this.expertData.integralTypeCode == 'ITV011' || this.expertData.integralTypeCode == 'ITV012'){
// if(parseInt(this.expertData.minValue) <= 99 || parseInt(this.expertData.minValue) > 5000){
// this.$message.error('最小积分100-5000，请重新输入');
// return
// }
// if(parseInt(this.expertData.maxValue) <= 100 || parseInt(this.expertData.maxValue) > 5000){
// this.$message.error('最大积分101-5000，请重新输入');
// return
// }
// if(parseInt(this.expertData.minValue) >= parseInt(this.expertData.maxValue)){
// this.$message.error('最大积分应大于最小积分，请重新输入');
// return
// }
// }else{
// if(this.expertData.ruleType == 2){
// if(parseInt(this.expertData.integralValue) <= 0 || parseInt(this.expertData.integralValue) > 10000){
// this.$message.error('每次上限次数1-10000，请重新输入');
// return
// }
// }else{
// if(parseInt(this.expertData.integralValue) <= 0 || parseInt(this.expertData.integralValue) > 1000){
// this.$message.error('每次上限次数1-1000，请重新输入');
// return
// }
// }
// }
if(this.expertData.integralTypeCode != 'ITV014' && this.expertData.integralTypeCode != 'ITV016'){
if(parseInt(this.expertData.limitNumber) <= 0 || parseInt(this.expertData.limitNumber) > 100){
this.$message.error('每天兑换个数1-100，请重新输入');
......
src/views/keySearchpage/articlelist.vue
View file @ f780d7b4
......@@ -14,7 +14,7 @@
&nbsp;
</p>
</div>
<div class="article_title" :style="!item.contentCoverUrl && !item.contentUrl?'padding-left: 0;':''">
<div class="article_title" style="width: 100%;" :style="!item.contentCoverUrl && !item.contentUrl?'padding-left: 0;':''">
<p class="ellipsisFont1">{{item.contentTitle}}</p>
<p class="ellipsisFont2">{{item.contentValidity}} </p>
</div>
......@@ -158,7 +158,7 @@
font-size: 12px;
line-height: 22px;
width: 100%;
height: 44px;
max-height: 44px;
overflow: hidden;
}
}
......
src/views/keySearchpage/eventlist.vue
View file @ f780d7b4
......@@ -211,7 +211,7 @@
}
>div:last-child{
width: calc(100% - 150px);
padding-left: 20px;
padding-left: 15px;
.channelTitle{
>span{
display: inline-block;
......@@ -225,6 +225,8 @@
}
>i{
color: #1A1A1E;
font-size: 14px;
cursor: pointer;
font-weight: bold;
line-height: 28px;
}
......
src/views/keySearchpage/guesslist.vue
View file @ f780d7b4
......@@ -19,7 +19,7 @@
</i>
</div>
<div>
<p @click="gocontentdetail(item)" style="color:#1A1A1E;font-size: 16px;margin-bottom: 25px;cursor: pointer;">
<p @click="gocontentdetail(item)" style="color:#1A1A1E;font-size: 14px;margin-bottom: 25px;cursor: pointer;">
<span class="ellipsisFont1" style="font-weight: bold;">{{item.guessTitle}}</span>
</p>
<div class="gendisplay">
......
src/views/keySearchpage/industrylist.vue
View file @ f780d7b4
......@@ -14,11 +14,11 @@
<img style="width: 45px;" src="../../assets/img/industryreport/pdf@2x.png" alt="">
</div>
<div>
<p @click="gocontentdetail(item)" class="ellipsisFont2">
<p style="font-size: 14px;" @click="gocontentdetail(item)" class="ellipsisFont2">
{{item.reportTitle}}
</p>
<div class="gendisplay">
<p>
<p style="font-size: 12px;">
<span v-if="item.baseDataVO">{{item.baseDataVO.dataName}}</span>
<span>{{$t('commonTips.downloads')}}：{{item.downloadNumber}}</span>
</p>
......@@ -157,7 +157,7 @@
}
>div:nth-child(2){
width: 100%;
margin-left: 35px;
margin-left: 20px;
/*width: 500px;*/
>p{
text-align: left;
......
src/views/keySearchpage/keySearchs.vue
View file @ f780d7b4
......@@ -78,9 +78,9 @@
{key:3,value:'活动'},
{key:4,value:'话题'},
{key:5,value:'人脉'},
{key:6,value:'竞猜'},
{key:7,value:'资讯'},
{key:8,value:'行业报告'},
{key:6,value:'竞猜'},
],
keychecked:1,
keyword:this.publicFun.getCookie("keyword")?this.Base64.decode(this.publicFun.getCookie("keyword")):'',
......@@ -89,10 +89,10 @@
components:{projectlist,bigBusinesslist,eventlist,topiclist,networklist,guesslist,articlelist,industrylist},
beforeRouteEnter(to, from, next) {
next(vm=>{ // 这里的vm指的就是vue实例，可以用来当做this使用
if(from.path == '/matchlist'||from.path == '/viewproject')vm.keychecked = 1
if(from.path == '//tabconnect'||from.path == '/viewproject')vm.keychecked = 1
else if(from.path == '/bigBusiness/detail')vm.keychecked = 2
else if(from.path == '/activitylist'||from.path == '/eventdetail')vm.keychecked = 3
else if(from.path == '/topicList'||from.path == '/topicDetails')vm.keychecked = 4
else if(from.path == '/activitylist'||from.path == '/eventdetail'||from.path == '/eventlive')vm.keychecked = 3
else if(from.path == '/topicList'||from.path == '/topicDetails'||from.path == '/discussdetail')vm.keychecked = 4
else if(from.path == '/circleList'||from.path == '/networkSearch')vm.keychecked = 5
else if(from.path == '/guesslist'||from.path == '/guessDetail')vm.keychecked = 6
else if(from.path == '/articleList'||from.path == '/articleDetail')vm.keychecked = 7
......@@ -105,7 +105,7 @@
},
},
mounted() {
this.keyword = this.publicFun.getCookie("keyword")?this.Base64.decode(this.publicFun.getCookie("keyword")):'';
},
watch:{
$route(to, from) {
......
src/views/keySearchpage/networklist.vue
View file @ f780d7b4
......@@ -52,7 +52,7 @@
<style scoped lang="scss">
.noDatalist{
padding-top: 80px;
padding-top: 20px;
>p{
text-align: center;
color: #AAAAAA;
......@@ -64,7 +64,7 @@
}
>p:nth-child(2){
border-bottom: 1px solid #F2F2F2;
padding-bottom: 80px;
padding-bottom: 20px;
}
}
.search_dataList{
......
src/views/netWorkpage/dynamicbar.vue
View file @ f780d7b4
......@@ -90,7 +90,7 @@
}
},
topicdetail(item){
window.open(this.publicFun.getCurrentHrefEnv()+"#/discussdetail?id="+id.pid+"&disId="+item.id);
window.open(this.publicFun.getCurrentHrefEnv()+"#/discussdetail?id="+item.pid+"&disId="+item.id);
// this.$router.push({path:'/discussdetail',query:{id:item.pid,disId:item.id}});
},
},
......
src/views/netWorkpage/searchUserlist.vue
View file @ f780d7b4
......@@ -171,11 +171,11 @@
border-bottom: 1px solid #F2F2F2;
>span:first-child{
display: inline-block;
width: 70px;
height: 70px;
width: 50px;
height: 50px;
.userinfo_img{
width: 70px;
height: 70px;
width: 50px;
height: 50px;
border-radius: 50%;
border: 1px solid #F2F2F2;
}
......
src/views/peoplehomepage/peoplehome.vue
View file @ f780d7b4
......@@ -13,7 +13,7 @@
<p class="userImg">
<span>{{userInfoData.empName}}</span>
<span v-if="userInfoData.nickName&&userInfoData.nickName.length>=1" style="font-size: 16px;">昵称：{{userInfoData.nickName}}</span>
<img style="width: 20px;right: -35px;top: 10px;" class="userImg_vip" v-if="userInfoData.moderator&&userInfoData.professor" src="../../assets/img/mobile/moderator.png" alt="">
<img style="width: 18px;right: -35px;top: 14px;" class="userImg_vip" v-if="userInfoData.moderator&&userInfoData.professor" src="../../assets/img/mobile/moderator.png" alt="">
</p>
<div v-if="isTrans" class="gendisplay about_top">
<div class="gendisplay">
......@@ -85,7 +85,7 @@
</el-popover>
</span>
<span @click="topageType('/peoplehome/tabs/news')" class="iconmail" v-if="!$route.query.id|| $route.query.id == userInfo.empId">
<i class="iconfont icon-mail" :style="userInfoData.unreadMsg?'color: #5D78FF;':'color: #aaaaaa;'" style="font-size: 18px;"></i>
<i class="iconfont icon-mail" style="font-size: 18px;color: #5D78FF;"></i>
<span v-if="userInfoData.unreadMsg"></span>
</span>
<!-- <p v-if="userInfoData.moderator">-->
......@@ -180,15 +180,15 @@
</div>
<div v-if="(!$route.query.id || $route.query.id==userInfo.empId)&&!publicFun.isgetUserRoleFunc(2)" style="margin: 20px 0 0;" class="gendisplay number_privacy">
<div @click="toWorkbench(publicFun.isgetUserRoleFunc(5)?'/sale/addfirst':'/bigBusiness/add')">
<p><i style="font-size: 30px;color: #4A4A4A;font-weight: normal;" class="iconfont icon-fabudexuqiu"></i></p>
<p><i style="font-size: 26px;color: #5D78FF;font-weight: normal;" class="iconfont icon-fabudexuqiu"></i></p>
<p>{{publicFun.isgetUserRoleFunc(5)?'代发需求':'发需求'}}</p>
</div>
<div @click="toWorkbench('/totceldata')">
<p><i style="font-size: 30px;color: #4A4A4A;font-weight: normal;" class="iconfont icon-fabuxiangmu"></i></p>
<p><i style="font-size: 26px;color: #5D78FF;font-weight: normal;" class="iconfont icon-fabuxiangmu"></i></p>
<p>{{publicFun.isgetUserRoleFunc(5)?'代发项目':'发项目'}}</p>
</div>
<div @click="toWorkbench(publicFun.isgetUserRoleFunc(5)?'/salerequire/list':'/bigBusiness/detail')">
<p><i style="font-size: 30px;color: #4A4A4A;font-weight: normal;" class="iconfont icon-yifabu"></i></p>
<p><i style="font-size: 26px;color: #5D78FF;font-weight: normal;" class="iconfont icon-yifabu"></i></p>
<p>{{publicFun.isgetUserRoleFunc(5)?'我维护的需求':'已发布'}}</p>
</div>
</div>
......
src/views/peoplehomepage/popoverBardbar.vue
View file @ f780d7b4
......@@ -7,7 +7,7 @@
popper-class="bard_popover"
trigger="click">
<div class="contact_dio">
<div v-if="!empContactstate.isConstact">
<div style="padding: 10px 0;" v-if="!empContactstate.isConstact">
<p class="contact_btn">
您确定要扣<i style="color: #5D78FF;">{{empContactstate.integralValue}}</i>积分查看该用户的联系方式吗？
</p>
......@@ -16,7 +16,7 @@
<span @click="getEmpInformation(item)">确定</span>
</p>
</div>
<div v-if="empContactData.queryState == 0">
<div style="padding: 10px 0;" v-if="empContactData.queryState == 0">
<p class="contact_btn">
{{empContactData.queryValue}}
</p>
......@@ -53,12 +53,12 @@
<p>此联系方式为用户个人添加，平台不保证其真实性，请酌情使用。</p>
</div>
</div>
<div style="text-align: center;" v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<div style="text-align: center;padding: 10px 0;" v-if="empContactData.queryState == 1||empContactData.queryState == 3||empContactData.queryState == 4">
<span>{{empContactData.queryValue}}</span>
</div>
</div>
<p slot="reference" @click="empContact(row)" class="bard_btn" :class="[ishome?'bard_btnhome':'',iseventlive?'bard_btnEvent':'']">
查看电子名片
{{iseventlive?'电子名片':'查看电子名片'}}
</p>
</el-popover>
......@@ -217,7 +217,7 @@
height: 24px!important;
line-height: 24px!important;
font-size: 12px!important;
width: 100px!important;
width: 65px!important;
}
.bard_btnhome{
width: 160px!important;
......
src/views/seeprojects/seeprojectlist.vue
View file @ f780d7b4
......@@ -4,7 +4,7 @@
<el-breadcrumb separator="/" v-if="!isprojectBer">
<el-breadcrumb-item>{{$t("listproject.proname")}}</el-breadcrumb-item>
</el-breadcrumb>
<div class="transDiv" :style="isprojectBer?'top:-46px;':''">
<div class="transDiv" :style="isprojectBer?'top:-44px;':''">
<el-button type="text" class="transBtn" @click="handleTranslate">{{isTrans?$t("mobile.showOldActicle"):$t("mobile.translateTitle")}}</el-button>
<span class="ques">
<el-popover
......
src/views/topicpage/commentdetail.vue
View file @ f780d7b4
......@@ -33,7 +33,7 @@
</div>
<div>
<div style="margin: 15px 0;" @click="eventtopiccontent($event)">
<span v-html="publicFun.analyzeEmoji(commentdata.discussContent)"></span>
<span id="htmldetail" v-html="publicFun.analyzeEmoji(commentdata.discussContent)"></span>
</div>
<!-- 讨论中展示图片-->
<el-image
......@@ -1150,4 +1150,8 @@
.medal5 {
background-position-y: -201px;
}
#htmldetail /deep/ p{
line-height: 26px;
color: #1A1A1E;
}
</style>
\ No newline at end of file
src/views/topicpage/topicdetail.vue
View file @ f780d7b4
......@@ -281,7 +281,7 @@
</transition>
</div>
<div class="gendisplay" style="border-top: 1px solid #F2F2F2;padding-top: 20px;" v-for="(commentsitem,commentindex) in item.commentList" :key="commentindex+commentsitem.discussId">
<div class="gendisplay" style="border-top: 1px solid #F2F2F2;padding: 20px 0 0 36px;" v-for="(commentsitem,commentindex) in item.commentList" :key="commentindex+commentsitem.discussId">
<div style="width: 36px;">
<div style="position: relative;">
<img @click="tohome(commentsitem.createdBy)" v-if="commentsitem.empLogo" :src="commentsitem.empLogo" style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
......
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