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

src/components/home/indexNav.vue

@@ -12,8 +12,9 @@
               <template v-for="(item,index) in plugData.MenuList">
                 <li class="MenuListLi row justify-center cursor-pointer animate__animated"
                 :class="[CurrentIndex>=0&&CurrentIndex==index?'animate__bounceInUp active':'animate__bounceOutUp']"
+                >
+                  <div class="cursor-pointer flex flex-col items-center relative justify-end"
                   v-on:mouseenter="handleMouseEnter($event,index)">
-                  <div class="cursor-pointer flex flex-col items-center relative justify-end">
                     <div class="row min-w-50px">
                       <div class="font-serifEn writing-modes-vertical p text-gray-700">
                         <span class="inline-block tracking-6 fontW300 remTetil">
@@ -47,7 +48,7 @@
             </ul>
             <ul class="BottomListBox absolute row justify-center">
               <li class="q-py-sm q-px-lg relative cursor-pointer" v-for="(item,index) in plugData.BottomList"
-              @click="OpenNewUrl(item.LinkUrl)">
+              @click.stop="OpenNewUrl(item.LinkUrl)">
                 <a class="text-gray-700 transition-base md:hover:text-secondary">
                   <span class="text-xs font-serif tracking-1 pointer-events-none">{{item.LinkTitle}}</span>
                 </a>

src/components/home/indexSlider.vue

@@ -3,7 +3,7 @@
   @click="carousel(Current)">
     <div class="relative gap-1 overflow-hidden"
     :style="{'background-color':plugData.BgColor?plugData.BgColor:'#fff'}">
-      <div class="homeContainer indexSliderContainer" @click="carousel(Current)"
+      <div class="homeContainer indexSliderContainer" @click.stop="carousel(Current)"
         :class="[windowWidth<=768?'active':'']">
           <div
           :class="[windowWidth>=992?'row justify-between no-wrap':'column items-center',
@@ -105,7 +105,7 @@
           </div>
       </div>
     </div>
-    <mouse v-if="windowWidth>=768" :X="X" :Y="Y" :isRight="isRight" :Current="Current"></mouse>
+    <mouse v-if="windowWidth>=768&&isRight" :X="X" :Y="Y" :isRight="isRight" :Current="Current"></mouse>
   </div>
 
 </template>