From 44d03fc9c3b6e9f84dd3b60233f3c8442f4de660 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Mon, 31 Jul 2023 11:45:50 +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/assets/img/publicImage/defaultAvatar.png  | Bin 0 -> 1957 bytes
 src/components/apartment/seachModule.vue      |  19 ++++--
 src/components/pageTopBar/pageTopBar.vue      |  58 ++++++++++++++++--
 src/components/public/circle-btn.vue          |   7 +--
 src/components/public/login.vue               |   3 -
 src/components/public/phoneQRcode.vue         |   6 +-
 src/components/seachModule/seachModule.vue    |   3 +-
 .../user/systematic-notification-pop.vue      |  14 +++--
 src/utils/axios.js                            |   2 +-
 src/utils/util.js                             |   2 +-
 10 files changed, 85 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/img/publicImage/defaultAvatar.png

diff --git a/src/assets/img/publicImage/defaultAvatar.png b/src/assets/img/publicImage/defaultAvatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a30c1a5c344db7d9a1384aa86e1d21613831277
GIT binary patch
literal 1957
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

literal 0
HcmV?d00001

diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue
index ff50522..abe2ed6 100644
--- a/src/components/apartment/seachModule.vue
+++ b/src/components/apartment/seachModule.vue
@@ -372,10 +372,11 @@ const selectOption = (type, value) => {
     box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
     font-size: 14px;
     margin-top: 20px;
+    padding-top: 3px;
 
     .seach-box {
         background: #FFFFFF;
-        transform: translate(0, 3px);
+        // transform: translate(0, 3px);
         border-radius: 16px;
 
         .top-seach {
@@ -460,19 +461,25 @@ const selectOption = (type, value) => {
                 line-height: 48px;
                 cursor: pointer;
 
-                &:hover {
-                    opacity: 0.8;
-                }
+
 
                 &.add-btn {
                     background: rgba(253, 218, 85, 1);
                     margin-left: 20px;
+
+                    &:hover {
+                        background: rgba(253, 218, 85, 0.8);
+                    }
                 }
 
                 &.consult-btn {
                     background: rgba(144, 216, 72, 1);
                     margin-left: 20px;
 
+                    &:hover {
+                        opacity: 0.8;
+                    }
+
                     .consult-icon {
                         width: 22px;
                         height: 22px;
@@ -577,7 +584,7 @@ const selectOption = (type, value) => {
         width: 600px;
 
         &:not(:last-of-type) {
-            border-right: 1px #ebebeb dashed;
+            border-right: 1px #ebebeb dotted;
         }
 
         .option-item {
@@ -587,7 +594,7 @@ const selectOption = (type, value) => {
             margin: 0 30px 0 20px;
 
             &:not(:last-of-type) {
-                border-bottom: 1px #ebebeb dashed;
+                border-bottom: 1px #ebebeb dotted;
             }
 
             .option-title {
diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue
index 8d66776..7196744 100644
--- a/src/components/pageTopBar/pageTopBar.vue
+++ b/src/components/pageTopBar/pageTopBar.vue
@@ -7,10 +7,10 @@
         <div class="index-top-navigation dis-f al-item body-maxWidth">
           <div class="navigation-text" @click="topTabSelect(i, item)"
             :class="{ 'navigation-text-click': item.key === topTabNum }" v-for="(item, i) in topTab.data" :key="i">
-            {{
-              item.name }}</div>
-          <div class="user-box">
+            {{ item.name }}</div>
+          <div class="user-box" v-if="user.data['uid'] > 0">
             <img :src="user.data.avatar" class="user-img" alt="">
+            <!-- <img v-else src="@/assets/img/publicImage/defaultAvatar.png" class="user-img" alt=""> -->
             <div class="user-out-box">
               <div class="box-bg dis-f jus-x">
                 <div class="top-box"></div>
@@ -20,6 +20,11 @@
               </div>
             </div>
           </div>
+          <div class="login-box" v-else>
+            <div class="login-box-item" @click="loginBtn('login')">登录</div>
+            <div class="login-box-item" @click="loginBtn('register')">注册</div>
+          </div>
+
         </div>
       </div>
       <div class="dis-f jus-x al-item body-maxWidth" style="margin: auto;">
@@ -39,8 +44,7 @@
           </el-carousel>
         </div>
       </div>
-      <div class="btm-seach-btn-box dis-f al-item jus-x"
-        v-if="pageTopBarShow">
+      <div class="btm-seach-btn-box dis-f al-item jus-x" v-if="pageTopBarShow">
         <div class="body-maxWidth dis-f" style="height:48px;">
           <div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': item.path === tabBtnType }"
             v-for="(item, i) in seachTab.data" :key="i" @click="changeTabBtnType(item)">
@@ -62,6 +66,7 @@
 import store from '../../store/index';
 import { useRoute, useRouter } from 'vue-router'
 import { reactive, watchEffect, ref, defineProps } from "vue";
+import { goTologin } from '@/utils/util.js'
 
 const props = defineProps({
   bannerList: {
@@ -120,8 +125,13 @@ let topTabSelect = (type, item) => {
 const router = useRouter()
 let tabBtnType = ref('/')
 
-let pageTopBarShow= router.currentRoute.value.meta.topBarShow
+let pageTopBarShow = router.currentRoute.value.meta.topBarShow
 let changeTabBtnType = (item) => {
+  // 判断点击进入 user 时是否已经登录
+  if (item['path'] == '/user' && user.data['uid'] == 0) {
+    loginBtn('login')
+    return
+  }
   tabBtnType.value = item.path
   router.push({
     path: item.path
@@ -138,6 +148,16 @@ let routePath = ref('')
 routePath.value = route.meta.path
 tabBtnType.value = route.meta.path
 
+
+// 点击登录注册 type login 登录 register注册
+const loginBtn = type => {
+  if (type == 'login') {
+    store.state.showloginmodal = true
+    return
+  }
+  goTologin()
+}
+
 </script>
 <style scoped>
 .pos-r {
@@ -370,5 +390,31 @@ tabBtnType.value = route.meta.path
 .dropdown {
   background: #000;
 }
+
+.login-box {
+  font-size: 14px;
+  color: #333;
+  line-height: 40px;
+  text-align: right;
+  display: flex;
+  align-items: center;
+
+  .login-box-item {
+    background: #000;
+    color: #fff;
+    text-align: center;
+    border-radius: 57px;
+    width: 50px;
+    height: 26px;
+    line-height: 26px;
+    cursor: pointer;
+
+    &:last-child {
+      background: #fff;
+      color: #000;
+      margin-left: 18px;
+    }
+  }
+}
 </style>
   
\ No newline at end of file
diff --git a/src/components/public/circle-btn.vue b/src/components/public/circle-btn.vue
index 32a18c4..2a8243d 100644
--- a/src/components/public/circle-btn.vue
+++ b/src/components/public/circle-btn.vue
@@ -1,13 +1,13 @@
 <template>
-    <div class="circle-btn flexcenter" @click="circleState = true">
-        <div class="circle-inside flexcenter">
+    <div class="circle-btn flexcenter">
+        <div class="circle-inside flexcenter" @click="circleState = !circleState">
             <img class="circle-bj" src="@/assets/img/publicImage/half-circle-green.svg" />
             <img class="circle-icon" src="@/assets/img/publicImage/consult-hollow-out.png" />
             <div class="circle-text">咨询</div>
         </div>
         <div class="circle-pop flexacenter" v-if="circleState">
             <img class="close-icon" src="@/assets/img/publicImage/circle-close.png" alt=""
-                @click.stop="circleState = false">
+                @click.stop="circleState = !circleState">
             <img class="circle-bj" src="@/assets/img/publicImage/circle-pop-bj.svg">
             <img class="circle-bj-green" src="@/assets/img/publicImage/circle-pop-bj-green.svg">
             <div class="circle-title flexacenter">欢迎联系 <b>{{ wechat['nickname'] }}</b> 咨询房源</div>
@@ -40,7 +40,6 @@ let circleState = ref(false)
 .circle-btn {
     position: fixed;
     bottom: 98px;
-    // right: 58px;
     right: calc((100vw - 1200px) / 2 - 75px);
 
     width: 60px;
diff --git a/src/components/public/login.vue b/src/components/public/login.vue
index aea28a8..96d2ad1 100644
--- a/src/components/public/login.vue
+++ b/src/components/public/login.vue
@@ -8,10 +8,8 @@ import { ref, watch, onMounted, getCurrentInstance, nextTick, createApp } from '
 import store from '@/store/index';
 
 
-let showLoginModal = ref(false);
 
 watch(() => store.state.showloginmodal, (newValue) => {
-    // store.state.showloginmodal = false
     if (newValue) init1()
 });
 
@@ -68,7 +66,6 @@ const executeScripts = () => {
             const newScript = document.createElement('script');
             newScript.src = script.src;
             newScript.onload = () => {
-                console.log('外部脚本已加载');
                 // 可以在这里使用外部脚本提供的功能
             };
             document.body.appendChild(newScript);
diff --git a/src/components/public/phoneQRcode.vue b/src/components/public/phoneQRcode.vue
index 9366626..69caf3d 100644
--- a/src/components/public/phoneQRcode.vue
+++ b/src/components/public/phoneQRcode.vue
@@ -54,9 +54,9 @@ const props = defineProps({
             background-color: rgba(255, 255, 255, 1);
             border-radius: 50%;
             overflow: hidden;
-            -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-            -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-            box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
+            // -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
+            // -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
+            // box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
             margin-bottom: 33px;
 
             .QRcode-img {
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index c257f22..b91919b 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -307,10 +307,11 @@ defineExpose({
     box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
     font-size: 14px;
     margin-top: 20px;
+    padding-top: 5px;
 
     .seach-box {
         background: #FFFFFF;
-        transform: translate(0, 5px);
+        /* transform: translate(0, 5px); */
         border-radius: 16px;
 
         .top-seach {
diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index 1ebcb4a..0a70d5b 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="pop-mask flexcenter">
+    <div class="pop-mask flexcenter" v-if="show">
         <div class="content flexflex">
             <div class="header flexflex">
                 <img class="header-icon" src="@/assets/img/user/inform-icon.png" />
@@ -120,7 +120,6 @@
 
             </div>
         </div>
-
     </div>
 </template>
 
@@ -142,25 +141,32 @@ onMounted(() => {
     init()
 })
 
+
+let show = ref(false) //是否展示
+
 let qrcode = ref("") // 关注二维码
 let issubscribe = ref(0) // 是否已经关注公众号
 let list = ref([]) // 列表数据
 let state = false // 请求状态
 let page = 1 // 页数
 const init = () => {
-    // proxy.$post("/tenement/message/lists").then((res) => {
     if (page == 0 || state) return
     state = true
     proxy.$post("/tenement/pc/api/user/messageList", {
         page
     }).then((res) => {
-        if (res.code != 200) return
+        if (res.code != 200) {
+            emit('close')
+            return
+        }
         let data = res.data
         qrcode.value = data['qrcode']
         issubscribe.value = data['issubscribe']
         list.value = list.value.concat(data['data'])
         page = data['page'] * data['limit'] < data['count'] ? page + 1 : 0
+        show.value = true
     }).catch((err) => {
+        emit('close')
     }).finally(() => {
         state = false
     })
diff --git a/src/utils/axios.js b/src/utils/axios.js
index 5594cd3..b1ef41d 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -79,7 +79,7 @@ const $post = (url, params) => {
         }).catch(err => {
             console.log("err", err.data);
             if (err.data.code == 401) {
-
+                resolve(err.data);
             } else reject(err.data)
 
         })
diff --git a/src/utils/util.js b/src/utils/util.js
index 2cc148a..d4bac0d 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -6,7 +6,7 @@ function setSeoTitle(title) {
 function redirectToExternalWebsite(url) {
     const link = document.createElement('a');
     link.href = url;
-    // link.target = '_blank';
+    link.target = '_blank';
     link.click();
 }