Merge remote-tracking branch 'origin/master'

src/views/mobile/activityApply/detail.vue

@@ -69,7 +69,7 @@
             </div>
             <div class="divHeight15px" v-if="detailInfo.guestCount>0">
             </div>
-            <div class="contentInfo">
+            <div class="contentInfo" :style="{marginBottom:lang==2&&recentlyList?'.25rem':'1rem'}">
                 <p class="activityIntro"><span class="leftTab"></span><span>{{$t("Otherjson.activityview")}}</span></p>
                 <div v-if="detailInfo.guestCount>0">
                     <div v-html="detailInfo.channelIntroduction" v-if="!showAll"
@@ -617,9 +617,9 @@
                         this.detailInfo.channelEndTime = this.detailInfo.channelEndTime.split(":")[0] + ":" + this.detailInfo.channelEndTime.split(":")[1];
                         this.detailInfo.activityEndTime = this.detailInfo.activityEndTime.split(":")[0] + ":" + this.detailInfo.activityEndTime.split(":")[1];
                         this.getDocumentFunc();
-                        if (this.lang == 1 && this.detailInfo.channelType != 2&&this.detailInfo.versionType!=1) this.getRecommandInfo();
+                        if (this.lang == 1 && this.detailInfo.channelType != 2 && this.detailInfo.versionType != 1) this.getRecommandInfo();
                         this.getRecentlyParticipatedFunc();
-                        if (this.lang == 1&&this.detailInfo.versionType!=1) this.getSameContentFunc();
+                        if (this.lang == 1 && this.detailInfo.versionType != 1) this.getSameContentFunc();
                         if (this.userInfo) this.getNickName();
                         if (navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger") {
                             this.configFunc();
@@ -995,6 +995,9 @@
 
         watch: {
             $route(to, from) {
+                this.recommendedData = null;
+                this.recentlyList = null;
+                this.sameContentData = [];
                 this.getDetailInfo();
             }
         },