Merge remote-tracking branch 'origin/master'

public/css/common.scss

@@ -1527,7 +1527,7 @@ i {
   border:1px solid #DCDFF1;
   width: 40px;
   height: 40px;
-  background-size: cover;
+  background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
 }

src/views/findeventpage/eventpage.vue

@@ -8,7 +8,7 @@
                 <div class="content_list">
                     <div v-for="(item,index) in contentList" :key="index">
                         <p class="content_img" @click="$router.push({path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">
-                            <span class="indeximgInfo" style="border-radius: 0;" :style="{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}"></span>
+                            <span class="indeximgInfo" style="border-radius: 0;background-size: cover;" :style="{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}"></span>
                         </p>
                         <p class="ellipsisFont2" style="height: 40px;" @click="$router.push({path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">{{item.channelTitle}}</p>
                         <p class="ellipsisFont1" @click="$router.push({path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>

src/views/findeventpage/signupbar.vue

@@ -1018,6 +1018,8 @@
                             this.secondStepInfoObj = query;
                         }
                         else {
+                            globalMsg.$emit('topisInit', false);
+                            globalMsg.$emit('sendIndex', 3);
                             this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType,ismyevent:0}})
                         }
                     }else{

src/views/index/pages/index.vue

@@ -846,8 +846,6 @@
                     globalMsg.$emit('maiDianFunc',({type:'report-article-index',articleId:row.contentId}));
                     window.open(this.publicFun.getCurrentHrefEnv()+"#/articleDetail?id="+row.contentId+'&newnpen=true');
                 }else if(state == 3){
-                    globalMsg.$emit('topisInit', false);
-                    globalMsg.$emit('sendIndex', 3);
                     this.$router.push({path:'/eventdetail',query:{id:row.channelId,ismyevent:0}})
                     globalMsg.$emit('maiDianFunc',({type:'report-channel-index-recommend',channelId:row.channelId}));
                 }