From fd06b66cc8b34ff7af4cc2c929e27f7b1f6795c0 Mon Sep 17 00:00:00 2001
From: luJianJun <2587063613@qq.com>
Date: Tue, 11 Jul 2023 18:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B6=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pageTopBar/pageTopBar.vue |  8 ++--
 src/components/public/head.vue           | 56 ++++++++++++++++++++++--
 src/utils/api.js                         |  0
 src/utils/axios.js                       |  2 +
 src/views/HomeView.vue                   |  6 +--
 5 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 src/utils/api.js

diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue
index 1800a07..13a1fbe 100644
--- a/src/components/pageTopBar/pageTopBar.vue
+++ b/src/components/pageTopBar/pageTopBar.vue
@@ -33,7 +33,9 @@
           <div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': i === 0 }" v-for="(item, i) in seachTab"
             :key="i">
             <el-badge :value="12">
-              {{ item.title }}
+              <div style="padding:0 10px;">
+                {{ item.title }}
+              </div>
             </el-badge>
 
           </div>
@@ -191,7 +193,7 @@ export default {
 
 .top-bg-img-box .info-box .btm-seach-btn-box {
   width: 100%;
-  height: 43px;
+  height: 50px;
   position: absolute;
   bottom: 0;
   left: 0;
@@ -201,7 +203,7 @@ export default {
 
 .top-bg-img-box .info-box .btm-seach-btn-box .tab-btn {
   width: 120px;
-  height: 43px;
+  height: 47px;
   font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
   font-weight: 400;
   font-style: normal;
diff --git a/src/components/public/head.vue b/src/components/public/head.vue
index 74ccd0c..6505840 100644
--- a/src/components/public/head.vue
+++ b/src/components/public/head.vue
@@ -4,7 +4,7 @@
             <div class="header-nav-item" :class="{ pitch: index == 3 }" v-for="(item, index) in navList" :key="index">
                 {{ item }}</div>
             <img class="header-nav-item header-user-img"
-                src="https://oss.gter.net/avatar/97KwEWIDY-QTHTXcpEbnWQxaRv6Xz0ll1wRhYWNh/middle?random=1687145465">
+                src="">
         </nav>
         <div class="logo-box flexacenter">
             <img class="logo-icon" src="@/assets/img/edit/logo.png" />
@@ -15,7 +15,15 @@
 
         <nav class="nav-box flexflex">
             <div class="nav-list wid1200 flexflex">
-                <div class="nav-item" v-for="item in tabList" :key="item">{{ item.name }}</div>
+                <div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': i === 0 }" v-for="(item, i) in tabList"
+                    :key="i">
+                    <el-badge :value="12">
+                        <div class="pd-rl-10">
+                           {{ item.name }} 
+                        </div>
+                    </el-badge>
+
+                </div>
             </div>
         </nav>
     </header>
@@ -140,15 +148,55 @@ const tabList = [{
         transform: translateX(-50%);
         margin: 0 auto;
         width: 100%;
-        height: 43px;
+        height: 50px;
         background: rgba(0, 0, 0, 0.596078431372549);
         border-bottom: 4px solid rgba(78, 144, 204, 1);
 
         .nav-list {
-            background: red;
+            color: #E2EDF7;
+            text-align: center;
             margin: 0 auto;
         }
 
     }
 }
+
+.tab-btn {
+    width: 120px;
+    height: 46px;
+    font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
+    font-weight: 400;
+    font-style: normal;
+    font-size: 18px;
+    color: #E2EDF7;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .pd-rl-10{
+       padding:0 10px;
+    }
+}
+
+.tab-btn-click {
+    background-color: rgba(98, 177, 255, 1);
+    border: none;
+    border-bottom: 0px;
+    border-radius: 8px;
+    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
+    font-weight: 650;
+    font-style: normal;
+    font-size: 18px;
+    color: #FFFFFF;
+}
+
+.carousel-img {
+    margin: 0 auto;
+    width: 660px;
+    height: 280px;
+}
 </style>
\ No newline at end of file
diff --git a/src/utils/api.js b/src/utils/api.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/utils/axios.js b/src/utils/axios.js
index a9294c0..ab73a34 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -86,6 +86,8 @@ const $post = (url, params) => {
 }
 //下面是vue3必须加的，vue2不需要，只需要暴露出去get，post方法就可以
 export default {
+    get:$get,
+    post:$post,
     install: (app) => {
         app.config.globalProperties['$get'] = $get;
         app.config.globalProperties['$post'] = $post;
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 764f0a7..a17d7c3 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home">
-    <!-- <pageTopBar></pageTopBar> -->
-    <header></header>
+    <pageTopBar></pageTopBar>
+    <!-- <headerNavigation></headerNavigation> -->
     <!-- 搜索模块 -->
     <seachModule></seachModule>
     <!-- 房源展示 -->
@@ -171,7 +171,7 @@ import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
 import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox.vue";
 import seachModule from "../components/seachModule/seachModule.vue";
 import indexRegularBox from '../components/indexRegularBox/indexRegularBox.vue';
-import header from '../components/public/head.vue'
+import headerNavigation from '../components/public/head.vue'
 
 // 
 let informationData = [