Merge remote-tracking branch 'origin/master'

public/css/pc.scss

@@ -958,6 +958,7 @@
     border-bottom: 1px solid #F2F2F2;
     >i{
       color: #5D78FF;
+      font-weight: bold;
     }
   }
 }

src/components/index/PageLeft.vue

@@ -297,9 +297,17 @@
                 else this.$router.replace({path:"/emailLoginCmpt",query:this.$route.query});
             }
         },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
+        },
         mounted() {
             this.getInitData();
             this.getCountData();
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.getInitData();
+                this.getCountData();
+            });
         },
         watch:{
             //监听相同路由下参数变化的时候，从而实现异步刷新

src/components/index/PageTopindex.vue

@@ -178,9 +178,9 @@
                     {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:2,name:this.$t("topNav.guess"),path:'/guesslist',pathchild:'/guessDetail'},
                     {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'},
                 ],
                 indextab_en:[
                     {id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
@@ -396,7 +396,16 @@
             globalMsg.$off('isTopindex');
         },
         mounted() {
-            this.userInfo =  this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+            globalMsg.$on("isTopindex", (data) => {
+                if(data == '/peoplehome/tabs/news')this.messageCount = 0;
+                this.tabstate(data);
+                if(data == '/'){
+                    this.isTops = false;
+                }else{
+                    this.isTops = true;
+                }
+                this.userInfo =  this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+            });
             if(this.userInfo){
                 this.getByEmpId();
                 this.getMessageCount();
@@ -426,15 +435,6 @@
             }else{
                 this.isTops = true;
             }
-            globalMsg.$on("isTopindex", (data) => {
-                if(data == '/peoplehome/tabs/news')this.messageCount = 0;
-                this.tabstate(data);
-                if(data == '/'){
-                    this.isTops = false;
-                }else{
-                    this.isTops = true;
-                }
-            });
         },
         watch:{
             tabpath(val){

src/components/index/searchTopbar.vue

 <template>
     <div class="searchTop">
         <div class="searchHot">
-            <div class="searchTop_title">热门</div>
+            <div class="searchTop_title">
+                <span class="title_h1">热门</span>
+            </div>
             <div>
                 <span @click="keywordSearch(item)" class="hot_key" v-for="(item,index) in hotSearchList" :key="index">{{item}}</span>
             </div>
         </div>
         <div class="searchHistory" v-if="historySearchList.length!=0">
             <div class="searchTop_title gendisplay">
-                <p>历史搜索</p>
+                <p class="title_h1">历史搜索</p>
                 <p @click="handleDeleteHistorySearch"><i class="iconfont icon-lajitongshanchu"></i></p>
             </div>
             <div class="history_key">
@@ -86,6 +88,11 @@
 </script>
 
 <style scoped lang="scss">
+    .title_h1{
+        color: #1A1A1E!important;
+        font-weight: bold;
+        cursor: default;
+    }
 .searchTop{
     position: absolute;
     width: 470px;
@@ -95,7 +102,7 @@
     color: #1A1A1E;
     >div{
         .searchTop_title{
-            margin-bottom: 10px;
+            margin-bottom: 5px;
             >p:first-child{
                 width: 100%;
             }
@@ -107,7 +114,8 @@
         }
         .hot_key{
             font-size: 12px;
-            margin: 0 15px 8px 0;
+            line-height: 26px;
+            margin: 0 15px 0 0;
             display: inline-block;
             cursor: pointer;
         }
@@ -116,7 +124,7 @@
         }
         .history_key{
             >p{
-                line-height: 28px;
+                line-height: 26px;
                 font-size: 12px;
                 cursor: pointer;
             }
@@ -126,7 +134,7 @@
         }
     }
     .searchHistory{
-        margin-top: 30px;
+        margin-top: 15px;
     }
 }
 </style>
\ No newline at end of file

src/views/bigbusiness/pages/list.vue

@@ -383,7 +383,13 @@
                 this.pageShow = true;
             }
         },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
+        },
         mounted(){
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.getUserInfoFunc();
+            });
             this.getInitList();
             if(this.$route.query.remind){
                 const empinfo = JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType()));

src/views/dockingpage/matchlist.vue

@@ -13,7 +13,7 @@
             </div>
         </div>
 
-        <div class="matchfixed">
+        <div class="matchfixed" v-if="!publicFun.isgetUserRoleFunc(2)&&!publicFun.isgetUserRoleFunc(5)">
             <div @click="pushClick('project')">
                 <img :src="publicFun.getCookie('language') == 'en'?require('../../assets/img/pushprojecten.png'):require('../../assets/img/pushproject.png')" alt="">
             </div>
