Merge remote-tracking branch 'origin/master'

src/views/conmanagementpage/articleservice.vue

@@ -364,13 +364,13 @@
             this.getsearchContents();
         },
         watch:{
-            searchdata(val){
-                this.searchs = val;
-                this.channelrow = val.channelIds;
-                this.classifyrow = val.classifyIds;
-                this.dictrow = val.codes;
-                this.getsearchContents();
-            }
+            // searchdata(val){
+            //     this.searchs = val;
+            //     this.channelrow = val.channelIds;
+            //     this.classifyrow = val.classifyIds;
+            //     this.dictrow = val.codes;
+            //     this.getsearchContents();
+            // }
         }
     }
 </script>

src/views/findeventpage/eventsuccess.vue

@@ -139,7 +139,8 @@
             },
         },
         mounted() {
-            globalMsg.$emit('sendIndex',-2);
+            globalMsg.$emit('topisInit', false);
+            globalMsg.$emit('sendIndex', 3);
             if(this.$route.query.type == 4){
                 this.getDetailInfo();
             }

src/views/index/pages/index.vue

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

src/views/industryreportspage/industrypage.vue

@@ -304,7 +304,7 @@
                 this.classifyclk(params);
             }
             globalMsg.$emit('topisInit', false);
-            globalMsg.$emit('sendIndex', $i18n.locale=='zh-CN'?6:4);
+            globalMsg.$emit('sendIndex', this.$i18n.locale=='zh-CN'?6:4);
             if(this.$i18n.locale=='zh-CN'){
                 //右侧热门
                 let params = {};