pc搜索等新功能及优化

public/css/pc.scss

@@ -469,7 +469,7 @@
   //登录之后的右侧公共样式
   .loginedWrapper {
     padding: 0 30px;
-    margin-top: 20px;
+    margin-top: 60px;
     background: #ECECF2;
     //height: calc(100vh - 110px);
     //overflow-y: auto;

src/App.vue

@@ -91,6 +91,7 @@
                         rEmpId: data.rEmpId,
                         rTargetType: data.rTargetType,
                         empId:data.empId,
+                        guessId: data.guessId,
                         otherEmpId:data.otherEmpId
                     },
                     curl: document.location.href

src/common/lang/en.js

@@ -2181,8 +2181,8 @@ module.exports = {
         recommendRead:"Hot reports",
         downloadReport:"Download",
         reportIntro:"Report introduction",
-        noReportIntro:"No Introduction"
-
+        noReportIntro:"No Introduction",
+        industry:'industry popular categories',
 
     },
 

src/common/lang/zh.js

@@ -2273,7 +2273,8 @@ module.exports = {
         recommendRead:"热门报告",
         downloadReport:"下载该报告",
         reportIntro:"报告介绍",
-        noReportIntro:"暂无介绍"
+        noReportIntro:"暂无介绍",
+        industry:'行业通俗分类',
     },
 
     integral: {

src/components/index/PageTopindex.vue

@@ -19,8 +19,8 @@
                         <searchTopbar @search="search"></searchTopbar>
                     </div>
                 </el-popover>
-                <el-input v-if="$i18n.locale == 'zh-CN'" class="index_search" v-popover:popoverKey @keyup.enter.native="handleSearchDetail(keyword)" v-model.trim="keyword" maxlength="40" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" :style="$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"></el-input>
-                <el-input v-else class="index_search" @keyup.enter.native="handleSearchDetail(keyword)" v-model.trim="keyword" maxlength="40" :placeholder="$i18n.locale == 'zh-CN'?'请输入项目名称/企业名称/技术关键词':'Eenter Technology Keywords'" :style="$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"></el-input>
+                <el-input v-if="$i18n.locale == 'zh-CN'" class="index_search" v-popover:popoverKey @keyup.enter.native="handleSearchDetail(keyword)" v-model.trim="keyword" maxlength="40" :placeholder="$t('commonTitle.searchKeyword')" :style="$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"></el-input>
+                <el-input v-else class="index_search" @keyup.enter.native="handleSearchDetail(keyword)" v-model.trim="keyword" maxlength="40" :placeholder="$t('commonTitle.searchKeyword')" :style="$i18n.locale == 'zh-CN'?'width: 470px;':'width: 350px;'"></el-input>
                 <p class="topsearch" type="primary" @click="handleSearchDetail(keyword)">{{$t("searchResult.search")}}</p>
 <!--                <p class="recommend">-->
 <!--                    <span  @click="handleSearchDetail(item)" v-for="item in keywordlist" style="margin-right: 10px;cursor: pointer;">{{item}}</span>-->
@@ -80,10 +80,10 @@
             </div>
         </div>
 
-        <div class="top_fixed_title istop_fixed_title" :class="isltrIndex?'ltrIndex_title':''" v-if="positions">
+        <div class="top_fixed_title istop_fixed_title" :class="isltrIndex?'ltrIndex_title':''" v-if="positions||isltrIndex">
             <minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :isltrIndex="isltrIndex" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :empLogo="empLogo" :navuserInfo="navuserInfo"></minPageTopindex>
         </div>
-        <div class="top_fixed_title" :class="isltrIndex?'ltrIndex_title':''" v-if="isTops">
+        <div class="top_fixed_title" :class="isltrIndex?'ltrIndex_title':''" v-if="isTops&&!isltrIndex">
             <minPageTopindex @topFixedvisible="topFixedvisible" :tabpath="tabpath" :isltrIndex="isltrIndex" :indextab="indextab" :messageCount="messageCount" :empOtherName="empOtherName" :empLogo="empLogo" :navuserInfo="navuserInfo"></minPageTopindex>
         </div>
 

src/components/index/minPageTopindex.vue

@@ -21,8 +21,8 @@
                         <searchTopbar @search="search"></searchTopbar>
                     </div>
                 </el-popover>
-                <el-input class="index_topsou" v-if="$i18n.locale == 'zh-CN'" v-popover:popoverKey @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>
-                <el-input class="index_topsou" v-else @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>
+                <el-input class="index_topsou" v-if="$i18n.locale == 'zh-CN'" v-popover:popoverKey @keyup.enter.native="handleSearchDetail(keyword)" @focus="keyword_search = true" @blur="keyword_search = false" v-model="keyword" maxlength="40" :placeholder="$t('commonTitle.searchKeyword')" style="width: 220px;height: 30px;"></el-input>
+                <el-input class="index_topsou" v-else @keyup.enter.native="handleSearchDetail(keyword)" @focus="keyword_search = true" @blur="keyword_search = false" v-model="keyword" maxlength="40" :placeholder="$t('commonTitle.searchKeyword')" 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>
                 </p>
@@ -218,10 +218,11 @@
         },
         mounted() {
             this.tabstate(this.$route.path);
-            this.keyword = this.publicFun.getCookie("keyword")?this.Base64.decode(this.publicFun.getCookie("keyword")):'';
+            if(this.$route.path=='/keySearchs'||this.$route.path=='/')this.keyword = this.publicFun.getCookie("keyword")?this.Base64.decode(this.publicFun.getCookie("keyword")):'';
+            else this.keyword = '';
             globalMsg.$on("isTopindex", (data) => {
                 this.tabstate(data);
-                if(data!='/keySearchs')this.keyword = '';
+                // if(data!='/keySearchs')this.keyword = '';
             });
         },
         watch:{

src/components/login/quicklogin.vue

@@ -17,7 +17,7 @@
                     <p class="loginButton" @click="handleRegister('registerForm')" v-loading.fullscreen="fullscreenLoading">{{$t('mobile.alreadyLogin')}}
                     </p>
                 </el-form-item>
-                <p style="text-align: center;color: #7A7A7A;font-size: 12px;">新用户直接登录即注册成功</p>
+                <p style="text-align: center;color: #7A7A7A;font-size: 12px;">{{$t("mobile.newUserLogin")}</p>
                 <div v-if="$i18n.locale=='zh-CN'" style="margin-top: 20px;text-align: center;">
                     <el-divider>其他登录方式</el-divider>
                     <p><a :href="hrefweb"><i style="color: #00C800;font-size: 28px;" class="iconfont icon-gongzhonghao"></i></a></p>

src/views/dockingpage/matchlist.vue

@@ -91,10 +91,10 @@
 <style scoped lang="scss">
     .matchpage{
         background: #EDEFF2;
-        padding-bottom: 40px;
+        padding:20px 0 40px;
         .match_content{
             width: 1200px;
-            margin: 20px auto 30px;
+            margin: 0 auto 30px;
             .match_top{
                 background: #ffffff;
                 border-radius: 3px;

src/views/findeventpage/eventpage.vue

@@ -329,6 +329,7 @@
                 this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
                 this.resourcesdata();
             });
+            document.getElementsByTagName("body")[0].style.overflow = "auto";
             this.resourcesdata();
             api.dataGroupAllLists().then(response => {
                 if(response.code == 0) {

src/views/keySearchpage/articlelist.vue

@@ -101,6 +101,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/bigBusinesslist.vue

@@ -146,6 +146,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/eventlist.vue

@@ -150,6 +150,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/guesslist.vue

@@ -122,6 +122,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/industrylist.vue

@@ -110,6 +110,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/networklist.vue

@@ -44,7 +44,7 @@
         },
         watch:{
             keyword(val){
-                this.$refs.searchUser.initialSearch();
+                this.$refs.searchUser.initialSearchRecommend();
             }
         }
     }

src/views/keySearchpage/projectlist.vue

@@ -148,6 +148,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getselectdatas();
             }
         }

src/views/keySearchpage/topiclist.vue

@@ -169,6 +169,7 @@
         },
         watch:{
             keyword(val){
+                this.cur_page = 1;
                 this.getsearchTopic();
             }
         }

src/views/netWorkpage/searchUserlist.vue

@@ -88,8 +88,12 @@
                 this.cur_page = 1;
                 this.getuserSearch();
             },
