From 9cae13f193f3449bb4f0502023e56f944b2ec169 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Fri, 28 Jul 2023 11:59:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/systematic-notification-pop.vue | 2 +-
 src/utils/axios.js                                  | 2 +-
 src/views/detail.vue                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index f7a71e0..1ebcb4a 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -179,7 +179,7 @@ const handleScroll = (event) => {
 // 点击跳转详情页
 const goDetail = (uniqid, status) => {
     if (status != 1) return
-    router.push(`/detail?uniqid=${uniqid}`);
+    router.push(`/detail?id=${uniqid}`);
 }
 
 </script>
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 92b74e1..5594cd3 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -14,7 +14,7 @@ axios.interceptors.request.use( //响应拦截
         showFullScreenLoading()
         // 开发时登录用的，可以直接替换小程序的 authorization
         // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3"
-        // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
+        if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
         return config;
     },
     error => {
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 74333c3..388aade 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -124,7 +124,7 @@
                                 </div>
                                 <div class="type-text">
                                     {{ !housingInfo['data'] || housingInfo['data'] &&
-                                        housingInfo['data'].info.rentalduration
+                                        housingInfo['data'].info && housingInfo['data'].info.rentalduration
                                         === '0' ?
                                         '不限' : `${ indexData['data']&&indexData['data']['config']&&indexData['data']['config']['rentalduration'][housingInfo['data'] && housingInfo['data'].info.rentalduration]}` }}
                                 </div>

From c03ac58125c70bf0548168d2ea887674537dbda2 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Fri, 28 Jul 2023 12:21:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detail/imageWatch.vue |  6 +++++-
 src/views/apartmentDetail.vue        | 24 +++++++++++++++---------
 src/views/user.vue                   |  6 ++++--
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue
index 5699eaa..4579316 100644
--- a/src/components/detail/imageWatch.vue
+++ b/src/components/detail/imageWatch.vue
@@ -2,7 +2,8 @@
     <div class="watch-box" v-show="show">
         <div class="pos-r dis-f al-item mg-t-60">
             <div class="s-w-100">
-                <el-carousel arrow="never" height="600px" :autoplay="false" indicator-position="none" ref="carousel">
+                <el-carousel arrow="never" height="600px" :autoplay="false" :initial-index="props.index"
+                    indicator-position="none" ref="carousel">
                     <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" style="width:600px" v-if="item['type'] != 'attachment'">
@@ -52,6 +53,7 @@ const props = defineProps({
             return []
         }
     },
+    index: Number,
     close: {
         type: Function
     },
@@ -67,6 +69,8 @@ let close = props.close
 
 let carousel = ref(null)
 let imageTab = ref(0)
+
+ if(!props['index']) imageTab = props['index']
 //上一张
 let prev = () => {
     if (imageTab.value === list.value.length - 1) return
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 355d1d6..8d44de1 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -23,14 +23,15 @@
             </div>
             <div class="header-content flexflex">
                 <div class="header-left">
-                    <image-watch style="z-index: 1003;" arrow="never" :show="imageShow" :close="cloaseImageShow"
-                        :list="imageList"></image-watch>
+                    <image-watch style="z-index: 1003;" arrow="never" :index="5" :show="imageShow"
+                        :close="cloaseImageShow" :list="imageList"></image-watch>
                     <div class="slideshow">
                         <el-carousel :autoplay="false" arrow="never" indicator-position="none" ref="remarkCaruselUp"
                             @change="carouselChange">
                             <el-carousel-item class="flexcenter" v-for="(item, index) in allCarouselsData">
                                 <img v-if="index >= carouselIndex - 1 && index <= carouselIndex + 1" class="img"
-                                    :src="item['image'] || item['imageurl']" @click="cloaseImageShow(allCarouselsData)">
+                                    :src="item['image'] || item['imageurl']"
+                                    @click="cloaseImageShow(allCarouselsData, carouselIndex)">
                             </el-carousel-item>
                         </el-carousel>
                         <div class="indicate-type flexacenter" v-if="indicateTypeState()">
@@ -142,13 +143,13 @@
                                         src="@/assets/img/publicImage/gray-arrow.svg" alt="">
                                 </div>
                                 <div class="media-list flexacenter no-scrollbar" :class="`element${index}`">
-                                    <div class="media-item flexcenter" v-for="it in item['videos']"
-                                        @click="cloaseImageShow([...item['videos'], ...item['images']])">
+                                    <div class="media-item flexcenter" v-for="(it,i) in item['videos']"
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']], i)">
                                         <img class="media-img" v-lazy="it['thumbnail']">
                                         <img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
                                     </div>
-                                    <div class="media-item flexcenter" v-for="it in item['images']"
-                                        @click="cloaseImageShow([...item['videos'], ...item['images']])">
+                                    <div class="media-item flexcenter" v-for="(it,i) in item['images']"
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']], i)">
                                         <img class="media-img" v-lazy="it['thumbnail']">
                                     </div>
                                 </div>
@@ -426,8 +427,13 @@ const { wechat } = toRefs(store.state);
 
 let imageShow = ref(false)  // 查看大图弹窗的状态
 let imageList = ref([])  // 查看大图弹窗的状态
-const cloaseImageShow = (list) => {
-    if (list) imageList.value = list
+let imageIndex = ref(0)  // 查看大图弹窗的状态
+const cloaseImageShow = (list, index) => {
+    if (list) {
+        console.log("index", index);
+        imageList.value = list
+        imageIndex.value = index
+    }
     imageShow.value = !imageShow.value
 }
 
diff --git a/src/views/user.vue b/src/views/user.vue
index 9e4b668..ac6d9dc 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -22,7 +22,7 @@
                 </div>
             </div>
             <div class="info-right flexacenter">
-                <div class="operate-item message flexcenter" @click="systematicState = true">
+                <div class="operate-item message flexcenter" @click="systematicState = true; newmessagenum = 0">
                     <div class="operate-item-shell flexcenter">
                         <div class="newmessagenum flexcenter" v-if="newmessagenum > 0">{{ newmessagenum }}</div>
                         <img class="operate-icon" src="@/assets/img/publicImage/message-icon.svg">
@@ -109,7 +109,6 @@
     <!-- 系统通知弹窗 -->
     <systematic-notification-pop v-if="systematicState" @close="systematicState = false"></systematic-notification-pop>
     <back-to-top></back-to-top>
-
 </template>
 
 <script setup>
@@ -127,6 +126,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { ElLoading, ElMessage } from 'element-plus'
 import Masonry from 'masonry-layout';
+import store from '@/store/index';
 
 const { proxy } = getCurrentInstance()
 
@@ -181,6 +181,8 @@ const init = () => {
         user.value = data.user
         count.value = data.count
         newmessagenum.value = data.newmessagenum
+        store.state.user['messagenum'] = data.newmessagenum
+
         validityidentity.value = data.validityidentity
     }).finally(() => { })
 }