Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/components/detail/imageWatch.vue

src/components/apartment/seachModule.vue

@@ -58,7 +58,7 @@
                         </div>
 
                         <el-popover placement="bottom-end" popper-class="consult-popover flexcenter" :width="300"
-                            trigger="click" :show-arrow="false"
+                            trigger="hover" :show-arrow="false"
                             popper-style="background-color:transparent;border: none;box-shadow: none;padding:0;">
                             <template #reference>
                                 <div class="tool-btn consult-btn flexcenter">

src/components/detail/imageWatch.vue

@@ -9,7 +9,8 @@
                     <el-carousel-item v-for="(item, i) in list" :key="i">
                         <div class="dis-f jus-x al-item" v-if="item">
                             <div class="img-box dis-f jus-x" v-if="item['type'] != 'attachment'">
-                                <video :autoplay="false" controls :src="item.url || item['videourl']" style="width:800px;"></video>
+                                <video :autoplay="false" controls :src="item.url || item['videourl']" :preload="imageTab == i ? 'metadata' : 'none'"
+                                    style="width:800px;"></video>
                             </div>
                             <div class="img-box dis-f jus-x" v-else>
                                 <!-- <img v-lazy="item && item.url || item['imageurl'] || item['image']" class="img" alt=""> -->
@@ -174,8 +175,9 @@ img {
 .select-box {
     border: 1px solid #50e3c2 !important;
 }
-.carousel-w{
-    min-width:800px;
+
+.carousel-w {
+    min-width: 800px;
 }
 
 .watch-box {