Skip to content

T
techbook
Commit 51cc65b9 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents dd2ba469 309af417
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 15 deletions
public/css/common.scss
View file @ 51cc65b9
......@@ -825,6 +825,7 @@ i {
background: #333333;
border: none;
height: 30px;
line-height: 30px;
font-size: 12px;
padding: 0 10px;
color: #FFFFFF;
......
src/components/authentication/personalAuthDetail.vue
View file @ 51cc65b9
......@@ -27,7 +27,7 @@
</el-form-item>
<el-form-item :label="$t('personalAuth.card')+'：'">
<div class="uploadImg">
<div class="uploadImg" v-if="detailInfo.empCardUrl">
<img :src="detailInfo.empCardUrl" style="border: 1px solid #DCDFF1;" @click="handleImg">
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="detailInfo.empCardUrl" alt="">
......
src/components/index/minPageTopindex.vue
View file @ 51cc65b9
......@@ -11,7 +11,7 @@
</div>
</div>
<div style="position: absolute;right: 120px;top: 0px;" class="topright gendisplay">
<div style="line-height: 42px;position: relative;padding-right: 30px;margin-right: 10px;">
<div style="position: relative;padding-right: 30px;margin-right: 10px;display: inline-flex;align-items: center;">
<el-input class="index_topsou" @keyup.enter.native="handleSearchDetail(keyword)" @focus="keyword_search = true" @blur="keyword_search = false" v-model="keyword" maxlength="40" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" style="width: 220px;height: 30px;"></el-input>
<p class="topsearch_fixed" type="primary" :style="!keyword_search&&keyword==''?'':'background: #5D78FF'" @click="handleSearchDetail(keyword)">
<i style="font-size: 12px;" :style="!keyword_search&&keyword==''?'':'color:#ffffff'" class="iconfont icon-iconsearch"></i>
......@@ -261,7 +261,7 @@
.topsearch_fixed{
position: absolute;
right:5px;
top: 7px;
top: 8px;
background: #333333;
color: #AAAAAA;
width: 30px;
......
src/views/netWorkpage/api/api.js
View file @ 51cc65b9
......@@ -8,7 +8,7 @@ export default {
},
//人脉首页推荐搜索
userSearch(params){
return api.fetchLoadingGet("/business/search/userSearch?"+params);
return api.fetchLoadingGet("/business/search/userSearch?"+Qs.stringify(params));
},
//人脉首页动态
selectDynamicMessage(params){
......
src/views/netWorkpage/networkSearch.vue
View file @ 51cc65b9
......@@ -3,7 +3,7 @@
<div class="home_top">
<p>在这里发现更多联系人</p>
<div>
<el-input class="network_inp index_workring" @keyup.enter.native="searchDetail" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-input class="network_inp index_workring" @keyup.enter.native="searchDetail" maxlength="36" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-button @click="searchDetail" type="primary" style="margin-left: -2px;width: 100px;"><i style="font-weight: bold">搜索</i></el-button>
</div>
</div>
......@@ -60,8 +60,8 @@
name: "networkSearch",
data(){
return{
searchkey:this.Base64.decode(this.$route.query.key),
linsearchkey:this.Base64.decode(this.$route.query.key),
searchkey:this.publicFun.getCookie("searchkey")?this.Base64.decode(this.publicFun.getCookie("searchkey")):'',
linsearchkey:this.publicFun.getCookie("searchkey")?this.Base64.decode(this.publicFun.getCookie("searchkey")):'',
cur_page: 1, //页数
numberData: 24, //设置个数
pages:0,
......@@ -96,10 +96,13 @@
}
},
getuserSearch(){
// let empInfo = this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())):undefined;
let keyword = this.linsearchkey?'&keyword='+this.linsearchkey:'';
let params = 'pageIndex='+this.cur_page+'&pageSize='+this.numberData;
api.userSearch(params+keyword).then((response)=>{
this.linsearchkey = this.Base64.decode(this.publicFun.getCookie("searchkey"));
let params = {
pageIndex:this.cur_page,
pageSize:this.numberData,
keyword:this.linsearchkey?this.linsearchkey:""
}
api.userSearch(params).then((response)=>{
if(response.code==0){
if(this.cur_page == 1){
this.networkringlist = response.result.records;
......@@ -128,7 +131,6 @@
this.$router.push({path:"/networkSearch",query:{key:this.Base64.encode(this.searchkey)}});
this.publicFun.setUserInfoCookie("searchkey",this.Base64.encode(this.searchkey));
this.cur_page = 1;
this.linsearchkey = this.Base64.decode(this.publicFun.getCookie("searchkey"));
this.getuserSearch();
}
},
......@@ -221,6 +223,9 @@
color: #1A1A1E;
font-weight: bold;
width: 80%;
height: 20px;
line-height: 20px;
overflow: hidden;
font-size: 14px;
text-align: left;
}
......
src/views/netWorkpage/networkring.vue
View file @ 51cc65b9
......@@ -3,7 +3,7 @@
<div class="home_top">
<p>在这里发现更多联系人</p>
<div>
<el-input class="network_inp index_workring" @keyup.enter.native="searchDetail" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-input class="network_inp index_workring" @keyup.enter.native="searchDetail" maxlength="36" v-model="searchkey" style="width: 600px;height: 50px;" placeholder="搜索您想联系的人"></el-input>
<el-button @click="searchDetail" type="primary" style="margin-left: -2px;width: 100px;"><i style="font-weight: bold">搜索</i></el-button>
</div>
</div>
......
src/views/peoplehomepage/commonSchool.vue
View file @ 51cc65b9
......@@ -195,6 +195,7 @@
font-size: 12px;
margin: 8px 0 5px;
height: 17px;
line-height: 17px;
overflow: hidden;
}
> p:last-child {
......
src/views/peoplehomepage/commonWork.vue
View file @ 51cc65b9
......@@ -195,6 +195,7 @@
font-size: 12px;
margin: 8px 0 5px;
height: 17px;
line-height: 17px;
overflow: hidden;
}
> p:last-child {
......
src/views/peoplehomepage/contactPerson.vue
View file @ 51cc65b9
......@@ -206,6 +206,7 @@
font-size: 12px;
margin: 8px 0 5px;
height: 17px;
line-height: 17px;
overflow: hidden;
}
> p:last-child {
......
src/views/peoplehomepage/editInfo.vue
View file @ 51cc65b9
......@@ -289,7 +289,7 @@
},
createStateFilter(queryString) {
return (state) => {
return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
return (state.value.indexOf(queryString) !=-1);
};
},
handleSelect(item) {
......
src/views/peoplehomepage/tabTopicbar.vue
View file @ 51cc65b9
......@@ -22,7 +22,7 @@
<span class="ellipsisFont1" style="max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;">#{{item.topicTitle}}# </span>
<i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
</p>
<p class="ellipsisFont2" style="color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;width: 100%;overflow: hidden;">{{item.topicDescription}}</p>
<p class="ellipsisFont2" style="color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;overflow: hidden;max-width: 630px;">{{item.topicDescription}}</p>
<div class="gendisplay" style="color: #AAAAAA;font-size: 12px;line-height: 28px;">
<span v-if="item.isOpenReward!=1&&item.professorCount!=0" class="ellipsisFont1" style="margin-right: 20px;max-width: 200px;height: 28px;color:#5D78FF;">专家入驻{{item.professorCount}}位</span>
<span v-if="item.isOpenReward==1||item.professorCount==0" class="ellipsisFont1" style="margin-right: 20px;max-width: 200px;height: 28px;">发起方： <i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
......
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