Merge remote-tracking branch 'origin/master'

public/css/pc.scss

@@ -927,6 +927,11 @@
   }
 
 }
+.eventTooltip{
+  &.el-tooltip__popper.is-light{
+    border: 1px solid #bec0cb;
+  }
+}
 .boxShadowTip .popper__arrow{
   display: none!important;
 }

src/views/findeventpage/newEventdetail.vue

@@ -87,8 +87,8 @@
                                             <btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
                                         </div>
                                     </div>
-                                    <el-tooltip v-if="item.empIntroduction" placement="top-start" effect="light">
-                                        <div slot="content" style="width: 200px;">{{item.empIntroduction}}</div>
+                                    <el-tooltip v-if="item.empIntroduction" popper-class="eventTooltip" placement="top-start" effect="light">
+                                        <div slot="content" style="width: 200px;line-height: 20px;">{{item.empIntroduction}}</div>
                                         <p class="ellipsisFont1" style="color:#1A1A1E;height: 20px;max-width: 90%;margin-top: 5px;">{{item.empIntroduction}}</p>
                                     </el-tooltip>
 
@@ -176,7 +176,7 @@
                                 <span class="eventbtn" v-if="eventdata.activityState==2&&!eventdata.isApply" @click="handleApply(eventdata)">{{eventdata.viewDesc?eventdata.viewDesc:$t('activityInfo.freeApply')}}</span>
                                 <span class="eventbtn" v-if="eventdata.channelType!=4&&eventdata.activityState==2&&eventdata.isApply">{{$t("activityInfo.hasApply")}}</span>
                                 <span class="eventbtn" v-if="eventdata.channelType==4&&eventdata.activityState==2&&eventdata.isApply" @click="handleToSuccess">{{$t("commonTitle.vipLookTitle")}}</span>
-                                <span class="eventbtn" v-if="eventdata.activityState>2">{{eventdata.activityState==4?$t("activityInfo.hasFilled"):eventdata.activityState==3?$t("activityInfo.applyEnd"):eventdata.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
+                                <span style="background: #909399;" class="eventbtn" v-if="eventdata.activityState>2">{{eventdata.activityState==4?$t("activityInfo.hasFilled"):eventdata.activityState==3?$t("activityInfo.applyEnd"):eventdata.activityState==5?$t("activityInfo.activityEnd"):""}}</span>
                                 <span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
                             </span>
                         </div>

src/views/topicpage/topicall.vue

@@ -386,7 +386,7 @@
             handAnnounceConfig(){
                 api.getTopicNoticeById().then(response => {
                     if(response.code == 0) {
-                        this.announceData = response.result;
+                        if(response.result)this.announceData = response.result;
                         if(!this.announceData.topicInfoList)this.announceData.topicInfoList = [];
                         this.announceVisible = true;
                         this.getsimpleSearchTopic();