Merge remote-tracking branch 'origin/master'

src/common/lang/en.js

@@ -1741,7 +1741,7 @@ module.exports = {
         projectData:"项目数据",
         projectRank:"项目排行",
         requireRank:"需求排行",
-        visitNum:"viewing count",
+        visitNum:"Viewing Count",
         collectionNum:"收藏数",
         collucationNum:"沟通数",
         allPercent:"综合比重",
@@ -1962,8 +1962,8 @@ module.exports = {
         activitytips:'You have not completed your personal certification, please publish the Event after certification',
         newfield:'New field',
         export:'Export',
-        companyname:'company name',
-        registrationtime:'registration time',
+        companyname:'Company Name',
+        registrationtime:'Registration Time',
         Activityreview:'Event review',
         registerinformation:'register information',
         eventtem:'Event template',
@@ -2074,7 +2074,7 @@ module.exports = {
         questions:'Enter at least 15 questions',
         addexistingquestion:'Add an existing question',
         addquestion:'Add question',
-        serialnumber:'Serial number',
+        serialnumber:'Number',
         topic:'Topic',
         operating:'Operating',
         add:'Add',
@@ -2121,7 +2121,7 @@ module.exports = {
         participate:'Please use the WeChat scan function to scan the QR code belowParticipate in cash red envelope activities',
         registration:'Others share registration',
         directscan:'Direct scan',
-        statistics:'statistics',
+        statistics:'Statistics',
     },
 
     //直播

src/views/conmanagementpage/hotarticlepage.vue

@@ -53,11 +53,11 @@
                 <p><span>&nbsp;</span>精彩内容  <i @click="gocontentall" style="position: absolute;right: 0px;top: 0px;font-size: 14px;font-weight: normal;cursor: pointer;">查看更多 > </i></p>
                 <div class="hto_content">
                     <div style="cursor: pointer;width: 100%;" v-for="(item,index) in hotlist" :key="index" @click="goindustry(item)">
-                        <p class="imgInfo" style="width: 80px;height: 52px;overflow: hidden;" :style="{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
+                        <p class="imgInfo" style="width: 80px;height: 54px;" :style="{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
 
                             <!--                            <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;overflow: hidden;">{{item.contentTitle}}</p>
                     </div>
                 </div>
             </div>

src/views/publishactivity/proactivity.vue

@@ -23,7 +23,7 @@
                                     <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 v-if="$route.query.type == '5'" :label="$t('pubactivities.summary')+'：'" prop="channelSummary" style="width: 100%;">
-                                    <el-input v-model="formData.channelSummary" type="textarea" :rows="4" maxlength="200" :placeholder="$t('pubactivities.plsummary')" style="width: 450px;height: 40px"></el-input>
+                                    <el-input v-model="formData.channelSummary" type="textarea" :rows="4" maxlength="200" :placeholder="$t('pubactivities.plsummary')" style="width: 450px;"></el-input>
                                 </el-form-item>
                                 <el-form-item :label="$t('pubactivities.eventcover')+'：'" prop="channelPic"  ref="formimg" style="width: 100%;">
                                     <p class="imgTitle">{{$t('pubactivities.eventcoveren')}}</p>
@@ -416,7 +416,7 @@
         <!--新增字段-->
         <el-dialog :title="editVisible?$t('pubactivities.editfield'):$t('pubactivities.newfield')" :visible.sync="addVisible" :append-to-body="true" :close-on-click-modal="false" @close="closeSensor" class="dialogWrap">
             <el-form :inline="true" label-width="210px" :model="contactsform" :rules="rules" ref="contactsform">
-                <el-form-item :label="$t('pubactivities.fieldName')+'：'" prop="fieldName">
+                <el-form-item :label="$t('pubactivities.fieldName')+'：'" prop="fieldName"  ref="formfieldName">
                     <el-input @input="$forceUpdate()" :disabled="contactsform.fieldType == 10" style="width:370px;" maxlength="36" v-model="contactsform.fieldName" :placeholder="$t('pubactivities.plfieldName')"></el-input>
                     <el-checkbox :disabled="contactsform.fieldType == 9 || contactsform.fieldType == 10" style="margin-left: 15px" v-model="isCheck">{{$t('pubactivities.required')}}</el-checkbox>
                 </el-form-item>
@@ -988,6 +988,7 @@
                     this.valuelist = [{},{}];
                 }else if(val == 10){
                     this.contactsform.fieldName = this.$t('releasejson.addbp');
+                    this.$refs.formfieldName.clearValidate();
                     this.isCheck = false;
                 }else if(val == 9){
                     this.isCheck = false;