Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/public/static/js/rem.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2021-06-15 18:50:17
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-10 15:45:52
+ * @LastEditTime: 2022-07-06 10:54:11
  * @Description: 告诉大家这是什么
  */
 ;(function (doc, win) {
@@ -19,6 +19,7 @@
     } */
     clientWidth > 1920 ? (clientWidth = 1920) : clientWidth
     docEl.style.fontSize = clientWidth / 19.2 + 'px'
+    docEl.style.overflowY = 'auto'
   }
   if (!doc.addEventListener) return
   recalc()

front/src/App.vue

@@ -28,7 +28,7 @@
   @import '~@/vab/styles/vab.less';
   #vue-admin-beautiful{
     max-width: 1920px;
-    max-height: 1080px;
+    // max-height: 1080px;
     margin: auto;
     height: 100%;
     position: relative;

front/src/views/home/components/header.vue

@@ -20,6 +20,7 @@
       {{ item.name }}
     </div>
     <a-badge :count="sgcNum">
+    <!-- 购物车 -->
       <svg
         t="1650455446850"
         class="icon"
@@ -40,6 +41,7 @@
       <!-- <a-avatar shape="square" size="large" /> -->
     </a-badge>
     <a-badge :count="mynoticeNum" style="margin-left: 0.2rem">
+    <!-- 消息提醒 -->
       <svg
         t="1654051054113"
         class="icon2"
@@ -259,12 +261,13 @@
       sgcNum.value = res.data.data.count
     })
     getMynotice()
+    // 解决
     const mynoticeDom = document.querySelector('.icon2')
     const mynotice = document.querySelector('.mynotice')
     if (mynoticeDom) {
       mynoticeDom.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        document.documentElement.style.overflowY = 'hidden'
+        // document.documentElement.style.overflowY = 'hidden'
       })
       mynoticeDom.addEventListener('mouseout', () => {
         mynoticeFlag.value = false
@@ -274,7 +277,7 @@
     if (mynotice) {
       mynotice.addEventListener('mouseover', () => {
         mynoticeFlag.value = true
-        document.documentElement.style.overflowY = 'hidden'
+        // document.documentElement.style.overflowY = 'hidden'
       })
       mynotice.addEventListener('mouseout', () => {
         mynoticeFlag.value = false