Merge remote-tracking branch 'origin/master'

src/views/conmanagementpage/contentarticle.vue

@@ -190,7 +190,7 @@
                             </el-table-column>
                             <el-table-column prop="empLogo" label="专家头像" align="center">
                                 <template slot-scope="scope">
-                                    <img :src="scope.row.empLogo" style="width: 40px;height: 40px;border-radius: 50%">
+                                    <img :src="scope.row.empLogo?scope.row.empLogo:require('../../assets/img/defaultlogo.png')" style="width: 40px;height: 40px;border-radius: 50%">
                                 </template>
                             </el-table-column>
                             <el-table-column :label="$t('listjson.action')" width="80" align='center'>

src/views/innovatecompany/acceptintention/intentionbar.vue

@@ -189,10 +189,10 @@
             this.stateData.projectId = this.projectId;
             if(this.publicFun.isgetUserRoleFunc(2)&&this.publicFun.isgetUserRoleFunc(5)){
                 this.isempinfo = true;
-                this.isempurl = '/business/purpose/getRequirementsBelongProject';
+                // this.isempurl = '/business/purpose/getRequirementsBelongProject';
             }else{
                 this.isempinfo = false;
-                this.isempurl = '/business/purpose/getPurposeRequirementList';
+                // this.isempurl = '/business/purpose/getPurposeRequirementList';
             }
             this.add();
         }

src/views/innovatecompany/lreleaseproject/viewproject.vue

@@ -103,7 +103,7 @@
                     <el-row>
                         <p v-if="authenticationState=='AS02'&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("listproject.statereview")}}</p>
                         <!--<p v-if="!isbtntype&&!addData.projectCreatedBy&&!isempinfo" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("Otherjson.Customer")}}</p>-->
-                        <p v-if="(authenticationState=='AS04'||authenticationState=='AS06')&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;padding: 0 20px; line-height: 30px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{authenticationState=='AS06'?$t("listproject.staterefuse06"):$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
+                        <p v-if="(authenticationState=='AS04'||(authenticationState=='AS06'&& publicFun.isgetUserRoleFunc(5)))&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;padding: 0 20px; line-height: 30px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{authenticationState=='AS06'?$t("listproject.staterefuse06"):$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
 <!--                        <p v-if="auditgo&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.statenotcertified")}}<span @click="$router.push('/editAuth')" style="text-decoration:underline;cursor:pointer">{{$t("listproject.gocertified")}}</span></p>-->
                     </el-row>
                     <div class="contentsy" id="anchor-0">
@@ -355,7 +355,7 @@
                 </el-row>
                 <el-row>
                     <p v-if="authenticationState=='AS02'&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFF8EF;border-radius:3px;border:1px solid #FF9E29;color: #FF9E29">{{$t("listproject.statereview")}}</p>
-                    <p v-if="(authenticationState=='AS04'||authenticationState=='AS06')&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;padding: 0 20px; line-height: 30px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
+                    <p v-if="(authenticationState=='AS04'||(authenticationState=='AS06')&&publicFun.isgetUserRoleFunc(5))&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;padding: 0 20px; line-height: 30px;text-align: left;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{authenticationState=='AS06'?$t("listproject.staterefuse06"):$t("listproject.staterefuse")}}<span>{{authContent}}</span></p>
                     <p v-if="auditgo&&addData.projectCreatedBy" style="margin: 20px 30px 0 30px;height: 40px;line-height: 40px;text-align: center;background:#FFEFEF;border-radius:3px;border:1px solid #FF5D5D;color: #FF5D5D">{{$t("listproject.statenotcertified")}}<span @click="$router.push('/editAuth')" style="text-decoration:underline;cursor:pointer">{{$t("listproject.gocertified")}}</span></p>
                 </el-row>
                 <div class="contentsy" id="anchor-00">
@@ -791,7 +791,7 @@
             projectByIdData(){
                 api.selectProjectById(this.$route.query.projectId).then(response => {
                     if(response.code == 0) {
-                        if(response.result.authenticationState=="AS03"||response.result.projectCreatedBy){
+                        if(response.result.authenticationState=="AS03"||response.result.authenticationState=="AS06"||response.result.projectCreatedBy){
                             window.addEventListener('scroll', this.menu);
                             this.addData = response.result;
                             if(response.result.projectOtherNumberDTO){

src/views/specialactivity/addspecial.vue

@@ -216,7 +216,7 @@
                         </el-table-column>
                         <el-table-column prop="empLogo" label="专家头像" align="center" width="80">
                             <template slot-scope="scope">
-                                <img :src="scope.row.empLogo" style="width: 40px;height: 40px;border-radius: 50%">
+                                <img :src="scope.row.empLogo?scope.row.empLogo:require('../../assets/img/defaultlogo.png')" style="width: 40px;height: 40px;border-radius: 50%">
                             </template>
                         </el-table-column>
                         <el-table-column :label="$t('listjson.action')" width="100" align='center'>

src/views/topicpage/topicdetail.vue

@@ -476,7 +476,7 @@
                                     <div class="gendisplay" style="padding: 20px 20px 0 20px;">
                                         <div style="position: relative;">
                                             <img @click="tohome(contentdata.baseModeratorList[0].empId)" v-if="contentdata.baseModeratorList[0].empLogo" :src="contentdata.baseModeratorList[0].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 @click="tohome(contentdata.baseModeratorList[0].empId)" v-else src="../../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;top: 47px;width: 15px;">
                                         </div>
                                         <div style="margin: 10px 0 0 15px;">
@@ -507,9 +507,9 @@
                             <div style="margin:0 30px 20px 0;">
                                 <div v-for="(item,index) in professorlist" :key="index">
                                     <div class="gendisplay" style="padding: 20px 20px 0 20px;">
-                                        <div style="position: relative;">
+                                        <div style="position: relative;cursor: pointer;">
                                             <img @click="tohome(item.empId)" 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 @click="tohome(item.empId)" 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;bottom: 0px;width: 15px;">
                                         </div>
                                         <div style="margin: 10px 0 0 15px;">