Merge remote-tracking branch 'origin/master'

src/components/authentication/personalAuth.vue

@@ -447,7 +447,6 @@
     }
     .sliderCmptWrapper{
         width: 320px;
-        height: 100%;
         position: absolute;
         left: 180px;
         top: 90px;

src/components/bigbusiness/searchCmpt.vue

@@ -137,19 +137,24 @@
                 this.$emit('active',this.searchData);
             },
 
+            getInitSearch(){
+                if(window.sessionStorage.getItem("isDetailIn")==false){
+                    this.searchData = {};
+                }else{
+                    if(this.$store.state.bigBusinessSearch.has(this.$route.path)) {
+                        this.searchData=this.$store.state.bigBusinessSearch.get(this.$route.path);
+                    }
+                }
+                this.$emit('active',this.searchData);
+            }
+
         },
         mounted() {
             this.bigBusinessselect();
             this.selectBigBusinessLevelOneSet();
+            this.getInitSearch();
 
         },
-        created(){
-            if(this.$store.state.bigBusinessSearch.has(this.$route.path)) {
-                this.searchData=this.$store.state.bigBusinessSearch.get(this.$route.path);
-            }
-            if(this.$router.name!="bigBusinessList") this.$store.dispatch('saveListPagePars',{path:this.$route.path,pars:{}});
-            this.$emit('active',this.searchData);
-        }
 
     }
 </script>

src/views/bigbusiness/pages/list.vue

@@ -139,6 +139,7 @@
         components:{
             searchCmpt
         },
+
         data(){
             return{
                 tableData:[],
@@ -324,7 +325,18 @@
                         });
                 }
             }
+        },
+        beforeRouteLeave(to,from,next){
+            if(to.name!="bigBusinessDetail"||to.name==undefined) {
+                window.sessionStorage.setItem("isDetailIn",false);
+                this.$store.dispatch('saveListPagePars',{path:this.$route.path,pars:{}});
+                next()
+            }else{
+                window.sessionStorage.setItem("isDetailIn",true);
+                next()
+            }
         }
+
     }
 </script>
 

src/views/index/pages/index1.vue

@@ -78,10 +78,10 @@
         <div class="broadcastWrapper" v-if="activeInfo.length!=0">
             <div>
                 <span><img src="../../../assets/img/index/announce.gif" alt=""></span>
-                <span :class="lang==1?'':'matchStateEn'">{{$t("indexCount.matchState")}}</span>
+                <span :class="lang==1?'':'matchStateEn'" style="min-width: 150px;">{{$t("indexCount.matchState")}}</span>
                 <swiper :options="activeInfoSwiperOption" class="swiper-activeinfo" ref="myActiveInfoSwiper" v-if="activeInfo.length!=0">
-                    <swiper-slide v-for="(item,index) in activeInfo" :key="index" style="width: 1200px;line-height: 50px; !important;text-align: left">
-                        <span :class="lang==1?'dwote':'dwote sliderStateEn'" style="width: 100%;">{{item.title}}</span>
+                    <swiper-slide v-for="(item,index) in activeInfo" :key="index" style="width: 900px;line-height: 50px; !important;text-align: left">
+                        <span :class="lang==1?'dwote':'dwote sliderStateEn'" style="width: 900px;">{{item.title}}</span>
                     </swiper-slide>
                 </swiper>
             </div>

src/views/loginregister/pages/emailRegisterCmpt.vue

@@ -412,7 +412,6 @@
     }
     .sliderCmptWrapper{
         width: 100%;
-        height: 100%;
         position: absolute;
         left: 0;
         top: 0;

src/views/loginregister/pages/findPasswordCmpt.vue

@@ -293,7 +293,6 @@
         }
         .sliderCmptWrapper{
             width: 100%;
-            height: 100%;
             position: absolute;
             left: 0;
             top: 0;

src/views/loginregister/pages/mobileRegisterCmpt.vue

@@ -398,7 +398,6 @@
     }
     .sliderCmptWrapper{
         width: 100%;
-        height: 100%;
         position: absolute;
         left: 0;
         top: 0;