@@ -38,6 +38,7 @@
                 dataName:'first',
                 projectNum:'——',
                 customerNum:'——',
+                userInfo:this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
             }
         },
         components:{projectlist,bigBusinesslist,expertVisible},
@@ -73,8 +74,14 @@
                 })
             },
         },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
+        },
         mounted() {
             this.getCountData();
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+            });
         }
     }
 </script>

src/views/findeventpage/eventdetail.vue

@@ -242,10 +242,17 @@
                                     if(res.result.length>0){
                                         res.result.forEach((item) => {
                                             if (item.isBase == 0) {
+                                                console.log(this.userInfo)
                                                 item.fieldList.forEach((data,index) => {
                                                     if(data.fieldValue.charAt(0)=='a'){
                                                         arrVal.push(item.fieldValue);
                                                     }
+                                                    if(data.isCheck==1){
+                                                        arrVal.push(item.fieldValue);
+                                                    }
+                                                    if(!this.userInfo.empName&&data.fieldValue == 'contactsName'){
+                                                        arrVal.push(item.fieldValue);
+                                                    }
                                                 })
                                             }
                                         })
@@ -319,6 +326,7 @@
         },
         beforeDestroy() { // 在组件生命周期结束的时候销毁。
             window.removeEventListener('scroll', this.menu);
+            globalMsg.$off('loginsuccess');
         },
         mounted() {
             if (this.publicFun.judgeBrandIsWechatOrHtml() != 1) {
@@ -328,6 +336,10 @@
                     this.$router.replace({path:'/activitydetail',query:{id:this.$route.query.id,type:this.$route.query.type,isApply:this.$route.query.ismyevent==0?1:3}});
                 }
             }
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.getActivityDetails();
+            });
             globalMsg.$emit('topisInit', false);
             globalMsg.$emit('sendIndex', 3);
             globalMsg.$emit('maidianfunc',({type:'report-channel-read',channelId:this.$route.query.id}));

src/views/findeventpage/eventlive.vue

@@ -2,7 +2,9 @@
     <div>
         <iframe name = "child" id = "child" src="live.html" frameborder="0" scrolling="no" style="position:related;top: 2.8px;left: 0px;width: 100%;height: 100vh;border: medium none;"></iframe>
         <div v-if="$i18n.locale=='zh-CN'" @click="isuserClick" class="event_iconchange">
-            <img src="../../assets/img/changeImg.png" alt="">
+            <el-tooltip class="item" effect="dark" content="互换名片，拓展人脉圈" placement="top-start">
+                <img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
+            </el-tooltip>
         </div>
         <div class="gendisplay event_all" :class="userClick?'':'event_lshow'">
             <div @click="userClick = false" class="event_l"></div>
@@ -116,7 +118,7 @@
         position: fixed;
         bottom: 50px;
         right: 0px;
-        >img{
+        .event_iconchange_img{
             width: 70px;
             cursor: pointer;
         }
@@ -144,7 +146,7 @@
         .event_r{
             background: #ffffff;
             width: 300px;
-            transition: right .3s;
+            transition: right .6s;
             height: 100%;
             position: absolute;
             right: -300px;

src/views/findeventpage/eventpage.vue

@@ -233,6 +233,12 @@
                                                         if(data.fieldValue.charAt(0)=='a'){
                                                             arrVal.push(item.fieldValue);
                                                         }
+                                                        if(data.isCheck==1){
+                                                            arrVal.push(item.fieldValue);
+                                                        }
+                                                        if(!this.userInfo.empName&&data.fieldValue == 'contactsName'){
+                                                            arrVal.push(item.fieldValue);
+                                                        }
                                                     })
                                                 }
                                             })
@@ -315,7 +321,14 @@
                 this.resourcesdata();
             },
         },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
