Merge remote-tracking branch 'origin/master'

src/views/conmanagementpage/hotarticlepage.vue

@@ -9,7 +9,7 @@
 
 <!--                            <img :src="item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:''" alt="图片">-->
                         </p>
-                        <p class="ellipsisFont2" style="width: 225px;height: 54px;">{{item.contentTitle}}</p>
+                        <p class="ellipsisFont2" style="width: 225px;height: 50px;">{{item.contentTitle}}</p>
                     </div>
                 </div>
             </div>

src/views/index/pages/index.vue

@@ -107,7 +107,7 @@
                                     </p>
                                     <p class="ellipsisFont2" style="color:#69697A;margin: 14px 0 10px;font-size: 12px;line-height: 20px;height: 40px;">{{item.topicDescription}}</p>
                                     <div class="gendisplay" style="color: #AAAAAA;font-size: 12px;">
-                                        <span class="ellipsisFont1" style="color:#5D78FF;margin-right: 50px;width: 210px;height: 15px;">发起方： <i>{{item.topicInitiator}}</i></span>
+                                        <span class="ellipsisFont1" style="color:#5D78FF;margin-right: 50px;width: 210px;height: 20px;">发起方： <i>{{item.topicInitiator}}</i></span>
                                         <span style="margin-right: 20px;">阅读 {{item.readCountStr}}</span>
                                         <span>讨论 {{item.discussUserCountStr}}</span>
                                     </div>

src/views/publishactivity/proactivity.vue

@@ -250,9 +250,9 @@
                                                 height="400"
                                                 :data="formData.questionList.filter(data => !questionsearch || data.questionTitle.toLowerCase().includes(questionsearch.toLowerCase()))"
                                                 style="width: 100%">
-                                            <el-table-column type="index" :label="$t('pubactivities.serialnumber')+'：'" align="center" width="80">
+                                            <el-table-column type="index" :label="$t('pubactivities.serialnumber')" align="center" width="80">
                                             </el-table-column>
-                                            <el-table-column prop="questionTitle" :label="$t('pubactivities.topic')+'：'" align="center" width="220">
+                                            <el-table-column prop="questionTitle" :label="$t('pubactivities.topic')" align="center" width="220">
                                                 <template slot-scope="scope">
                                                     <el-tooltip placement="top" effect="light">
                                                         <div slot="content" style="width: 300px;line-height: 20px;">{{scope.row.questionTitle}}</div>
@@ -260,7 +260,7 @@
                                                     </el-tooltip>
                                                 </template>
                                             </el-table-column>
-                                            <el-table-column prop="empLogo" :label="$t('pubactivities.options')+'：'" align="center">
+                                            <el-table-column prop="empLogo" :label="$t('pubactivities.options')" align="center">
                                                 <template slot-scope="scope">
                                                     <div class="gendisplay" style="text-align: left;" v-for="(item,index) in scope.row.answerList">
                                                         <span>{{publicFun.getTextfInRichtext(index)}}、</span>
@@ -366,9 +366,9 @@
                         <el-button slot="append" @click="searchexpert" icon="el-icon-search"></el-button>
                     </el-input>
                     <el-table :data="searchexpertlist"  class="tabledialog">
-                        <el-table-column type="index" :label="$t('pubactivities.serialnumber')+'：'" align="center" width="80">
+                        <el-table-column type="index" :label="$t('pubactivities.serialnumber')" align="center" width="80">
                         </el-table-column>
-                        <el-table-column prop="questionTitle" :label="$t('pubactivities.topic')+'：'" align="center" width="220">
+                        <el-table-column prop="questionTitle" :label="$t('pubactivities.topic')" align="center" width="220">
                             <template slot-scope="scope">
                                 <el-tooltip placement="top" effect="light">
                                     <div slot="content" style="width: 300px;line-height: 20px;">{{scope.row.questionTitle}}</div>
@@ -376,7 +376,7 @@
                                 </el-tooltip>
                             </template>
                         </el-table-column>
-                        <el-table-column :label="$t('pubactivities.options')+'：'" align="center">
+                        <el-table-column :label="$t('pubactivities.options')" align="center">
                             <template slot-scope="scope">
                                 <div class="gendisplay" style="text-align: left;" v-for="(item,index) in scope.row.answerList">
                                     <span>{{publicFun.getTextfInRichtext(index)}}、</span>

src/views/topicpage/topicbar.vue

@@ -8,6 +8,7 @@
                             <p style="color:#1A1A1E;font-size: 14px;margin-bottom: 15px;">
                                 <span>#{{item.topicTitle}}#</span>
                                 <i v-if="item.isOpenReward == 1" class="iconfont icon-hongbao-" style="color: #FF5D5D;font-size: 20px;"></i>
+                            </p>
                             <div class="gendisplay" style="font-size: 12px;">
                                 <p class="imgInfo" style="width: 80px;height: 55px;margin-right: 15px;border-radius: 0;" :style="{backgroundImage:'url('+(item.topicCover?item.topicCover:require('../../assets/img/topicbackground.jpg'))+')'}">
                                     &nbsp;