Merge branch 'main' of github.com:flipped-aurora/gin-vue-admin

web/src/view/layout/aside/historyComponent/history.vue

@@ -5,7 +5,7 @@
       :closable="!(historys.length === 1 && $route.name === defaultRouter)"
       type="card"
       @contextmenu.prevent="openContextMenu($event)"
-      @tab-change="changeTab"
+      @tab-click="changeTab"
       @tab-remove="removeTab"
     >
       <el-tab-pane
@@ -209,7 +209,9 @@ const setTab = (route) => {
 
 const historyMap = ref({})
 
-const changeTab = (name) => {
+const changeTab = (TabsPaneContext) => {
+  const name = TabsPaneContext?.props?.name
+  if (!name) return
   const tab = historyMap.value[name]
   router.push({
     name: tab.name,

web/src/view/layout/index.vue

@@ -27,7 +27,8 @@
                       </div>
                     </el-col>
                     <el-col :xs="10" :lg="14" :md="14" :sm="9" :xl="14" :pull="1">
-                      <el-breadcrumb class="breadcrumb">
+                      <!-- 修改为手机端不显示顶部标签 -->
+                      <el-breadcrumb v-show="!isMobile" class="breadcrumb">
                         <el-breadcrumb-item
                           v-for="item in matched.slice(1,matched.length)"
                           :key="item.path"
@@ -41,7 +42,7 @@
                           <div class="dp-flex justify-content-center align-items height-full width-full">
                             <span class="header-avatar" style="cursor: pointer">
                               <CustomPic />
-                              <span style="margin-left: 5px">{{ userStore.userInfo.nickName }}</span>
+                              <span v-show="!isMobile" style="margin-left: 5px">{{ userStore.userInfo.nickName }}</span>
                               <el-icon>
                                 <arrow-down />
                               </el-icon>

web/src/view/layout/search/search.vue

@@ -39,7 +39,7 @@
       v-if="btnShow"
       class="user-box"
     >
-      <div class="gvaIcon gvaIcon-customer-service" @click="toService" />
+      <div class="service gvaIcon-customer-service" @click="toService" />
     </div>
   </div>
 </template>
@@ -110,4 +110,20 @@ const toService = () => {
   75%{-webkit-transform:rotate(270deg);}
   100%{-webkit-transform:rotate(360deg);}
 }
+
+
+.service {
+  font-family: "gvaIcon" !important;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 800;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+//小屏幕不显示
+@media (max-width: 750px) {
+  .service {
+    display: none;
+  }
+}
 </style>