From 1e74a491cef91f5e1294492679b160a5a27b2a02 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Fri, 28 Jul 2023 18:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detail/imageWatch.vue | 13 +++++++------
 src/main.js                          | 16 ++++++++--------
 src/views/apartmentDetail.vue        | 12 ++++++------
 src/views/edit.vue                   |  1 +
 src/views/seachIndex.vue             |  5 -----
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue
index 2c8265d..5d508b6 100644
--- a/src/components/detail/imageWatch.vue
+++ b/src/components/detail/imageWatch.vue
@@ -19,9 +19,7 @@
             <img src="../../assets/img/detail/imageArrowIcon.svg" class="image-arrow-icon left-arrow" @click="prev" alt="">
             <img src="../../assets/img/detail/imageArrowIcon.svg" class="image-arrow-icon right-arrow" @click="next" alt="">
         </div>
-        <div class="tab-text">
-            {{ `${imageTab + 1}/${list.length}` }}
-        </div>
+        <div class="tab-text">{{ `${imageTab + 1}/${list.length}` }}</div>
         <div class="dis-f jus-x al-item">
             <div class="list-img-box dis-f al-item jus-x">
                 <div v-for="(item, i) in list" :key="i" @click="watchSet(i)" class="pos-r" style="margin-bottom: 10px;">
@@ -42,7 +40,7 @@
 </template>
 
 <script setup>
-import { reactive, onMounted, ref, defineProps, watchEffect } from 'vue'
+import { reactive, onMounted, ref, defineProps, watchEffect, watch } from 'vue'
 // type 的类型代表  attachment 图片  videos  视频   lives 直播
 const props = defineProps({
     //url:展示图   thumbnail:缩略图
@@ -95,11 +93,14 @@ onMounted(() => {
     watchEffect(() => {
         show = props.show
         list.value = props.list
-        if (props.index >= 0) carousel.value.setActiveItem(props.index)
+        // carousel.value.setActiveItem(props.index)
     })
-
 })
 
+watch(() => props.index, (newValue, oldValue) => {
+    imageTab.value = newValue;
+});
+
 </script>
 <style scoped>
 img {
diff --git a/src/main.js b/src/main.js
index 65d43d6..920855f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -72,13 +72,13 @@ app.use(lazyPlugin)
 app.use(store).use(router).use(Axios)
 
 api.index().then(res => {
-    store.state.seachTypeData = res.data.combination
-    store.state.indexData = res.data
-    store.state.ListSelectBtn = res.data.recommendedTab
-    store.state.user = res.data.user
-    store.state.nav = res.data.nav
-    store.state.wechat = res.data.wechat
-    store.state.apartment = res.data.config.apartment
-}).finally(()=>{
+  store.state.seachTypeData = res.data.combination
+  store.state.indexData = res.data
+  store.state.ListSelectBtn = res.data.recommendedTab
+  store.state.user = res.data.user
+  store.state.nav = res.data.nav
+  store.state.wechat = res.data.wechat
+  store.state.apartment = res.data.config.apartment
+}).finally(() => {
   app.mount('#app')
 })
\ No newline at end of file
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 2cdf627..fccb153 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -1422,13 +1422,13 @@ const publicJump = path => router.push(path)
                 &::after {
                     content: "";
                     position: absolute;
-                    width: 10px;
-                    height: 10px;
-                    background-color: #fff;
-                    transform: rotate(45deg) translateX(-50%);
+                    width: 0;
+                    height: 0;
                     left: 50%;
-                    bottom: -14px;
-                    z-index: -1;
+                    bottom: -12px;
+                    border-left: 7px solid transparent;
+                    border-right: 7px solid transparent;
+                    border-top: 8px solid #fff;
                 }
 
                 .same-brand-icon {
diff --git a/src/views/edit.vue b/src/views/edit.vue
index 285e67b..fac6c8c 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -1991,6 +1991,7 @@ export default {
                             right: 0;
                             z-index: 100;
                             transform: translate(50%, -50%);
+                            cursor: pointer;
                         }
 
                         .media-img {
diff --git a/src/views/seachIndex.vue b/src/views/seachIndex.vue
index ba4e6c8..26f7fef 100644
--- a/src/views/seachIndex.vue
+++ b/src/views/seachIndex.vue
@@ -24,12 +24,7 @@
                 </div>
             </div>
         </div>
-<!-- <<<<<<< HEAD
-        <loadMoreText v-if="loading" loadText="加载中...."></loadMoreText>
-        <loadMoreText loadText="到底了"></loadMoreText>
-======= -->
         <loadMoreText :loadText="loadingText"></loadMoreText>
-<!-- >>>>>>> origin/main -->
         <listBtmPrompt></listBtmPrompt>
         <footerTool></footerTool>
     </div>