Merge remote-tracking branch 'origin/master'

src/views/conmanagementpage/articleservice.vue

@@ -203,7 +203,7 @@
             },
             //
             viewShow(row){
-                window.open(this.publicFun.getCurrentHrefEnv()+"#/contentdetail?id="+row.contentId+'&newnpen=true');
+                window.open(this.publicFun.getCurrentHrefEnv()+"#/articleDetail?id="+row.contentId+'&newnpen=true');
             },
             //分类列表条件
             getClassifyList(){
@@ -357,7 +357,11 @@
             this.getChannelList();
             this.getClassifyList();
             this.getselectDictList();
-            // this.getsearchContents();
+            this.searchs = this.searchdata;
+            this.channelrow = this.searchdata.channelrow;
+            this.classifyrow = this.searchdata.classifyrow;
+            this.dictrow = this.searchdata.codes;
+            this.getsearchContents();
         },
         watch:{
             searchdata(val){

src/views/conmanagementpage/conmanagement.vue

@@ -38,7 +38,9 @@
             return {
                 activeName:'first',
                 showNum: 2,
-                searchs:{}
+                searchs:{},
+                channelrow:[],
+                classifyrow:[],
             }
         },
         components:{
@@ -72,7 +74,7 @@
                 this.searchs.channelrow = [];
                 this.searchs.classifyrow = [];
                 this.activeName = 'first';
-                this.channelrow.push(val.channelId);
+                this.searchs.channelrow.push(val.channelId);
                 // this.$refs.childone.getsearchContents();
             },
             classifyclk(val){
@@ -80,7 +82,7 @@
                 this.activeName = 'first';
                 this.searchs.channelrow = [];
                 this.searchs.classifyrow = [];
-                this.classifyrow.push(val.classifyId);
+                this.searchs.classifyrow.push(val.classifyId);
                 // this.$refs.childone.getsearchContents();
             },
         },

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -220,16 +220,16 @@
                             <p style="border-bottom: 1px solid #E7E9F5;margin:0 25px"></p>
                             <div style="margin: 30px 0;">
                                 <el-form :inline="true" :label-width="diven_zh?'160px':'300px'" :model="addData" :class="diven_zh?'contnetform':'contnetform300'">
-                                    <el-form-item v-if="addData.companyIndustryList||state" :label="$t('listproject.fmcompanyIndustryList')" style="width: 100%;">
+                                    <el-form-item v-if="addData.companyIndustryList&&addData.companyIndustryList.length>=1||state" :label="$t('listproject.fmcompanyIndustryList')" style="width: 100%;">
                                         <span style="margin-right: 5px" v-for="(item,index) in addData.companyIndustryList" :key="index">{{item}}</span>
                                     </el-form-item>
-                                    <el-form-item v-if="addData.cooperationWay||state" :label="$t('listproject.fmcooperationWay')" style="width: 100%;">
+                                    <el-form-item v-if="addData.cooperationWay&&addData.cooperationWay.length>=1||state" :label="$t('listproject.fmcooperationWay')" style="width: 100%;">
                                         <span>{{addData.cooperationWay}}</span>
                                     </el-form-item>
-                                    <el-form-item v-if="addData.customerLabelList||state" :label="$t('listproject.customerLabelList')" style="width: 100%;">
+                                    <el-form-item v-if="addData.customerLabelList&&addData.customerLabelList.length>=1||state" :label="$t('listproject.customerLabelList')" style="width: 100%;">
                                         <span style="margin-right: 5px" v-for="(item,index) in addData.customerLabelList" :key="index">{{item}}</span>
                                     </el-form-item>
-                                    <el-form-item v-if="addData.customerCase||state" :label="$t('listproject.customerCase')" style="width: 100%;">
+                                    <el-form-item v-if="addData.customerCase&&addData.customerCase.length>=1||state" :label="$t('listproject.customerCase')" style="width: 100%;">
                                         <span>{{addData.customerCase}}</span>
                                     </el-form-item>
                                 </el-form>

src/views/topicpage/commentdetail.vue

@@ -78,9 +78,9 @@
                                 <transition name="fade">
                                     <div class="gendisplay">
                                         <div style="position: relative;margin-right: 15px;">
-                                            <img v-if="commentdata.userInfo.empLogo" :src="commentdata.userInfo.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
+                                            <img v-if="empuser.empLogo" :src="empuser.empLogo"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
                                             <img v-else src="../../assets/img/defaultlogo.png"  style="border-radius: 50%; border:1px solid #DCDFF1; width: 36px;height: 36px;">
-                                            <img v-if="commentdata.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 57px;width: 10px;">
+                                            <img v-if="empuser.isProfessor==1" src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 0px;bottom: 0px;width: 10px;">
                                         </div>
                                         <div style="width: 100%;">
                                             <el-input
@@ -290,7 +290,7 @@
         <!--投诉-->
         <reporbar :expertVisible="expertVisible" :reportType="reportType" @dataEvent="expertVisible=false" :dictData="dictData"></reporbar>
         <!--        快速登录-->
-        <expertVisible ref="login" :registerType="102"></expertVisible>
+        <expertVisible @dataEvent="successlogin" ref="login" :registerType="102"></expertVisible>
     </div>
 </template>
 
@@ -588,8 +588,30 @@
                     });
                 }
             },
+            //个人信息
+            getselectByEmpId(){
+                let params = {
+                    empId:this.empId,
+                };
+                api.selectByEmpId(params).then(res => {
+                    if(res.code==0){
+                        this.empuser = res.result;
+                    }
+                }).catch((err)=>{
+                    this.$toast(err);
+                });
+            },
+            successlogin(state){
+                if(state){
+                    this.empId = this.publicFun.getCookie("userInfo")?JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))).empId:undefined;
+                    this.getselectByEmpId();
+                }
+            },
         },
         mounted(){
+            if(this.empId){
+                this.getselectByEmpId();
+            }
             if(this.$route.query.state){
                 api.selectTopicById(this.$route.query.id).then((res) => {
                     if (res.code == 0) {