修改我的消息数据统一

This commit is contained in:
A1300399510
2023-07-28 12:21:44 +08:00
parent 9cae13f193
commit c03ac58125
3 changed files with 24 additions and 12 deletions

View File

@@ -2,7 +2,8 @@
<div class="watch-box" v-show="show"> <div class="watch-box" v-show="show">
<div class="pos-r dis-f al-item mg-t-60"> <div class="pos-r dis-f al-item mg-t-60">
<div class="s-w-100"> <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"> <el-carousel-item v-for="(item, i) in list" :key="i">
<div class="dis-f jus-x al-item" v-if="item"> <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'"> <div class="img-box dis-f jus-x" style="width:600px" v-if="item['type'] != 'attachment'">
@@ -52,6 +53,7 @@ const props = defineProps({
return [] return []
} }
}, },
index: Number,
close: { close: {
type: Function type: Function
}, },
@@ -67,6 +69,8 @@ let close = props.close
let carousel = ref(null) let carousel = ref(null)
let imageTab = ref(0) let imageTab = ref(0)
if(!props['index']) imageTab = props['index']
//上一张 //上一张
let prev = () => { let prev = () => {
if (imageTab.value === list.value.length - 1) return if (imageTab.value === list.value.length - 1) return

View File

@@ -23,14 +23,15 @@
</div> </div>
<div class="header-content flexflex"> <div class="header-content flexflex">
<div class="header-left"> <div class="header-left">
<image-watch style="z-index: 1003;" arrow="never" :show="imageShow" :close="cloaseImageShow" <image-watch style="z-index: 1003;" arrow="never" :index="5" :show="imageShow"
:list="imageList"></image-watch> :close="cloaseImageShow" :list="imageList"></image-watch>
<div class="slideshow"> <div class="slideshow">
<el-carousel :autoplay="false" arrow="never" indicator-position="none" ref="remarkCaruselUp" <el-carousel :autoplay="false" arrow="never" indicator-position="none" ref="remarkCaruselUp"
@change="carouselChange"> @change="carouselChange">
<el-carousel-item class="flexcenter" v-for="(item, index) in allCarouselsData"> <el-carousel-item class="flexcenter" v-for="(item, index) in allCarouselsData">
<img v-if="index >= carouselIndex - 1 && index <= carouselIndex + 1" class="img" <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-item>
</el-carousel> </el-carousel>
<div class="indicate-type flexacenter" v-if="indicateTypeState()"> <div class="indicate-type flexacenter" v-if="indicateTypeState()">
@@ -142,13 +143,13 @@
src="@/assets/img/publicImage/gray-arrow.svg" alt=""> src="@/assets/img/publicImage/gray-arrow.svg" alt="">
</div> </div>
<div class="media-list flexacenter no-scrollbar" :class="`element${index}`"> <div class="media-list flexacenter no-scrollbar" :class="`element${index}`">
<div class="media-item flexcenter" v-for="it in item['videos']" <div class="media-item flexcenter" v-for="(it,i) in item['videos']"
@click="cloaseImageShow([...item['videos'], ...item['images']])"> @click="cloaseImageShow([...item['videos'], ...item['images']], i)">
<img class="media-img" v-lazy="it['thumbnail']"> <img class="media-img" v-lazy="it['thumbnail']">
<img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" /> <img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
</div> </div>
<div class="media-item flexcenter" v-for="it in item['images']" <div class="media-item flexcenter" v-for="(it,i) in item['images']"
@click="cloaseImageShow([...item['videos'], ...item['images']])"> @click="cloaseImageShow([...item['videos'], ...item['images']], i)">
<img class="media-img" v-lazy="it['thumbnail']"> <img class="media-img" v-lazy="it['thumbnail']">
</div> </div>
</div> </div>
@@ -426,8 +427,13 @@ const { wechat } = toRefs(store.state);
let imageShow = ref(false) // 查看大图弹窗的状态 let imageShow = ref(false) // 查看大图弹窗的状态
let imageList = ref([]) // 查看大图弹窗的状态 let imageList = ref([]) // 查看大图弹窗的状态
const cloaseImageShow = (list) => { let imageIndex = ref(0) // 查看大图弹窗的状态
if (list) imageList.value = list const cloaseImageShow = (list, index) => {
if (list) {
console.log("index", index);
imageList.value = list
imageIndex.value = index
}
imageShow.value = !imageShow.value imageShow.value = !imageShow.value
} }

View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="info-right flexacenter"> <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="operate-item-shell flexcenter">
<div class="newmessagenum flexcenter" v-if="newmessagenum > 0">{{ newmessagenum }}</div> <div class="newmessagenum flexcenter" v-if="newmessagenum > 0">{{ newmessagenum }}</div>
<img class="operate-icon" src="@/assets/img/publicImage/message-icon.svg"> <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> <systematic-notification-pop v-if="systematicState" @close="systematicState = false"></systematic-notification-pop>
<back-to-top></back-to-top> <back-to-top></back-to-top>
</template> </template>
<script setup> <script setup>
@@ -127,6 +126,7 @@ import { useRoute, useRouter } from 'vue-router';
import { ElLoading, ElMessage } from 'element-plus' import { ElLoading, ElMessage } from 'element-plus'
import Masonry from 'masonry-layout'; import Masonry from 'masonry-layout';
import store from '@/store/index';
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
@@ -181,6 +181,8 @@ const init = () => {
user.value = data.user user.value = data.user
count.value = data.count count.value = data.count
newmessagenum.value = data.newmessagenum newmessagenum.value = data.newmessagenum
store.state.user['messagenum'] = data.newmessagenum
validityidentity.value = data.validityidentity validityidentity.value = data.validityidentity
}).finally(() => { }) }).finally(() => { })
} }