+        },
         mounted() {
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.resourcesdata();
+            });
             this.resourcesdata();
             api.dataGroupAllLists().then(response => {
                 if(response.code == 0) {

src/views/findeventpage/userlist.vue

@@ -3,7 +3,7 @@
         <el-scrollbar style="height: 100%">
             <div class="p_tabs_content" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
                 <div class="gendisplay " v-for="(item,index) in userRelationlist">
-                    <span class="userImg">
+                    <span class="userImg" @click="tohome(item)">
                         <img class="userinfo_img" :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="">
                         <img class="userImg_vip" v-if="item.isProfessor == 1"  src="../../assets/img/proFeedBack/vip.png"  alt="">
                         <img class="userImg_vip" v-if="item.isModerator == 1&&item.isProfessor == 0" src="../../assets/img/mobile/moderator.png" alt="">
@@ -16,7 +16,7 @@
                             </p>
                             <div v-if="item.empId != userInfo.empId">
                                 <popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
-                                <btnbar v-else :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
+                                <btnbar v-if="item.isFriend != 2" :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
                             </div>
                         </div>
                         <p @click="tohome(item)" style="color:#AAAAAA;">

src/views/index/pages/temporary.vue

@@ -960,6 +960,12 @@
                                                         if(data.fieldValue.charAt(0)=='a'){
                                                             arrVal.push(item.fieldValue);
                                                         }
+                                                        if(data.isCheck==1){
+                                                            arrVal.push(item.fieldValue);
+                                                        }
+                                                        if(!this.userInfo.empName&&data.fieldValue == 'contactsName'){
+                                                            arrVal.push(item.fieldValue);
+                                                        }
                                                     })
                                                 }
                                             })

src/views/industryreportspage/industryReportDetail.vue

@@ -24,7 +24,7 @@
                                 trigger="hover">
                                 <div class="centerQrCode" style="text-align: center">
                                     <span style="font-size: 12px;">{{$t('industryjson.share1')}}</span>
-                                    <VueQRCodeComponent style="margin:10px 0 10px 17px;" :text="urltext" :size="120" :margin="0"></VueQRCodeComponent>
+                                    <VueQRCodeComponent style="margin:10px 0 10px 17px;" :text="publicFun.getCurrentHrefEnv()+'#/industryReportDetail?id='+dataDetail.reportId" :size="120" :margin="0"></VueQRCodeComponent>
                                     <span style="font-size: 12px;">{{$t('industryjson.share2')}}</span>
                                     <span style="font-size: 12px;">{{$t('industryjson.share3')}}</span>
 
@@ -52,7 +52,7 @@
                 center>
             <div class="centerQrCode" style="text-align: center">
                 <span style="font-size: 12px;">{{$t('industryjson.share1')}}</span>
-                <VueQRCodeComponent style="margin:10px 90px;" :text="urltext" :size="120" :margin="0"></VueQRCodeComponent>
+                <VueQRCodeComponent style="margin:10px 90px;" :text="publicFun.getCurrentHrefEnv()+'#/industryReportDetail?id='+dataDetail.reportId" :size="120" :margin="0"></VueQRCodeComponent>
                 <span style="font-size: 12px;">{{$t('industryjson.share2')}}</span>
                 <span style="font-size: 12px;">{{$t('industryjson.share3')}}</span>
 
