From c568395d3059424f9b3a4155ffaa849a82a2e98c Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Fri, 4 Aug 2023 16:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  1 +
 src/components/edit/user-box.vue              | 68 +++++++++++--------
 src/components/public/public-list-item.vue    |  1 -
 .../user/systematic-notification-pop.vue      |  1 +
 src/views/apartmentDetail.vue                 |  1 +
 src/views/edit.vue                            |  3 +-
 src/views/user.vue                            |  8 ++-
 7 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7e80a86..0be8b58 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,6 +11,7 @@ import login from '@/components/public/login.vue'
   margin: 0;
   padding: 0;
   box-sizing: border-box;
+  font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
 }
 
 a {
diff --git a/src/components/edit/user-box.vue b/src/components/edit/user-box.vue
index 1f68a73..5a7af1a 100644
--- a/src/components/edit/user-box.vue
+++ b/src/components/edit/user-box.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="user-box shadow radius16 flexflex"> 
-        <img class="user-img" :src="user.avatar">
-        <div class="user-username">{{ user.nickname }}</div>
+    <div class="user-box shadow radius16 flexflex">
+        <img class="user-img" :src="user.avatar || store['state']['user']['avatar']">
+        <div class="user-username">{{ user.nickname || store['state']['user']['nickname']  }}</div>
         <div class="housing-info-box">
             <div class="housing-info-top flexacenter">
                 <div class="housing-info-location flexacenter">
@@ -22,39 +22,43 @@
                     <div class="housing-info-head flexcenter">状态</div>
                     <div class="longString"></div>
                     <div class="housing-info-trail">{{ stateObj[status < 0 ? -1 : status] }}</div>
+                    </div>
+                    <div class="housing-info-item flexacenter" v-if="status > 0">
+                        <div class="housing-info-head flexcenter">发布</div>
+                        <div class="longString"></div>
+                        <div class="housing-info-trail">{{ time['timestamp'] }}</div>
+                    </div>
+                    <div class="housing-info-item flexacenter" v-if="status > 0">
+                        <div class="housing-info-head flexcenter">更新</div>
+                        <div class="longString"></div>
+                        <div class="housing-info-trail">{{ time['updatetime'] }}</div>
+                    </div>
+                    <div class="housing-info-item flexacenter" v-if="status < 0">
+                        <div class="housing-info-head flexcenter">下架</div>
+                        <div class="longString"></div>
+                        <div class="housing-info-trail">{{ time['offshelftime'] }}</div>
+                    </div>
                 </div>
-                <div class="housing-info-item flexacenter" v-if="status > 0">
-                    <div class="housing-info-head flexcenter">发布</div>
-                    <div class="longString"></div>
-                    <div class="housing-info-trail">{{ time['timestamp'] }}</div>
+                <div class="listing-verified flexacenter" v-if="props['verified'] == 1">
+                    <img class="listing-verified-tick" src="@/assets/img/edit/tick.svg" />
+                    房源已认证
                 </div>
-                <div class="housing-info-item flexacenter" v-if="status > 0">
-                    <div class="housing-info-head flexcenter">更新</div>
-                    <div class="longString"></div>
-                    <div class="housing-info-trail">{{ time['updatetime'] }}</div>
-                </div>
-                <div class="housing-info-item flexacenter" v-if="status < 0">
-                    <div class="housing-info-head flexcenter">下架</div>
-                    <div class="longString"></div>
-                    <div class="housing-info-trail">{{ time['offshelftime'] }}</div>
-                </div>
-            </div>
-            <div class="listing-verified flexacenter" v-if="props['verified'] == 1">
-                <img class="listing-verified-tick" src="@/assets/img/edit/tick.svg" />
-                房源已认证
-            </div>
 
-            <div class="housing-info-amount flexcenter" v-if="status != 1">
-                <div class="housing-hint flexacenter">您还可以发布 <div class="bold">{{ allowpublishednum }}</div>
-                    条普通房源</div>
-                <div class="learn-more-btn flexcenter" @click="$emit('handleAboutPopState')">了解更多 <img
-                        class="learn-more-icon" src="@/assets/img/edit/learn-more-icon.svg" /></div>
+                <div class="housing-info-amount flexcenter" v-if="status != 1">
+                    <div class="housing-hint flexacenter">您还可以发布 <div class="bold">{{ allowpublishednum }}</div>
+                        条普通房源</div>
+                    <div class="learn-more-btn flexcenter" @click="$emit('handleAboutPopState')">了解更多 <img
+                            class="learn-more-icon" src="@/assets/img/edit/learn-more-icon.svg" /></div>
+                </div>
             </div>
         </div>
-    </div>
 </template>
 
 <script setup>
+import { useStore } from 'vuex';
+
+const store = useStore();
+
 const props = defineProps({
     user: Object,
     time: Object,
@@ -64,7 +68,7 @@ const props = defineProps({
     status: Number,
     intermediary: Number,
     userIntermediary: Number,
-    type:String
+    type: String
 });
 
 let stateObj = {
@@ -122,6 +126,7 @@ let intermediaryObj = {
                 font-size: 24px;
                 line-height: 30px;
                 font-weight: 650;
+                margin-top: 14px;
 
                 .housing-info-location-icon {
                     width: 24px;
@@ -132,7 +137,8 @@ let intermediaryObj = {
 
             .housing-info-certifying {
                 width: 85px;
-                height: 20px
+                height: 20px;
+                margin-top: 14px;
             }
 
             .housing-info-identity {
@@ -142,6 +148,8 @@ let intermediaryObj = {
                 border: 1px solid rgba(215, 215, 215, 1);
                 color: #555;
                 font-size: 14px;
+                margin-top: 14px;
+
             }
         }
 
diff --git a/src/components/public/public-list-item.vue b/src/components/public/public-list-item.vue
index ebcc40d..c9e5f96 100644
--- a/src/components/public/public-list-item.vue
+++ b/src/components/public/public-list-item.vue
@@ -191,7 +191,6 @@ const cancelCollection = token => emit('cancelCollection', { token, index: props
 
 // 点击跳转详情页
 const goDetail = status => {
-    console.log("location.origin",location.origin);
     if (status == 1) redirectToExternalWebsite(`/detail?id=${data.uniqid}`)
     else ElMessage("该房源信息已出租或已失效")
 }
diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index 3f94da6..d0786ca 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -204,6 +204,7 @@ const goDetail = (uniqid, status) => {
 .content {
     width: 700px;
     height: 750px;
+    max-height: 90vh;
     background-color: rgba(255, 255, 255, 1);
     border-radius: 16px;
     -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.349019607843137);
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 86cf557..123abdd 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -1188,6 +1188,7 @@ const publicJump = path => router.push(path)
                                     transform: translate(-50%, -50%);
                                     width: 53px;
                                     height: 53px;
+                                    cursor: pointer;
                                 }
                             }
 
diff --git a/src/views/edit.vue b/src/views/edit.vue
index 91cf43e..279983c 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -453,7 +453,7 @@
                                     <img class="media-img" :src="item.image" />
                                 </div>
                                 <div class="media-cover-bnt flexcenter" v-if="info.images.length != 1"
-                                    @click="info['aid'] = item['aid']">选为封面</div>
+                                    @click="info['aid'] = item['aid']">{{ item['aid'] == info['aid'] ? '已' : '' }}选为封面</div>
                             </div>
                             <div class="media-item flexcenter" style="position: relative;"
                                 v-if="info.images.length < imagesConfig.maxcount">
@@ -2092,6 +2092,7 @@ export default {
                             box-shadow: none;
                             height: 100%;
                             min-height: 200px !important;
+                            font-size: 16px;
                         }
                     }
                 }
diff --git a/src/views/user.vue b/src/views/user.vue
index 036e2d5..e14cabe 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -246,7 +246,6 @@ const getFavData = () => {
     })
     proxy.$post("/tenement/pc/api/user/favList", {
         page: favData.value['page'],
-        limit:5
     }).then(res => {
         if (res.code != 200) return
         let data = res.data
@@ -315,6 +314,11 @@ const undercarriage = (index, status) => {
     stat.value['listing']--
     stat.value['offshelf']++
     publishData.value['list'][index].status = status
+    nextTick(() => {
+        masonryInstance.reloadItems();
+        masonryInstance.layout();
+    })
+
 }
 
 
@@ -424,7 +428,7 @@ onUnmounted(() => {
 
             .operate-item {
                 flex-direction: column;
-                margin: 0 52px;
+                padding: 0 52px;
                 position: relative;
                 cursor: pointer;