From 5dc1049f01c2b5e373d498eddb4a41550c4a6771 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 19 Jul 2023 18:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84-=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/publicImage/collect-icon.png | Bin 0 -> 1773 bytes
 src/assets/img/publicImage/eye-icon.svg     |  11 +
 src/components/public/apartment-item.vue    |   2 +-
 src/components/public/public-list-item.vue  | 212 +++++++++++++++++++-
 src/main.js                                 |   2 +-
 src/views/edit.vue                          |  14 +-
 src/views/housingView/apartment.vue         |   4 +-
 src/views/user.vue                          | 129 +++++++++---
 vue.config.js                               |   1 +
 9 files changed, 331 insertions(+), 44 deletions(-)
 create mode 100644 src/assets/img/publicImage/collect-icon.png
 create mode 100644 src/assets/img/publicImage/eye-icon.svg

diff --git a/src/assets/img/publicImage/collect-icon.png b/src/assets/img/publicImage/collect-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..36b6b886ca09bd205ce66ece9d1fc8fbc74db918
GIT binary patch
literal 1773
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq8sKd6mGxU^Rn*LA+qju0R_G1}2#R
zpAc7|f>AIU0$4*p`uEE%K#9#IL4Lsu9B$H^-zYfGJ@`w}Vdg%Yi9e_Be$6vW-lA;M
zcHVj4jsI0D|L))No`0c~VXaEf#t#BZzKU7rHfa7`;lUzg9@Dh^wBXIYOjjnhz{Mxt
zYXA9hb$wUbwl5dL4!rmz^Xf_}U&NxEwJt@6n2UqNFK0wc#L3;}j7q$_HCy#DduYD;
zla;JKh0pZezcKndI_;fve1H1qW0Ng=6CPD~X{~y2ZpYc~4&RF=<-vI`>sM>kbY81I
zYClcs*WZE!pz|4%yxm<GI#^{rfE>;OkH}&m4PtvRxSh<l17?I(o-U3d9>>>C`57PN
zD01|8ktP%GloPsVf|RwqbQdd})!FWH)abNHbf)3bqoTgK7r$+)-JEm&+phl!>Gzmh
z?{W0o-HlIsw&(L)>-=e_Z~X6^VOhMGIZ0E`PO6?s@N75R41R~r4twLhZAxA>x^P}t
z@vmEDhxn^bo~*`{MIw)tl=gbgtv3`}Vk8{2WF_;Z&PPTPr&XdBz4~${(#88?n!a+>
zI<^yvr_Mf}E9#Nh`6j-TC2Zw(F3m7^wrc`6ubsME>hhEI;a%3&*Ao+(>qE9oJh4x+
zdh>~w1$ml!H?t=D-3XHkc>Ad{|Fq`qeaidp=!b<wtzK0g6d>a7AN-hWQugatcX@BL
z#EJ;*mOibOCiFh@mh`X6c;nmhGZrkpcXw58n9jF`ooA~ySm`;aY;fLVS(8%Lxw++V
zrAV~Haho35<NIFtyWDv<dHD|e=JMN(yZqcglwUb`KV=I0+Bq+HUVoq0X#Y1Sp@MJv
zfl|Ak`&U@&%g^*&U{hM19#)?(|7YXhgOmK3lM=-KKVbdQ-sXICVw8Y*>%T?bAEs;M
ziKu@tnp$Yt8g6>fFjmsFPipBsj{S)~Q+{dfiwQmzF(LLv`gO(<ji=Hs=0|56HWaB$
zxZIJ~$v9=*ZKj`m7h^w8I@bA)^NG`%kciad9~^G8R>|dk?%?>4v~0<N2mhMe4>$f(
zUUXdP0VhNIo!VbKo9*&HoKUuTq$N1P>xz1*kJbO%>py$izgDYKWD1Z}zYxJAwQ`%s
zi5+5I>R!uMnC(@mIw~`HanRctI<<e@oF?5jGM?qQ^geU?`Q0&jmtOy9oc?=P%8^dd
zec?=d@0{da=d(Wk)&CEHLLZv!H5<Ktx^G@)$KH8Nzv$}{P1S^{c0M!yPm+!Qyz`$g
zXHEN`$IBCpb@p#a*7e$3vLd>IQDA>*XVkazAK7(^9EvKNG-`p#SGB}7q9i4;B-JXp
zC>2OC7#SED>KYp88X1Hb8d{l}SQ!{=8(3Hw7^F>G52{fR8glbfGSez?YY;yzz743s
z3uHraS-MqHVsWZ&X;CIaT4qkFmA<}yMt*Lpequ^)W}bd#a(<p}T7F)Meo1Ztm=~X&
oWmcJynp2i(reB<qUz(hlm#zmi#$YCQ2hdaoPgg&ebxsLQ0AHaD_W%F@

literal 0
HcmV?d00001

diff --git a/src/assets/img/publicImage/eye-icon.svg b/src/assets/img/publicImage/eye-icon.svg
new file mode 100644
index 0000000..28aa559
--- /dev/null
+++ b/src/assets/img/publicImage/eye-icon.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <filter x="-50.00%" y="-50.00%" width="200.00%" height="200.00%" filterUnits="objectBoundingBox" id="filter564">
+      <feColorMatrix type="matrix" values="4 0 0 0 -1.5  0 4 0 0 -1.5  0 0 4 0 -1.5  0 0 0 1 0  " in="SourceGraphic" />
+    </filter>
+  </defs>
+  <g transform="matrix(1 0 0 1 -268 -2 )">
+    <image preserveAspectRatio="none" style="overflow:visible" width="16" height="16" xlink:href="data:image/png;base64,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" x="268px" y="2px" filter="url(#filter564)" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/components/public/apartment-item.vue b/src/components/public/apartment-item.vue
index ce5a237..8d747fa 100644
--- a/src/components/public/apartment-item.vue
+++ b/src/components/public/apartment-item.vue
@@ -3,7 +3,7 @@
         <img class="img" :src="item['image']">
         <div class="title">{{ item['title'] }}</div>
         <div class="hint">{{ item['propaganda'] }}</div>
-        <div class="tab-box flexflex">
+        <div class="tab-box flexflex" v-if="item['tags']">
             <div class="tab-item flexcenter" v-for="it in item['tags'].split(',')">{{ it }}</div>
         </div>
         <div class="location flexacenter">
diff --git a/src/components/public/public-list-item.vue b/src/components/public/public-list-item.vue
index e6b924a..c1a35ca 100644
--- a/src/components/public/public-list-item.vue
+++ b/src/components/public/public-list-item.vue
@@ -7,13 +7,15 @@
         </div>
         <div class="top-box">
             <div class="title-text">
-                {{ data && data.subject || '暂无标题' }}
+                <div class="title-hint" v-if="data.verifiedstatus == 1 && !stateData.text">认证审核中</div>
+                <div class="title-hint" v-if="stateData.text">{{ stateData.text }}</div>
+                {{ data.subject || '暂无标题' }}
             </div>
             <div class=" dis-f al-item-start jus-bet s-w-100" style="margin-top: 20px;">
                 <div>
                     <div class="dis-f al-item">
-                        <div class="tab-item first-tab flexacenter">{{ data && data.gptype }}</div>
-                        <div class="tab-item mg-l-8 flexacenter" v-if="data.type">{{ listData.type[data && data.type] }}
+                        <div class="tab-item first-tab flexacenter">{{ data.gptype }}</div>
+                        <div class="tab-item mg-l-8 flexacenter" v-if="data.type">{{ listData.type[data.type] }}
                         </div>
                         <div class="tab-item mg-l-8 flexacenter" v-if="data.elevator && data.elevator !== -1">{{
                             listData.elevator[data.elevator] }}</div>
@@ -32,7 +34,6 @@
                                 </div>
                             </template>
                         </template>
-
                         <div class="address-item flexacenter" v-else>
                             <img src="../../assets/homeImage/addMarker.png" class="img" alt="">
                             {{ location[item['location'] >>> 0] + ' > ' + location[item['location']] }}
@@ -46,6 +47,30 @@
                         <span class="time" v-show="data.rentalduration">[ 租期{{ data.rentalduration == 0 ? '不限' :
                             listData['rentalduration'][data.rentalduration] }} ]</span>
                     </div>
+                    <div class="data-info flexacenter" v-if="ispublish">
+                        <div class="info-item" v-if="data['id']">
+                            房源ID：{{ data['id'] }}
+                        </div>
+                        <template v-if="data['timestamp']">
+                            <div class="longstring" v-if="data['id']" style="margin: 0 8px;"></div>
+                            <div class="info-item">
+                                {{ formatDate(data['timestamp']) }}发布
+                            </div>
+                        </template>
+                        <template v-if="data['status'] != 0">
+                            <div class="longstring"></div>
+                            <div class="info-item flexacenter">
+                                <div class="itemm flexacenter">
+                                    <img class="item-icon" src="@/assets/img/publicImage/eye-icon.svg" alt="">
+                                    {{ data['count_view'] }}
+                                </div>
+                                <div class="itemm flexacenter" style="margin-left: 10px;">
+                                    <img class="item-icon" src="@/assets/img/publicImage/collect-icon.png" alt="">
+                                    {{ data['count_fav'] }}
+                                </div>
+                            </div>
+                        </template>
+                    </div>
                 </div>
                 <div class="img">
                     <div>
@@ -61,7 +86,20 @@
             <img src="../../assets/homeImage/intermediaryCorner.svg" v-if="routePath === '/intermediaryHousing'"
                 class="tab-img" alt="">
         </div>
-        <div class="btm-box dis-f al-item">
+        <div class="publish-footer flexacenter" v-if="ispublish">
+            <div class="publish-item flexcenter" v-if="stateData.btn >= 0 || stateData.btn == -2" @click="handleDelete">删除
+            </div>
+            <div class="publish-item flexcenter" v-if="stateData.btn >= 0" @click="goEdit">{{ stateData.btn
+                == 1 ? "编辑上架" : "编辑" }}</div>
+            <div class="publish-item flexcenter" v-if="stateData.btn == 2" @click="undercarriage">下架</div>
+            <div class="publish-item flexcenter go-up"
+                :class="{ 'go-up': data.isding == 0, 'already-go-up': data.isding == 1 }" v-if="stateData.btn == 2"
+                @click="goUp">{{
+                    data.isding == 0 ? '顶上去' : '今天已顶' }}
+            </div>
+            <!-- <div class="publish-item flexcenter already-go-up" v-if="stateData.btn == 2 && item.isding == 1"></div> -->
+        </div>
+        <div class="btm-box dis-f al-item" v-else>
             <div class="flex1 flexacenter">
                 <img :src="data.avatar" class="user-img" alt="">
                 <span class="user-name">{{ data.author }}</span>
@@ -78,22 +116,32 @@
 </template>
   
 <script setup>
-import { ref, defineProps, reactive, defineEmits, onMounted, getCurrentInstance } from "vue";
+import { ref, watch, defineProps, reactive, defineEmits, onMounted, getCurrentInstance } from "vue";
 import { useRoute, useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus'
+
 import store from '../../store/index';
+
+const { proxy } = getCurrentInstance()
+
+const router = useRouter()
+
 let props = defineProps({
     item: {
-        type: Object
+        type: Object,
     },
-    index: Number
+    index: Number,
+    ispublish: Boolean,
 })
 
-const emit = defineEmits(['cancelCollection'])
+let data = {}
+data = props.item
+
+const emit = defineEmits(['cancelCollection', 'goUp', 'undercarriage'])
 
 
 // console.log("item", props.item);
-let data = {}
-data = props.item
+
 
 //监听路由
 const route = useRoute()
@@ -138,10 +186,87 @@ const stateObj = { // btn: 0  删除 编辑 1 删除 编辑 上架  2 删除 编
     }
 }
 
+let stateData = ref(stateObj[data.status])
+// 监听修改的值
+watch(() => props.item.status, (newValue, oldValue) => {
+    stateData.value = stateObj[data.status]
+})
+
 const cancelCollection = token => {
     emit('cancelCollection', { token, index: props['index'] })
 }
 
+
+// 跳转编辑页面
+const goEdit = () => router.push(`/edit?token=${data.token}`)
+
+// 点击删除房源
+const handleDelete = () => {
+    ElMessageBox.confirm(
+        '确定删除吗？',
+        '提示',
+        {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            center: true,
+            autofocus: false,
+            customClass: "ElMessageBox",
+            width: 260,
+            customStyle: 'width: 260px'
+        },
+    ).then(() => {
+        proxy.$post('/tenement/pc/api/user/delete', {
+            token: data['token']
+        }).then(res => {
+            if (res.code != 200) return
+            ElMessage.success(res.message)
+            emit('handleDelete', props['index'], data['status'])
+        })
+    }).catch(() => { })
+}
+
+// 点击下架
+const undercarriage = () => {
+    proxy.$post('/tenement/pc/api/user/status', {
+        status: 2,
+        token: data['token'],
+        uniqid: data['uniqid'],
+    }).then(res => {
+        let data = res.data
+        emit('undercarriage', props['index'], data['status'])
+    })
+}
+
+// 点击顶上去
+const goUp = () => {
+    if (data.isding == 1) ElMessage('今天已顶过啦，明天再来吧！')
+    if (data.isding != 0) return
+    proxy.$post("/tenement/pc/api/user/ding", { token: data['token'] }).then(res => {
+        ElMessage.success(res.message)
+        emit('goUp', props['index'])
+    })
+}
+
+
+// 输出 时间格式 2023年07月04日
+const formatDate = timestamp => {
+    // 创建一个新的Date对象，将时间戳作为参数传入
+    var date = new Date(timestamp * 1000);
+    // 使用Date对象的get方法获取年、月、日
+    var year = date.getFullYear();
+
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+
+    // 将月份和日期转为两位数的格式，如果不足两位，前面补0
+    if (month < 10) month = '0' + month;
+    if (day < 10) day = '0' + day;
+
+    // 返回格式化后的日期字符串
+    return year + '年' + month + '月' + day + '日';
+
+}
+
 </script>
 <style scoped lang="less">
 img {
@@ -264,6 +389,17 @@ img {
             text-align: left;
             word-wrap: break-word;
             line-height: 28px;
+
+            .title-hint {
+                border: 1px solid rgba(249, 93, 93, 1);
+                display: inline;
+                height: 24px;
+                font-size: 14px;
+                color: #F95D5D;
+                border-radius: 5px;
+                padding: 0 8px;
+
+            }
         }
 
         .mg-l-8 {
@@ -397,5 +533,59 @@ img {
             }
         }
     }
+
+    .data-info {
+        color: #555555;
+        font-size: 14px;
+        margin-top: 24px;
+        font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+
+        .longstring {
+            width: 2px;
+            height: 13px;
+            background-color: #d7d7d7;
+            margin: 0 16px;
+        }
+
+        .info-item {
+            .itemm {
+                .item-icon {
+                    width: 16px;
+                    height: 16px;
+                    margin-right: 5px;
+                }
+            }
+        }
+    }
+
+    .publish-footer {
+        height: 85px;
+        border-top: 1px dotted #d7d7d7;
+        justify-content: flex-end;
+        padding: 0 20px;
+
+        .publish-item {
+            width: 100px;
+            height: 40px;
+            border: 1px solid rgba(170, 170, 170, 1);
+            font-size: 15px;
+            color: #555555;
+            border-radius: 45px;
+            cursor: pointer;
+            margin-left: 10px;
+
+            &.go-up {
+                border: none;
+                color: #fff;
+                background-color: rgba(98, 177, 255, 1);
+            }
+
+            &.already-go-up {
+                border: none;
+                color: #AAAAAA;
+                background-color: rgba(242, 242, 242, 1);
+            }
+        }
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 16836e1..0b49ad5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,6 @@ import {
   ElPopover,
   ElDatePicker,
   ElMessage,
-  ElSpace,
   ElSkeleton,
   ElSkeletonItem
   // 其他需要的组件
@@ -71,6 +70,7 @@ app.use(ElDatePicker, {
 })
 app.use(ElSkeleton)
 app.use(ElSkeletonItem)
+app.use(ElMessage)
 
 
 app.use(store).use(router).use(Axios).mount('#app')
diff --git a/src/views/edit.vue b/src/views/edit.vue
index 5841677..fcc7ac1 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -662,8 +662,6 @@
     <how :howBoxState="howBoxState" @close="howBoxState = false"></how>
 </template>
 <script>
-import zhCn from "element-plus/lib/locale/lang/zh-cn";
-
 import aboutPop from '@/components/edit/about-pop.vue'
 import mapComponent from '@/components/edit/map.vue'
 import pageFooter from '@/components/footer/footer.vue'
@@ -758,6 +756,12 @@ export default {
 
         }
     },
+
+    watch: {
+        '$store.state.user'(newValue) {
+            this.userIntermediary = newValue['intermediary']
+        }
+    },
     mounted() {
         // 访问URL中的查询参数
         const queryString = window.location.search;
@@ -767,6 +771,10 @@ export default {
         this.intermediary = urlParams.get('intermediary') || 3;  // 默认写房东吧
         // this.verified = urlParams.get('verified') || 0;
 
+        setTimeout(() => {
+            console.log(this.$store.state.user, "state");
+        }, 1000)
+
         this.init();
     },
     components: {
@@ -784,6 +792,8 @@ export default {
             return require(url)
         },
         init() {
+
+
             this.loading = this.$loading({
                 lock: true,
                 text: 'Loading',
diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue
index 779020f..92cd213 100644
--- a/src/views/housingView/apartment.vue
+++ b/src/views/housingView/apartment.vue
@@ -78,7 +78,7 @@ const getData = () => {
     }).then(res => {
         if (res.code != 200) return
         let data = res.data
-        list.value = list.value.concat(data.data)
+        list.value = list.value.concat(data.data || [])
         page = data.page * data.limit >= data.count ? 0 : page + 1
 
         listCount = data.count
@@ -108,10 +108,8 @@ let pitchValue = {}
 // 筛选组件的参数的中转
 const handleTransfer = (data) => {
     for (const key in data.value) {
-        console.log(data.value[key] != pitchValue[key]);
         if (data.value[key] != pitchValue[key]) {
             pitchValue = { ...data.value }
-
             page = 1
             list.value = []
             getData()
diff --git a/src/views/user.vue b/src/views/user.vue
index 998df69..be2b40d 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -1,7 +1,5 @@
 <template>
-    <!-- <header-nav></header-nav> -->
     <pageTopBar></pageTopBar>
-
     <div class="user-box">
         <div class="info-box flexacenter">
             <div class="info-left flexacenter flex1">
@@ -70,22 +68,23 @@
     <div class="quantity wid1200" v-else>共 <b>{{ count['publish'] }}</b> 条房源（上架 {{ stat['listing'] }} | 草稿 {{ stat['draft']
     }} | 下架 {{ stat['offshelf'] }}）</div>
 
-    <div class="list wid1200 flexflex" v-if="tabState == 'fav'">
-        <div class="item" v-for="(item, index) in favData['list']" :key="index">
+    <div class="list wid1200 flexflex" v-show="tabState == 'fav'" ref="gridContainer">
+        <div class="item" v-for="(item, index) in favData['list']" :key="item.id">
             <public-list-item :item="item" :index="index" @cancelCollection="cancelCollection"></public-list-item>
         </div>
     </div>
-    <div class="list wid1200 flexflex" v-if="tabState == 'publish'">
-        <div class="item" v-for="(item, index) in publishData['list']" :key="index">
-            <public-list-item :item="item" :index="index" @cancelCollection="cancelCollection"></public-list-item>
+    <div class="list wid1200 flexflex" v-show="tabState == 'publish'" ref="gridContainerpublish">
+        <div class="item" v-for="(item, index) in publishData['list']" :key="item.id">
+            <public-list-item :item="item" :index="index" @cancelCollection="cancelCollection" :ispublish="true"
+                @goUp="goUp" @undercarriage="undercarriage" @handleDelete="handleDelete"></public-list-item>
         </div>
     </div>
 
-    <div class="empty-box flexcenter wid1200">
+    <div class="empty-box flexcenter wid1200"
+        v-if="(tabState == 'fav' && favData['list'].length == 0) || (tabState == 'publish' && publishData['list'].length == 0)">
         <empty-duck></empty-duck>
     </div>
 
-
     <!-- 有疑问 -->
     <have-questions></have-questions>
 
@@ -105,13 +104,32 @@ import pageFooter from '@/components/footer/footer.vue'
 import biserialListItem from '@/components/biserialListItem/biserialListItem.vue'
 import publicListItem from '@/components/public/public-list-item.vue'
 import emptyDuck from '@/components/public/empty-duck.vue'
-import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { ref, reactive, onMounted, onUnmounted, getCurrentInstance, nextTick } from 'vue'
 const { proxy } = getCurrentInstance()
-import { ElLoading } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import Masonry from 'masonry-layout';
 
 
+
+const gridContainer = ref(null);
+const gridContainerpublish = ref(null);
+let masonryInstance = null
+let masonryInstancepublish = null
+
 onMounted(() => {
+    masonryInstance = new Masonry(gridContainer.value, {
+        itemSelector: '.item',
+        gutter: 20
+    });
+    masonryInstancepublish = new Masonry(gridContainerpublish.value, {
+        itemSelector: '.item',
+        gutter: 20
+    });
+
     init()
+
+    window.addEventListener('scroll', handleScroll);
+
 })
 
 let systematicState = ref(false) // 系统通知
@@ -119,27 +137,30 @@ let user = ref({})
 let count = ref({}) // 发布和收藏的数量
 let newmessagenum = ref(0)
 let validityidentity = ref('')
-let tabState = ref('fav') // fav  publish
+let tabState = ref('publish') // fav  publish
 
 const identityObj = {
     1: "中介认证",
     "-1": "房源认证"
 }
 
+
+
+
 async function init() {
     proxy.$post("/tenement/v2/api/user").then(res => {
         if (res.code != 200) return
         let data = res.data
 
-        // if (data.count['publish'] > 0) {
-        //     tabState.value = 'publish'
-        //     getPublishData()
-        // } else {
-        //     tabState.value = 'fav'
-        //     getFavData()
-        // }
+        if (data.count['publish'] > 0) {
+            tabState.value = 'publish'
+            getPublishData()
+        } else {
+            tabState.value = 'fav'
+            getFavData()
+        }
 
-        getFavData()
+        // getFavData()
 
         user.value = data.user
         count.value = data.count
@@ -148,8 +169,6 @@ async function init() {
     });
 }
 
-// let loading = null
-
 let loading = ElLoading.service({
     lock: true,
     text: 'Loading',
@@ -172,13 +191,18 @@ const getPublishData = () => {
         background: 'rgba(0, 0, 0, 0.7)',
     })
     proxy.$post("/tenement/pc/api/user/publishList", {
-        page: publishData['page']
+        page: publishData.value['page']
     }).then(res => {
         if (res.code != 200) return
         let data = res.data
         stat.value = data['stat']
         publishData.value['page'] = data['page'] * data['limit'] >= data['count'] ? 0 : data['page'] + 1
         publishData.value['list'] = publishData.value['list'].concat(data['data'] || [])
+        nextTick(() => {
+            masonryInstancepublish.reloadItems();
+            masonryInstancepublish.layout();
+            loading.close()
+        })
     }).finally(() => {
         loading.close()
     })
@@ -198,12 +222,18 @@ const getFavData = () => {
         background: 'rgba(0, 0, 0, 0.7)',
     })
     proxy.$post("/tenement/pc/api/user/favList", {
-        page: favData['page']
+        page: favData.value['page']
     }).then(res => {
         if (res.code != 200) return
         let data = res.data
         favData.value['page'] = data['page'] * data['limit'] >= data['count'] ? 0 : data['page'] + 1
         favData.value['list'] = favData.value['list'].concat(data['data'] || [])
+
+        nextTick(() => {
+            masonryInstance.reloadItems();
+            masonryInstance.layout();
+            loading.close()
+        })
     }).finally(() => {
         loading.close()
     })
@@ -216,16 +246,62 @@ const cutTab = (value) => {
     else if (tabState.value == 'fav' && favData.value['list'].length == 0) getFavData()
 }
 
+// 取消收藏
 let cancelCollection = data => {
     proxy.$post("/tenement/relation/operation", {
         token: data['token']
     }).then(res => {
-        console.log(res, "res");
         if (res.code != 200) return
         favData.value.list.splice(data['index'], 1)
+        count.value['fav']--
+
+        nextTick(() => {
+            masonryInstance.reloadItems();
+            masonryInstance.layout();
+            loading.close()
+        })
     })
 }
 
+// 点击下架都修改状态
+const undercarriage = (index, status) => {
+    stat.value['listing']--
+    stat.value['offshelf']++
+    publishData.value['list'][index].status = status
+}
+
+
+// 点击顶上去后改 数据 状态
+const goUp = index => publishData.value['list'][index].isding = 1
+
+// 点击删除
+const handleDelete = (index, status) => {
+    if (status == 0) stat.value['draft']--
+    else if (status == 1) stat.value['listing']--
+    else stat.value['offshelf']--
+    publishData.value['list'].splice(index, 1)
+    nextTick(() => {
+        masonryInstancepublish.reloadItems();
+        masonryInstancepublish.layout();
+        loading.close()
+    })
+}
+
+// 监听滚动到底部
+const handleScroll = () => {
+    const scrollHeight = document.documentElement.scrollHeight;
+    const clientHeight = document.documentElement.clientHeight;
+    const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+    if (scrollTop + clientHeight >= scrollHeight) {
+        if (tabState.value == 'publish') getPublishData()
+        else getFavData()
+    }
+};
+
+onUnmounted(() => {
+    window.removeEventListener('scroll', handleScroll);
+});
+
 </script>
 
 <style lang="less" scoped>
@@ -438,7 +514,7 @@ let cancelCollection = data => {
     justify-content: space-between;
 
     .item {
-        margin-bottom: 20px;
+        cursor: pointer;
     }
 }
 
@@ -448,5 +524,6 @@ let cancelCollection = data => {
     margin: 0 auto;
     justify-content: center;
     align-items: center;
+    border-radius: 16px;
 }
 </style>
diff --git a/vue.config.js b/vue.config.js
index da4dadb..59168cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,6 +40,7 @@ module.exports = defineConfig({
       .end()
   },
   devServer: {
+    hot: true,
     proxy: {
       '/Api': {
         target: 'https://app.gter.net',//请求的接口的前缀