@@ -116,8 +116,8 @@
                     } else {
                         if(response.result==4||response.result==5){
                             this.$confirm(response.msg, {
-                                cancelButtonText: response.result==4?'分享即得积分':response.result==5?'取消':'',
-                                confirmButtonText: response.result==4?(this.$i18n.locale=="zh-CN"?'赚取积分':''):response.result==5?'确定':'',
+                                cancelButtonText: response.result==4?(this.$i18n.locale=="zh-CN"?'分享即得积分':'Cancel'):response.result==5?'取消':'',
+                                confirmButtonText: response.result==4?(this.$i18n.locale=="zh-CN"?'赚取积分':'OK'):response.result==5?'确定':'',
                                 type: '',
                                 distinguishCancelAndClose: true,
                                 dangerouslyUseHTMLString:true,
@@ -126,7 +126,7 @@
                                 if(response.result==4){
                                     if(this.$i18n.locale=="zh-CN")window.open(this.publicFun.getCurrentHrefEnv()+"#/userintegral");
                                 }else{
-                                    this.gocontentdetail(1);
+                                    if(this.$i18n.locale=="zh-CN")this.gocontentdetail(1);
                                 }
                             }).catch((action) => {
 

src/views/industryreportspage/industrypage.vue

@@ -41,7 +41,7 @@
                                                         trigger="hover">
                                                     <div class="centerQrCode" style="text-align: center">
                                                         <span style="font-size: 12px;">{{$t('industryjson.share1')}}</span>
-                                                        <VueQRCodeComponent style="margin:10px 0 10px 17px;" :text="urltext" :size="120" :margin="0"></VueQRCodeComponent>
+                                                        <VueQRCodeComponent style="margin:10px 0 10px 17px;" :text="publicFun.getCurrentHrefEnv()+'#/industryReportDetail?id='+item.reportId" :size="120" :margin="0"></VueQRCodeComponent>
                                                         <span style="font-size: 12px;">{{$t('industryjson.share2')}}</span>
                                                         <span style="font-size: 12px;">{{$t('industryjson.share3')}}</span>
 

src/views/integralpage/guessdetail.vue

@@ -84,7 +84,7 @@
                         </p>
                         <div style="margin-top: 20px;width: 100%;" class="gendisplay">
                             <p style="width: 95%;height: 50px;overflow: hidden;">
-                                <img v-if="contentdata.guessEmpList" v-for="(item,index) in contentdata.guessEmpList" :key="index" :src="item.empLogo.length==0?require('../../assets/img/defaultlogo.png'):item.empLogo" class="images">
+                                <img @click="tohome(item)" v-if="contentdata.guessEmpList" v-for="(item,index) in contentdata.guessEmpList" :key="index" :src="item.empLogo.length==0?require('../../assets/img/defaultlogo.png'):item.empLogo" class="images">
                             </p>
                             <p style="line-height: 50px;" v-if="contentdata.guessEmpList&&contentdata.guessEmpList.length > 13">
                                 &bull;&bull;&bull;
@@ -163,6 +163,16 @@
             })
         },
         methods:{
+            //去主页
+            tohome(row){
+                if(!this.publicFun.getUserInfoCookieType()){
+                    this.$refs.login.isexpertVisible();
+                    return
+                }else{
+                    window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplehome?id="+row.empId);
+                    // this.$router.push({path:"/peoplehome",query:{id:row.empId}});
+                }
+            },
             //图片查看处理
             getSrcList(index){
                  if(this.contentdata.resultsImg.split){

src/views/integralpage/integralguesslist.vue

@@ -196,7 +196,7 @@
                         this.$refs.login.isexpertVisible();
                         return
                     }
-                    this.$router.push({path:'/empguesslist'})
+                    this.$router.push({path:'/peoplehome/tabs/quiz'})
                 }
 
             },

src/views/keySearchpage/bigBusinesslist.vue

@@ -19,10 +19,12 @@
                         </p>
                         <p>
                             <span>
-                                目标客户行业：{{item.targetIndustryStr}}
+                                <i style="font-weight: bold;">目标客户行业：</i>
+                                {{item.targetIndustryStr}}
                             </span>
                             <span>
-                                首选合作方式：{{item.companyIndustryStr}}
+                                <i style="font-weight: bold;">首选合作方式：</i>
+                                {{item.companyIndustryStr}}
                             </span>
                         </p>
                         <p>
@@ -47,11 +49,13 @@
                 </div>
             </div>
         </div>
+        <expertVisible ref="login" @dataEvent="successlogin" :registerType="107"></expertVisible>
     </div>
 </template>
 
 <script>
     import api from "./api/api";
+    import expertVisible from "../../components/login/quicklogin";
 
     export default {
         name: "bigBusinesslist",
@@ -61,13 +65,21 @@
                 totalListResult: 0,
                 numberData: 10, //设置个数
                 datalist:[],
+                userInfo : this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
             }
         },
         props:['keyword'],
