Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/home/indexNav.vue

@@ -11,7 +11,8 @@
             <img class="carousel1-leftImg inline-block" :src="plugData.Logo"/>
           </div>
           <div class="col column" style="position: relative; z-index: 2;">
-            <div class="column col" @mouseenter.stop.prevent="ClearData" style="padding-top: 40px;flex-grow: 1;"
+            <div class="column col" @mouseenter.stop.prevent="ClearData"
+            style="padding-top: 40px;flex-grow: 1;"
             :style="{'z-index': CurrentIndex==null?-2:2}">
               <ul class="column MenuListBox row relative">
                 <div class="p-x40 row no-wrap justify-center">
@@ -80,7 +81,7 @@
           </div>
         </div>
         <div class="carousel1-right overflow-hidden relative"
-        :class="[windowWidth>1280?'col':'col-12']" @mouseenter.stop.prevent="ClearData">
+        :class="[windowWidth>=1280?'col':'col-12']" @mouseenter.stop.prevent="ClearData">
         <template v-if="windowWidth>=768">
             <q-img v-if="ImgObj.FileType!=2" class="carousel1-rightImg" @mouseenter.stop.prevent="ClearData"
             :class="[oldCoverImg!=coverImg?'active':'']"
@@ -178,6 +179,7 @@ export default {
         this.FileUrlList.push(x.FileUrl)
       }
     })
+    console.log(this.windowWidth,'---===')
   },
   methods: {
     handleMouseEnter($event,index){

src/components/home/indexRoll1.vue

@@ -146,7 +146,7 @@
           //设置能够同时显示的数量（可设置 auto）
           speed: 1000,
           autoplay: {
-            delay: 4000,
+            delay: 6000,
             stopOnLastSlide: false,
             disableOnInteraction: false
           },

src/components/home/indexRoll2.vue

@@ -28,7 +28,7 @@
             class="swiper" @slideChange="onSlideChange">
             <swiper-slide :key="index" :index="index" style="width: 12.91vw;"
             class="cursor-pointer swiperR2W" v-for="(item, index) in plugData.NavList">
-            <div class="relative">
+            <div class="relative swiperR2Hover">
               <template v-if="item.FileType==1">
                   <q-img :src="item.FileUrl" alt="image" :ratio="0.64" fill="cover"
                   @click.stop="OpenNewUrl(item.LinkUrl)">
@@ -408,12 +408,12 @@
   padding: 5px 20px 8px 20px;
   font-size: 1.1rem;
 }
-.swiperR2W>div:hover .swipercomTvR2Bj{
+.swiperR2Hover:hover .swipercomTvR2Bj{
   top: 0;
   bottom: 0;
   opacity: 1;
 }
-.swiperR2W>div:hover .swipercomTvR2{
+.swiperR2Hover:hover .swipercomTvR2{
   top: 0;
   bottom: 0;
   opacity: 1;

src/components/searchProductdata/kkday.vue

@@ -308,7 +308,7 @@
                 />
               </div>
               <div
-                class="text-subtitle2 text-grey-6 text-weight-regular ellipsis-2-lines"
+                class="text-subtitle2 text-grey text-weight-regular ellipsis-2-lines"
                 style="line-height: 1.6"
                 @click="GotoDetails(x)"
               >
@@ -326,7 +326,7 @@
                   <template v-if="x.startDateList.length > 1">
                     <q-badge
                       outline
-                      :color="x.index == index ? 'secondary' : 'blue-grey-11'"
+                      :color="x.index == index ? 'secondary' : 'blue-grey-4'"
                       :label="item"
                       v-for="(item, index) in x.startDateList"
                       :key="index"

src/components/searchdata/kkday.vue

@@ -308,7 +308,7 @@
                 />
               </div>
               <div
-                class="text-subtitle2 text-grey-6 text-weight-regular ellipsis-2-lines"
+                class="text-subtitle2 text-grey text-weight-regular ellipsis-2-lines"
                 style="line-height: 1.6"
               >
                 {{ x.productRecommend }}