From fdbaf562c355a71ad1f274f17e6a0e37d675ace8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 10 Sep 2024 14:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menuTree/index.vue |  4 ++++
 src/layouts/header/index.vue      | 22 +++++++++++++++++-----
 src/layouts/home/index.vue        |  4 ----
 src/layouts/navbar/index.vue      |  1 -
 src/pages/column/index.vue        |  5 +++++
 src/pages/home/index.vue          |  3 +--
 src/pages/singlePage/index.vue    | 13 +++++++++++--
 src/setting.js                    |  2 +-
 8 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/components/menuTree/index.vue b/src/components/menuTree/index.vue
index 00aaa78..2db0c6c 100644
--- a/src/components/menuTree/index.vue
+++ b/src/components/menuTree/index.vue
@@ -81,6 +81,10 @@ export default {
       line-height: 40px;
       font-size: 1rem;
       color: black !important;
+
+      .el-submenu__icon-arrow {
+        font-size: 16px;
+      }
     }
   }
 }
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index d689891..65df5eb 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -51,8 +51,11 @@
       </div>
 
       <img class="menu-icon" :src="menuIcon" alt="" @click.stop="updateType(!modelType)">
-      <div class="contentBox" v-show="modelType">
-        <navbar ref="nav" :isHome.sync="isHome" @updateModelType="updateType"></navbar>
+      <div v-show="modelType">
+        <div class="mobile-mask"></div>
+        <div class="mobile-nav">
+          <navbar ref="nav" :isHome.sync="isHome" @updateModelType="updateType"></navbar>
+        </div>
       </div>
     </div>
 
@@ -76,7 +79,6 @@ export default {
       isHome: true,
       isEstate: false,
       isIasf: false,
-      showSearch: false,
       height: 907,
       title: '',
       searchTimer: null,
@@ -130,7 +132,8 @@ export default {
     window.addEventListener('scroll', this.handleScroll) // 监听页面滚动
     document.body.addEventListener('click', e => {
       e.stopPropagation()
-      this.modelType = false
+      console.log("🚀 ~ mounted ~ e:", !e.target.className.includes('el-submenu__icon-arrow'))
+      if (!e.target.className.includes('el-submenu__icon-arrow')) this.modelType = false
     })
   },
   methods: {
@@ -348,7 +351,16 @@ $height: 90px;
   }
 }
 
-.contentBox {
+.mobile-mask {
+  position: absolute;
+  top: 90px;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, .4);
+}
+
+.mobile-nav {
   width: 100%;
   position: absolute;
   top: 90px;
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index 040e427..fc381ed 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -34,10 +34,6 @@ export default {
   },
   mounted () {
     this.$route.query.siteId && this.setSite(this.$route.query.siteId)
-    document.body.onclick = e => {
-      e.stopPropagation()
-      this.$refs.header.showSearch = false
-    }
 
     this.getSeo()
   },
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 7b5f283..fb800d2 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -152,7 +152,6 @@ export default {
       this.getPath(this.otherMenus, id)
       this.getPath(this.menus, id)
       this.columnTo(this.toItem)
-      this.$parent.showSearch = false
       this.$emit('updateModelType', false)
     }
   }
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 1e9fb21..c1a00ff 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -1427,6 +1427,11 @@ export default {
       margin-right: 0;
     }
 
+    .detail {
+      max-width: 100%;
+      margin-top: 20px;
+    }
+
     .articles {
       li {
         .leftBox {
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index d0f2634..0439d4a 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -170,7 +170,7 @@ export default {
           if (column.length) {
             this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
               this.articles = Util.removeTag(data.slice(0, articleNum || 6))
-              
+
               this.$nextTick(() => {
                 const { scrollTop } = this.$store.state.content
                 if (scrollTop) {
@@ -599,7 +599,6 @@ export default {
 
       img {
         height: 15rem;
-        object-fit: cover;
       }
     }
   }
diff --git a/src/pages/singlePage/index.vue b/src/pages/singlePage/index.vue
index 65382ad..749dcd4 100644
--- a/src/pages/singlePage/index.vue
+++ b/src/pages/singlePage/index.vue
@@ -13,7 +13,7 @@
               您的浏览器不支持 video 标签。
             </video>
             <div class="text-wrap">
-              <div class="qrcodes fadeInUp">
+              <div v-if="item.weixinPic1 || item.weixinPic2" class="qrcodes fadeInUp">
                 <div v-if="item.weixinPic1" class="qrcode">
                   <img width="103" :src="item.weixinPic1" alt="">
                   <p v-if="item.weixinText1" class="text">{{ item.weixinText1 }}</p>
@@ -175,7 +175,7 @@ export default {
   .pic {
     height: 100%;
     background-position: center center;
-    background-size: 100% auto;
+    background-size: cover;
     background-repeat: no-repeat;
   }
 
@@ -395,4 +395,13 @@ export default {
     }
   }
 }
+
+@media (max-width: 1200px) {
+  .carousel {
+    .text-wrap {
+      left: 0;
+      padding: 0 20px;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index f4b00ea..aba66b9 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -7,7 +7,7 @@ const isGta = url.includes('139.159.254.212'); // 国泰安
 let host = `${location.origin}/`
 if (isDev) {
   host = 'http://192.168.31.217:10000/'
-  host = 'https://huorantech.com'
+  // host = 'https://huorantech.com'
 }
 
 const Setting = {