+        components:{expertVisible},
         methods:{
             newOpenroute(row){
                 window.open(this.publicFun.getCurrentHrefEnv()+"#/bigBusiness/detail?id="+row.businessId+'&flag=1');
             },
+            //登陆成功
+            successlogin(){
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.cur_page = 6;
+                this.getselectdatas();
+            },
             // 分页导航
             handleCurrentChange(val) {
                 this.cur_page = val;
@@ -92,7 +104,37 @@
                         this.datalist = response.result.records;
                         this.totalListResult = response.result.total;
                     }else{
-                        this.$message.error(response.msg);
+                        if(response.code==499) {
+                            if ( this.userInfo ) {
+                                if(this.userInfo.auditState=="AS01"||this.userInfo.auditState=="AS02"||this.userInfo.auditState=="AS04"){
+                                    this.$confirm( this.$t("commonTitle.bBNoAuthTitle"), {
+                                        cancelButtonText: this.$t("commonTips.cancel"),
+                                        confirmButtonText: this.$t("commonTitle.sendProject"),
+                                        type: '',
+                                        customClass: 'deleteConfirm'
+                                    }).then(() => {
+                                        this.$router.push('/totceldata');
+                                    }).catch(() => {
+                                        this.cur_page = 1;
+                                        this.getselectdatas();
+                                    });
+                                }
+                            }else{
+                                this.$confirm(this.$t("commonTips.loginMore"), {
+                                    cancelButtonText: this.$t("commonTips.cancel"),
+                                    confirmButtonText: this.$t("mobile.alreadyLogin"),
+                                    type: '',
+                                    customClass: 'deleteConfirm'
+                                }).then(() => {
+                                    this.cur_page = 1;
+                                    this.$refs.login.isexpertVisible();
+                                }).catch(() => {
+                                    this.cur_page = 1;
+                                    this.getselectdatas();
+                                });
+                            }
+                        }
+                        // this.$message.error(response.msg);
                     }
                 }).catch((err)=>{
                     this.$message.error(err);
@@ -124,6 +166,9 @@
         }
     }
     .search_dataList{
+        >div:last-child{
+            border: none;
+        }
         >div{
             padding: 20px 0;
             border-bottom: 1px solid #F2F2F2;
@@ -133,13 +178,13 @@
             }
             >div{
                 width: calc(100% - 40px);
-                padding-left: 20px;
+                padding-left: 15px;
                 >p:nth-child(1){
                     color: #1A1A1E;
                     font-weight: bold;
                 }
                 >p:nth-child(2){
-                    margin: 8px 0 12px;
+                    margin: 8px 0 8px;
                     color: #1A1A1E;
                     font-size: 12px;
                 }

src/views/keySearchpage/keySearchs.vue

@@ -36,15 +36,15 @@
                     <div class="gendisplay">
                         <div>
                             <i class="iconfont icon-huore"></i>
-                            <p>最新竞猜</p>
+                            <p>行业活动</p>
                         </div>
                         <div>
                             <i class="iconfont icon-hongbao"></i>
-                            <p>最新竞猜</p>
+                            <p>热门话题</p>
                         </div>
                         <div>
                             <i class="iconfont icon-vip1"></i>
-                            <p>最新竞猜</p>
+                            <p>专家汇聚</p>
                         </div>
                     </div>
                 </div>
@@ -89,13 +89,14 @@
         components:{projectlist,bigBusinesslist,eventlist,topiclist,networklist,guesslist,articlelist,industrylist},
         beforeRouteEnter(to, from, next) {
             next(vm=>{          //  这里的vm指的就是vue实例，可以用来当做this使用
-                if(from.path == '/matchlist')vm.keychecked = 1
-                else if(from.path == '/activitylist')vm.keychecked = 3
-                else if(from.path == '/topicList')vm.keychecked = 4
-                else if(from.path == '/circleList')vm.keychecked = 5
-                else if(from.path == '/guesslist')vm.keychecked = 6
-                else if(from.path == '/articleList')vm.keychecked = 7
-                else if(from.path == '/industryReport')vm.keychecked = 8
+                if(from.path == '/matchlist'||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 == '/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
+                else if(from.path == '/industryReport'||from.path == '/industryReportDetail')vm.keychecked = 8
             })
         },
         methods:{

src/views/keySearchpage/projectlist.vue

@@ -27,11 +27,12 @@
                                 {{item.companyCity?(' - '+item.companyCity):''}}
                             </span>
                             <span v-if="item.companyIndustryList">
-                                目标客户行业：
-                                <span v-for="(itemcompany,index) in item.companyIndustryList">{{itemcompany}}{{item.companyIndustryList.length-1 == index ? '' : ' 、 '}}</span>
+                                <i style="font-weight: bold;">目标客户行业：</i>
+                                <span v-for="(itemcompany,index) in item.companyIndustryList">{{itemcompany}}{{item.companyIndustryList.length-1 == index ? '' : '、'}}</span>
                             </span>
                             <span v-if="item.cooperationWay">
-                                首选合作方式：{{item.cooperationWay}}
+                                <i style="font-weight: bold;">首选合作方式：</i>
+                                {{item.cooperationWay}}
                             </span>
                         </p>
                     </div>
@@ -50,11 +51,13 @@
                 </div>
             </div>
         </div>
+        <expertVisible ref="login" @dataEvent="successlogin" :registerType="107"></expertVisible>
     </div>
 </template>
 
 <script>
     import api from "./api/api";
+    import expertVisible from "../../components/login/quicklogin";
 
     export default {
         name: "projectlist",
@@ -64,13 +67,21 @@
                 totalListResult: 0,
                 numberData: 10, //设置个数
                 datalist:[],
+                userInfo : this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
             }
         },
         props:['keyword'],
+        components:{expertVisible},
         methods:{
             newOpenroute(row){
                 window.open(this.publicFun.getCurrentHrefEnv()+"#/viewproject?projectId="+row.projectId+'&state=0');
             },
+            //登陆成功
+            successlogin(){
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.cur_page = 6;
+                this.getselectdatas();
+            },
             // 分页导航
             handleCurrentChange(val) {
                 this.cur_page = val;
@@ -95,7 +106,37 @@
                         this.datalist = response.result.records;
                         this.totalListResult = response.result.total;
                     }else{
-                        this.$message.error(response.msg);
+                        if(response.code==499) {
+                            if ( this.userInfo ) {
+                                if(this.userInfo.auditState=="AS01"||this.userInfo.auditState=="AS02"||this.userInfo.auditState=="AS04"){
+                                    this.$confirm( this.$t("commonTitle.sBNoAuthTitle"), {
+                                        cancelButtonText: this.$t("commonTips.cancel"),
+                                        confirmButtonText: this.$t("commonTitle.sendRequire"),
+                                        type: '',
+                                        customClass: 'deleteConfirm'
+                                    }).then(() => {
+                                        this.$router.push('/bigBusiness/add');
+                                    }).catch(() => {
+                                        this.cur_page = 1;
+                                        this.getselectdatas();
+                                    });
+                                }
+                            }else{
+                                this.$confirm(this.$t("commonTips.loginMore"), {
+                                    cancelButtonText: this.$t("commonTips.cancel"),
+                                    confirmButtonText: this.$t("mobile.alreadyLogin"),
+                                    type: '',
+                                    customClass: 'deleteConfirm'
+                                }).then(() => {
+                                    this.cur_page = 1;
+                                    this.$refs.login.isexpertVisible();
+                                }).catch(() => {
+                                    this.cur_page = 1;
+                                    this.getselectdatas();
+                                });
+                            }
+                        }
+                        // this.$message.error(response.msg);
                     }
                 }).catch((err)=>{
                     this.$message.error(err);
@@ -127,6 +168,9 @@
         }
     }
 .search_dataList{
+    >div:last-child{
+        border: none;
+    }
     >div{
         padding: 20px 0;
         border-bottom: 1px solid #F2F2F2;
@@ -136,7 +180,7 @@
         }
         >div{
             width: calc(100% - 40px);
-            padding-left: 20px;
+            padding-left: 15px;
             >p:nth-child(1){
                 color: #1A1A1E;
                 font-weight: bold;

src/views/keySearchpage/topiclist.vue

@@ -57,7 +57,7 @@
                                         <span v-if="item.isOpenReward!=1&&item.professorCount!=0" class="ellipsisFont1" style="max-width: 200px;color:#5D78FF;">专家入驻{{item.professorCount}}位</span>
                                         <span v-if="item.isOpenReward==1||item.professorCount==0" class="ellipsisFont1" style="max-width: 200px;">发起方： <i style="color:#5D78FF;">{{item.topicInitiator}}</i></span>
                                         <span>阅读 {{item.topicBrowseStr}}</span>
-                                        <span>参与 {{item.topicDiscussStr}}</span>
+                                        <span>参与数 {{item.topicDiscussStr}}</span>
                                         <span>成员 {{item.joinCount}}</span>
                                     </div>
                                 </div>
@@ -69,11 +69,13 @@
                 <p style="color: #9197B4;text-align: center;line-height: 50px;" v-if="noMore">{{$t('industryjson.nomore')}}</p>
             </div>
         </div>
+        <expertVisible ref="login" :registerType="101"></expertVisible>
     </div>
 </template>
 
 <script>
     import api from "./api/api";
+    import expertVisible from "../../components/login/quicklogin";
 
     export default {
         name: "topiclist",
@@ -89,6 +91,7 @@
             }
         },
         props:['keyword'],
+        components:{expertVisible},
         computed: {
             noMore () {
                 return this.cur_page == this.pages

src/views/netWorkpage/dynamicbar.vue

@@ -17,7 +17,7 @@
                             <div v-if="item.dynamicType == 1">
                                 <p class="gendisplay">
                                     <span @click="tohome(item.empId)">{{item.empName}}</span>&nbsp;在&nbsp;
-                                    <span @click="$router.push({path:'/discussdetail',query:{id:item.pid,disId:item.id}})"> {{'#'+item.topicName}}</span>
+                                    <span @click=topicdetail(item)> {{'#'+item.topicName}}</span>
                                     <span>...</span>
                                     话题下发布了讨论
                                 </p>
@@ -89,6 +89,10 @@
                     // this.$router.push({path:"/peoplehome",query:{id:id}});
                 }
             },
+            topicdetail(item){
+                window.open(this.publicFun.getCurrentHrefEnv()+"#/discussdetail?id="+id.pid+"&disId="+item.id);
+                // this.$router.push({path:'/discussdetail',query:{id:item.pid,disId:item.id}});
+            },
         },
         mounted() {
             this.getDynamicMessage();

src/views/peoplehomepage/introductionbar.vue

@@ -71,7 +71,7 @@
                             </p>
                             <div>
                                 <p class="ellipsisFont2">
-                                    <span class="event_hasLive" @click="openeventlive(item.activityDTO)" v-if="item.activityDTO.hasLive == 1" :style="item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'">
+                                    <span class="event_hasLive" @click="openeventlive(item.activityDTO,item)" v-if="item.activityDTO.hasLive == 1" :style="item.activityDTO.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'">
                                         <i class="iconfont icon-zhibo"></i>
                                         {{item.activityDTO.baseLive.liveState == 0?$t('activityInfo.liveTitle'):item.activityDTO.baseLive.liveState == 1?$t('activityInfo.living'):item.activityDTO.baseLive.liveState==2&&item.activityDTO.baseLive.liveBack == 0?$t('activityInfo.liveBack'):$t('activityInfo.liveTitle')}}
                                     </span>
@@ -209,7 +209,7 @@
                 }
             },
             //打开直播
-            openeventlive(row){
+            openeventlive(row,item){
                 var liveUrl = this.Base64.encode(row.baseLive.liveUrl);
                 this.publicFun.setUserInfoCookie("liveUrl",row.baseLive.liveUrl);
                 if(row.baseLive.liveState != 0){
@@ -225,15 +225,17 @@
                             }
                             window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl+'&id='+row.channelId);
                         }else{
-                            if(row.baseLive.livePowers == 0&&row.activityState == 2&&row.isJoin == 2){
+                            if(row.baseLive.livePowers == 0&&row.activityState == 2&&!row.isApply){
                                 if(!this.publicFun.getUserInfoCookieType()){
                                     this.$refs.login.isexpertVisible();
                                     return
                                 }
-                                this.$message.error(this.$t('activityInfo.applyFirst'));
-                            }else if(row.baseLive.livePowers == 0&&row.activityState == 5&&row.isJoin == 2||row.baseLive.livePowers == 0&&row.activityState == 3&&row.isJoin == 2){
+                                this.routerpush(4,item);
+                                // this.$message.error(this.$t('activityInfo.applyFirst'));
+                            }else if(row.baseLive.livePowers == 0&&row.activityState == 5&&!row.isApply||row.baseLive.livePowers == 0&&row.activityState == 3&&!row.isApply){
                                 if(row.baseLive.liveState != 2){
-                                    this.$message.error(this.$t('activityInfo.applyEndTitle'));
+                                    this.routerpush(4,item);
+                                    // this.$message.error(this.$t('activityInfo.applyEndTitle'));
                                 }
                             }else{
                                 if(row.baseLive.liveState == 1||row.baseLive.liveState == 2&&row.baseLive.liveBack == 0){

src/views/peoplehomepage/peoplehome.vue

@@ -126,15 +126,15 @@
                     <div class="gendisplay about_top privacy_content">
                         <div class="privacy_left">
                             <div class="gendisplay">
-                                <div v-if="((userInfoData.moderator||userInfoData.professor)&&userInfoData.title)||userInfoData.orgName" class="gendisplay">
+                                <div v-if="((userInfoData.moderator||userInfoData.professor)&&userInfoData.title)||userInfoData.workName" class="gendisplay">
                                     <p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-hangye"></i></p>
                                     <p style="margin-left: 10px;">
-                                        {{userInfoData.moderator||userInfoData.professor?userInfoData.title:userInfoData.orgName}}
+                                        {{userInfoData.moderator||userInfoData.professor?userInfoData.title:userInfoData.workName}}
                                     </p>
                                 </div>
-                                <div v-if="userInfoData.workName" style="margin-left: 20px;" class="gendisplay">
+                                <div v-if="userInfoData.orgName" style="margin-left: 20px;" class="gendisplay">
                                     <p><i style="color:#AAAAAA;font-size: 12px;" class="iconfont icon-qiye"></i></p>
-                                    <p style="margin-left: 10px;">{{userInfoData.workName}}</p>
+                                    <p style="margin-left: 10px;">{{userInfoData.orgName}}</p>
                                 </div>
                             </div>
 

src/views/publishactivity/proactivity.vue

@@ -22,7 +22,7 @@
                                 <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 label="行业通俗分类：" prop="dataList">
+                                <el-form-item v-if="$route.query.type != '5'" label="行业通俗分类：" prop="dataList">
                                     <el-select v-model="formData.dataList" multiple placeholder="请选择" style="width: 600px;">
                                         <el-option
                                                 style="width: 600px;"

src/views/seeprojects/seeprojectlist.vue

@@ -348,8 +348,16 @@
 
 
 
+        },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
         },
         mounted(){
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
+                this.getInitData();
+                this.getCountData();
+            });
             // const empinfo = JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType()));
             // if(empinfo.authenticationState != 2){
             //     this.stateauth = false;

src/views/topicpage/discussall.vue

@@ -104,7 +104,7 @@
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                     <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;">
+                                        <div style="position: relative;" @click="tohome(item)">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>
@@ -146,7 +146,7 @@
                                 <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                     <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                         <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                            <p style="position: relative;">
+                                            <p style="position: relative;" @click="tohome(item)">
                                                 <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
                                                 <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
 
@@ -239,6 +239,16 @@
             topicbar,VueQRCodeComponent,discussdialog,expertVisible,dialogintegralbar
         },
         methods: {
+            //去主页
+            tohome(row){
+                if(!this.publicFun.getUserInfoCookieType()){
+                    this.$refs.login.isexpertVisible();
+                    return
+                }else{
+                    window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplehome?id="+row.empId);
+                    // this.$router.push({path:"/peoplehome",query:{id:row.empId}});
+                }
+            },
             todetail(row){
                 // this.$router.push({path:"/topicDetails",query:{id:row.topicId}});
                 window.open(this.publicFun.getCurrentHrefEnv()+"#/topicDetails?id="+row.topicId+'&newnpen=true');

src/views/topicpage/topicdetail.vue

@@ -1448,7 +1448,23 @@
                     });
             },
         },
