Merge remote-tracking branch 'origin/master'

src/views/findeventpage/myevent.vue

@@ -35,8 +35,8 @@
                                     </span>
 
                                 </p>
-                                <p style="color: #69697A;font-size: 12px;margin: 10px 0 5px;" class="ellipsisFont1" @click="$router.push({path:'/activitdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
-                                <p style="color: #69697A;font-size: 12px;" @click="$router.push({path:'/activitdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
+                                <p style="color: #69697A;font-size: 12px;margin: 10px 0 5px;" class="ellipsisFont1" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
+                                <p style="color: #69697A;font-size: 12px;" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
                                 <p style="font-size: 12px;margin-top: 5px;">
                                     <span style="color:#0ABB87;margin-right: 20px;">{{$t('activityInfo.hasApply')}}</span>
                                     <span style="margin-right: 20px;">&nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>