Merge remote-tracking branch 'origin/master'

src/views/kolExpert/addkolExpert.vue

@@ -12,7 +12,7 @@
                     <div style="margin-top: 20px;">
                         <el-form label-position="right" :model="expertData" :rules="rules" ref="expertData" label-width="200px" class="contnetform180" >
                             <el-form-item label="绑定账号：" prop="empAccount">
-                                <el-input :disabled="expertData.canUpdateAccount?true:false" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
+                                <el-input :disabled="expertData.canUpdateAccount?false:true" style="width: 500px;" @blur="isempAccountblur" placeholder="请输入账号" v-model="expertData.empAccount"></el-input>
                             </el-form-item>
                             <el-form-item label="专家姓名：" prop="empName">
                                 <el-input style="width: 500px;" maxlength="36" placeholder="请输入专家姓名" v-model="expertData.empName"></el-input>

src/views/topicpage/pushtopic.vue

@@ -61,7 +61,7 @@
                             </el-form-item>
                             <div class="gendisplay" style="display: flex;flex-wrap: wrap;width: 80%;margin-left: 180px">
                                 <div v-for="(item,index) in formData.professorList" style="width: 150px;text-align: center;position: relative">
-                                    <p><img :src="item.empLogo" style="width: 90px;height: 90px;border-radius: 50%"></p>
+                                    <p><img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" style="width: 90px;height: 90px;border-radius: 50%"></p>
                                     <p style="margin: 10px 0">{{item.empName}}</p>
                                     <p>{{item.professorTitle}}</p>
                                     <i class="iconfont icon-cuowu" style="position: absolute;right: 0;top: 0;cursor: pointer;" @click="formData.professorList.splice(index,1)"></i>
@@ -193,7 +193,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'>