+        beforeDestroy() { // 在组件生命周期结束的时候销毁。、
+            globalMsg.$off('loginsuccess');
+        },
         mounted(){
+            globalMsg.$on("loginsuccess",(data)=>{
+                this.empId = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())).empId : undefined;
+                api.selectTopicById(this.$route.query.id).then((res) => {
+                    if (res.code == 0) {
+                        this.contentdata = res.result;
+                        this.discussContent = '<p>#'+this.contentdata.topicTitle+'#</p>';
+                    }else {
+                        this.$message.error(res.msg)
+                    }
+                }).catch((err) => {
+                    this.$message.error(err)
+                })
+            });
             if(this.empId){
                 this.getMyproject();
                 this.getselectByEmpId();

src/views/topicpage/topicpool.vue

@@ -60,7 +60,7 @@
                     </el-table-column>
                     <el-table-column label="发布人" align="center">
                         <template slot-scope="scope">
-                            {{scope.row.nickName?scope.row.nickName:scope.row.empName}}
+                            {{scope.row.isProfessor||scope.row.isModerator?scope.row.empName:scope.row.nickName}}
                         </template>
                     </el-table-column>
                     <el-table-column :label="$t('listjson.action')" width="200" align='center'>

src/views/topicpage/topictype.vue

@@ -106,7 +106,7 @@
                                     <div v-for="(item,index) in professorlist" :key="index">
                                         <el-tooltip placement="top" popper-class="boxShadowTip" effect="light">
                                             <div class="gendisplay" style="padding: 20px 20px 0 20px;">
-                                                <div style="position: relative;">
+                                                <div style="position: relative;"  @click="tohome(item)">
                                                     <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                     <img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
@@ -119,7 +119,7 @@
 
                                             <div slot="content">
                                                 <div class="gendisplay">
-                                                    <div style="position: relative;">
+                                                    <div style="position: relative;" @click="tohome(item)">
                                                         <img v-if="item.empLogo" :src="item.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                         <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                                         <img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
@@ -144,7 +144,7 @@
                             <el-tab-pane :label="'已入驻版主（'+moderatorCount+'）'" name="first">
                                 <div style="margin:0 30px 20px 0;flex-wrap: wrap;" class="gendisplay">
                                     <div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
-                                        <div style="position: relative;">
+                                        <div style="position: relative;" @click="tohome(item)">
                                             <img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
                                             <img src="../../assets/img/mobile/moderator.png" alt="" style="position: absolute;right: 3px;bottom: 0px;width: 15px;">
                                         </div>
@@ -213,6 +213,16 @@
             }
         },
         methods: {
+            //去主页
+            tohome(row){
+                if(!this.publicFun.getUserInfoCookieType()){
+                    this.$refs.login.isexpertVisible();
+                    return
+                }else{
+                    window.open(this.publicFun.getCurrentHrefEnv()+"#/peoplehome?id="+row.empId);
+                    // this.$router.push({path:"/peoplehome",query:{id:row.empId}});
+                }
+            },
             load () {
                 if(this.cur_page <= this.pages){
                     this.cur_page++;