+            initialSearchRecommend(){
+                this.cur_page = 1;
+                this.getuserSearchList();
+            },
             //推荐用户
-            getActivityList(){
+            getuserSearchList(){
                 let params = 'count=5';
                 api.userSearchRecommend(params).then((res)=>{
                     if(res.code==0){
@@ -118,7 +122,7 @@
                             }
                         }
                         if(this.networkringlist&&this.networkringlist.length == 0){
-                            if(this.iskeySearch)this.getActivityList();
+                            if(this.iskeySearch)this.getuserSearchList();
                             this.iscontent = true;
 
                         }else{

src/views/peoplehomepage/introductionbar.vue

@@ -157,7 +157,7 @@
                     <p><i class="iconfont icon-jiaoyujingli" style="color:#B7E5CC;"></i></p>
                     <p>
                         <span>{{item.schoolName}}</span>
-                        <span>{{item.majorName}}</span>
+                        <span v-if="item.majorName">{{item.majorName}}</span>
                     </p>
                 </div>
             </div>

src/views/peoplehomepage/peoplehome.vue

@@ -145,7 +145,7 @@
                             </div>
                             <div class="privacyshow" :class="privacyshow?'privacynone':''">
                                 <div class="gendisplay" v-if="userInfoData.industryName">
-                                    <p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-hangye"></i></p>
+                                    <p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-hangye1"></i></p>
                                     <p style="margin-left: 10px;">{{$t("mineInfo.industry")}}：{{userInfoData.industryName}}</p>
                                 </div>
                                 <div class="gendisplay">

src/views/peoplehomepage/popoverBardbar.vue

@@ -25,7 +25,7 @@
                         <span @click="userStateclk">邀请好友</span>
                     </p>
                 </div>
-                <div v-if="empContactData.queryState == 2" class="bard_content">
+                <div v-if="empContactData.queryState == 2&&!placement" class="bard_content">
                     <div class="bard_user" :style="'background-image:url('+require('../../assets/img/contactBjt.png')+')'">
                         <p class="bard_info_img"><img :src="empContactData.baseEmpInformation.empLogo?empContactData.baseEmpInformation.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></p>
                         <p class="bard_info_name">{{empContactData.baseEmpInformation.empName}}</p>
@@ -62,6 +62,41 @@
             </p>
         </el-popover>
 
+        <div v-if="popovervisible" class="popoverfixed">
+            <div class="popover_back" @click="popovervisible=false"></div>
+            <div class="popover_Contact">
+                <i @click="popovervisible=false" class="iconfont icon-shanchuguanbicha popover_cha"></i>
+                <div v-if="empContactData.queryState == 2" class="bard_content" style="width: 300px;">
+                    <div class="bard_user" :style="'background-image:url('+require('../../assets/img/contactBjt.png')+')'">
+                        <p class="bard_info_img"><img :src="empContactData.baseEmpInformation.empLogo?empContactData.baseEmpInformation.empLogo:require('../../assets/img/defaultlogo.png')" alt=""></p>
+                        <p class="bard_info_name">{{empContactData.baseEmpInformation.empName}}</p>
+                        <p class="bard_info_work">
+                            {{empContactData.baseEmpInformation.isModerator==1||empContactData.baseEmpInformation.isProfessor==1?empContactData.baseEmpInformation.empTitle:empContactData.baseEmpInformation.workName}}
+                        </p>
+                        <p v-if="empContactData.baseEmpInformation.orgName" class="bard_info_org">{{empContactData.baseEmpInformation.orgName}}</p>
+                    </div>
+                    <div class="bard_info">
+                        <p v-if="empContactData.baseEmpInformation.empPhone">
+                            <i style="color:#5D78FF;" class="iconfont icon-shouji"></i>
+                            <span>手机：</span>
+                            <span>{{empContactData.baseEmpInformation.empPhone}}</span>
+                        </p>
+                        <p v-if="empContactData.baseEmpInformation.empEmail">
+                            <i style="color:#FF9E29;" class="iconfont icon-zhanneixin"></i>
+                            <span>邮箱：</span>
+                            <span>{{empContactData.baseEmpInformation.empEmail}}</span>
+                        </p>
+                        <p v-if="empContactData.baseEmpInformation.empWx">
+                            <i style="color:#0ABB87;" class="iconfont icon-weixin"></i>
+                            <span>微信：</span>
+                            <span>{{empContactData.baseEmpInformation.empWx}}</span>
+                        </p>
+                        <p style="font-size: 12px;">此联系方式为用户个人添加，平台不保证其真实性，请酌情使用。</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <el-dialog
                 :visible.sync="visible"
                 width="350px"
@@ -89,6 +124,7 @@
                 visible:false,
                 empContactstate:{},
                 empContactData:{},
+                popovervisible:false,
                 userInfo : this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : {},
                 urltext:this.publicFun.getCurrentHrefEnv() + "/inviteRegister" + "?rDeviceId=" + this.publicFun.getCookie("getGuid32") + "&rEmpId=" + (this.userInfo ? this.userInfo.empId : undefined) + "&rTargetType=1",
             }
@@ -125,6 +161,10 @@
                     if(res.code==0){
                         this.empContactstate.isConstact = true;
                         this.empContactData = res.result;
+                        if(this.empContactData.queryState == 2&&this.placement){
+                            this.$refs.popover.doClose();
+                            this.popovervisible = true;
+                        };
                     }else{
                         this.$message.error(res.msg);
                     }
@@ -242,4 +282,38 @@
         display: flex;/*新版本语法:opera 12.1,Firefox 22+*/
         justify-content: center;
     }
+    .popoverfixed{
+        position: fixed;
+        left: 0px;
+        top: 44px;
+        width: 100%;
+        height: 100%;
+        z-index: 997;
+        .popover_back{
+            position: fixed;
+            left: 0px;
+            top: 44px;
+            width: 100%;
+            height: 100%;
+            background: #000000;
+            opacity:0.5;
+            z-index: 998;
+        }
+        .popover_Contact{
+            z-index: 999;
+            position: fixed;
+            left: calc(50% - 150px);
+            top: 150px;
+            background: #ffffff;
+            border-radius: 18px;
+            .popover_cha{
+                position: absolute;
+                right: -30px;
+                top: -30px;
+                color: #ffffff;
+                font-size: 18px;
+                cursor: pointer;
+            }
+        }
+    }
 </style>
\ No newline at end of file

src/views/peoplehomepage/tabNewsbar.vue

@@ -49,7 +49,7 @@
                     <p v-if="item.messageType == 3"><i @click="tohome(item)">{{item.empName}}</i>关注了您</p>
                     <p v-if="item.messageType == 4">
                         <span v-if="item.createdBy == item.empId">
-                            我不同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人
+                            我不同意与<i @click="tohome(item)">{{item.empName}}</i>交换名片
                         </span>
                         <span v-else>
                             <i @click="tohome(item)">{{item.empName}}</i>不同意您添加TA为联系人
@@ -58,7 +58,7 @@
                     <p v-if="item.messageType == 5"><i @click="tohome(item)">{{item.empName}}</i>赞了您的评论</p>
                     <p v-if="item.messageType == 6">
                         <span v-if="item.createdBy == item.empId">
-                            我同意添加<i @click="tohome(item)">{{item.empName}}</i>为联系人
+                            我同意与<i @click="tohome(item)">{{item.empName}}</i>交换名片
                         </span>
                         <span v-else>
                             <i @click="tohome(item)">{{item.empName}}</i>同意您添加TA为联系人
@@ -295,6 +295,9 @@
                     cursor: pointer;
                     padding: 0 3px;
                 }
+                >i:first-child{
+                    padding: 0;
+                }
             }
             >p:nth-child(2){
                 line-height: 24px;

src/views/publishactivity/addfield.vue

@@ -13,7 +13,7 @@
                          v-model="item.isCheck"
                          style="margin-left: 10px;"
                          :true-label="1"
-                         :false-label="0">必填</el-checkbox>
+                         :false-label="0">{{$t("pubactivities.required")}}</el-checkbox>
             <div @click="contactsedit(item,index)" v-if="!item.isCustom" style="background: #405DE9;height: 35px;padding:0 10px;" class="iconfont icon-bianji1"></div>
         </div>
         <el-button plain type="primary" style="width: 100px;height: 35px;" @click="addcontacts">{{$t("pubactivities.newfield")}}</el-button>

src/views/publishactivity/proactivity.vue

@@ -22,8 +22,8 @@
                                 <el-form-item :label="$t('Otherjson.activitytitle')+'：'" prop="channelTitle" style="width: 100%;">
                                     <el-input v-model="formData.channelTitle" maxlength="100" :placeholder="$t('Otherjson.plactivitytitle')" style="width: 450px;height: 40px"></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="$route.query.type != '5'" label="行业通俗分类：" prop="dataList">
-                                    <el-select v-model="formData.dataList" multiple placeholder="请选择" style="width: 600px;">
+                                <el-form-item v-if="$route.query.type != '5'" :label="$t('industryjson.industry')+'：'" prop="dataList">
+                                    <el-select v-model="formData.dataList" multiple :placeholder="$t('completeInfo.select')" style="width: 600px;">
                                         <el-option
                                                 style="width: 600px;"
                                                 v-for="item in groupalllist"
@@ -589,7 +589,7 @@
                     channelNation: [{required: true,message:  this.$t('releasejson.plnation'),trigger: 'change'}],
                     versionType: [{required: true,message:  this.$t('Otherjson.plactivitytitle'),trigger: 'blur'}],
                     channelTitle: [{required: true,message:  this.$t('Otherjson.plactivitytitle'),trigger: 'blur'}],
-                    dataList: [{required: true,message: '请选择行业通俗分类',trigger: 'change'}],
+                    dataList: [{required: true,message: this.$t('completeInfo.select')+this.$t('industryjson.industry'),trigger: 'change'}],
                     channelPic: [{required: true,message:  this.$t('pubactivities.plactivityimg'),trigger: 'change'}],
                     channelIntroduction: [{required: true,message: this.$t('pubactivities.plactivities'),trigger: 'change'}],
                     channelStartTime: [{required: true,message: this.$t('pubactivities.plactivitytime'),trigger: 'change'}],