Merge remote-tracking branch 'origin/master'

src/views/dashboard/pages/statistics.vue

@@ -853,7 +853,7 @@
             handleToDetail(data) {
                 switch (this.checkboxGroup[0]) {
                     case 1:
-                        window.open(this.publicFun.getCurrentHrefEnv() + "/eventdetail?id=" + data.channelId + "&ismyevent=0&type=" + data.channelType)
+                        window.open(this.publicFun.getCurrentHrefEnv() + "/activitydetail?id=" + data.channelId + "&ismyevent=0&type=" + data.channelType)
                         break;
                     case 2:
                         window.open(this.publicFun.getCurrentHrefEnv() + "/topicDetails?id=" + data.topicId + "&newnpen=true");

src/views/mobile/activityApply/redEnvelopeDetail.vue

@@ -400,7 +400,7 @@
             this.getDocumentFunc();
             this.getDetailInfo();
             if(this.publicFun.judgeBrandIsWechatOrHtml()==1){
-                this.$router.replace({path:"/eventdetail",query:{id:this.$route.query.id}})
+                this.$router.replace({path:"/activitydetail",query:{id:this.$route.query.id}})
             }else if(this.publicFun.judgeBrandIsWechatOrHtml()==2){
                 this.$router.replace({path:"/redEnvelopeActHtml",query:{id:this.$route.query.id}})
             }

src/views/mobile/activityApply/redEnvelopeHtml.vue

@@ -42,7 +42,7 @@
         mounted() {
             this.getDocumentFunc();
             if (this.publicFun.judgeBrandIsWechatOrHtml() == 1) {
-                this.$router.replace({path: "/eventdetail", query: {id: this.$route.query.id}})
+                this.$router.replace({path: "/activitydetail", query: {id: this.$route.query.id}})
             } else if (this.publicFun.judgeBrandIsWechatOrHtml() == 3 || this.publicFun.judgeBrandIsWechatOrHtml() == 4) {
                 this.$router.replace({path: "/redEnvelopeActDetail", query: {id: this.$route.query.id}})
             }

src/views/mobile/activityApply/redEnvelopeWechat.vue

@@ -388,7 +388,7 @@
             this.publicFun.setCookieFunc(this.$route.query);
             this.getDetailInfo();
             if(this.publicFun.judgeBrandIsWechatOrHtml()==1){
-                this.$router.replace({path:"/eventdetail",query:{id:this.$route.query.id}})
+                this.$router.replace({path:"/activitydetail",query:{id:this.$route.query.id}})
             }else if(this.publicFun.judgeBrandIsWechatOrHtml()==2){
                 this.$router.replace({path:"/redEnvelopeActHtml",query:{id:this.$route.query.id}})
             }