cz vor 1 Jahr
Ursprung
Commit
a742f7e965

+ 1 - 0
src/assets/icons/svg/shoucang.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#e6e6e6" d="M781.186088 616.031873q17.338645 80.573705 30.59761 145.848606 6.119522 27.537849 11.219124 55.075697t9.689243 49.976096 7.649402 38.247012 4.079681 19.888446q3.059761 20.398406-9.179283 27.027888t-27.537849 6.629482q-5.099602 0-14.788845-3.569721t-14.788845-5.609562l-266.199203-155.027888q-72.414343 42.836653-131.569721 76.494024-25.498008 14.278884-50.486056 28.557769t-45.386454 26.517928-35.187251 20.398406-19.888446 10.199203q-10.199203 5.099602-20.908367 3.569721t-19.378486-7.649402-12.749004-14.788845-2.039841-17.848606q1.01992-4.079681 5.099602-19.888446t9.179283-37.737052 11.729084-48.446215 13.768924-54.055777q15.298805-63.23506 34.677291-142.788845-60.175299-52.015936-108.111554-92.812749-20.398406-17.338645-40.286853-34.167331t-35.697211-30.59761-26.007968-22.438247-11.219124-9.689243q-12.239044-11.219124-20.908367-24.988048t-6.629482-28.047809 11.219124-22.438247 20.398406-10.199203l315.155378-28.557769 117.290837-273.338645q6.119522-16.318725 17.338645-28.047809t30.59761-11.729084q10.199203 0 17.848606 4.589641t12.749004 10.709163 8.669323 12.239044 5.609562 10.199203l114.231076 273.338645 315.155378 29.577689q20.398406 5.099602 28.557769 12.239044t8.159363 22.438247q0 14.278884-8.669323 24.988048t-21.928287 26.007968z" /></svg>

+ 1 - 0
src/assets/icons/svg/shoucang1.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="16px" height="16.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#f4ea2a" d="M781.186088 616.031873q17.338645 80.573705 30.59761 145.848606 6.119522 27.537849 11.219124 55.075697t9.689243 49.976096 7.649402 38.247012 4.079681 19.888446q3.059761 20.398406-9.179283 27.027888t-27.537849 6.629482q-5.099602 0-14.788845-3.569721t-14.788845-5.609562l-266.199203-155.027888q-72.414343 42.836653-131.569721 76.494024-25.498008 14.278884-50.486056 28.557769t-45.386454 26.517928-35.187251 20.398406-19.888446 10.199203q-10.199203 5.099602-20.908367 3.569721t-19.378486-7.649402-12.749004-14.788845-2.039841-17.848606q1.01992-4.079681 5.099602-19.888446t9.179283-37.737052 11.729084-48.446215 13.768924-54.055777q15.298805-63.23506 34.677291-142.788845-60.175299-52.015936-108.111554-92.812749-20.398406-17.338645-40.286853-34.167331t-35.697211-30.59761-26.007968-22.438247-11.219124-9.689243q-12.239044-11.219124-20.908367-24.988048t-6.629482-28.047809 11.219124-22.438247 20.398406-10.199203l315.155378-28.557769 117.290837-273.338645q6.119522-16.318725 17.338645-28.047809t30.59761-11.729084q10.199203 0 17.848606 4.589641t12.749004 10.709163 8.669323 12.239044 5.609562 10.199203l114.231076 273.338645 315.155378 29.577689q20.398406 5.099602 28.557769 12.239044t8.159363 22.438247q0 14.278884-8.669323 24.988048t-21.928287 26.007968z" /></svg>

+ 12 - 6
src/components/TitleInfo/index.vue

@@ -1,15 +1,21 @@
 <template>
   <div class="title-info">
     <div class="vertical-bar"></div>
-    <div class="content">{{ content }}</div>
+    <div class="content" :style="{fontSize:size+'px'}">{{ content }}</div>
   </div>
 </template>
 
 <script>
 export default {
   props: {
-    content: String,
-    default: "",
+    content: {
+      type: String,
+      default: "",
+    },
+    size: {
+      type: Number,
+      default: 14,
+    },
   },
 };
 </script>
@@ -19,8 +25,8 @@ export default {
   width: 100%;
   display: flex;
   align-items: center;
-  height: 24px;
-  line-height: 24px;
+  // height: 24px;
+  // line-height: 24px;
   .vertical-bar {
     width: 4px;
     height: 19px;
@@ -29,7 +35,7 @@ export default {
     // margin-top: 1px;
   }
   .content {
-    font-size: 14px;
+    // font-size: 14px;
     font-weight: 600;
     color: #333333;
   }

+ 151 - 112
src/components/headerBar/header-bar.vue

@@ -2,13 +2,13 @@
   <div id="main" class="header-bar" @click="isChildMenu = false">
     <header>
       <ul class="nav">
-        <!-- <div class="logo">尔泓时代</div> -->
+        <!-- <div class="logo">SANFAN MES制造执行系统</div> -->
         <div class="logo" style="display: flex; align-items: center; justify-content: center">
-          <img v-if="!logoUrl" :src="'/img/logo2.png'" />
+          <img v-if="!logoUrl" :src="'/img/logo2.png'" style="width:120px;height:30px;vertical-align:middle;object-fit:contain" />
           <el-image v-else style="width: 120px; height: 30px" :src="logoUrl" fit="scale-down" />
         </div>
         <li class="header-bar-hover-warp nav-li" :class="isChildMenu ? 'active' : ''">
-          <div @click.stop="isChildMenu = !isChildMenu" class="menu-modal">
+          <div @click.stop="openMenuBox" class="menu-modal">
             <i class="iconfont icon-icomx_gongndh" style="margin: 0 5px 0 0"></i>
             {{ $t("header.functionGuide") }}
             <i class="iconfont icon-iconm_xialan1" style="margin: 0 0 0 3px"></i>
@@ -32,17 +32,13 @@
         <div class="header-bar-warp" v-if="isChildMenu" @click.stop="isChildMenu = false">
           <div class="header-bar-hover" @click.stop>
             <div class="header-bar-hover-content">
+              <!-- 左边 -->
               <div class="left-banner">
-                <!-- :style="leftBanerType == 2 ? 'color:#0084ff' : ''" -->
-                <div class="first-order" @click="leftBanerType = 2">
-                  <i class="iconfont icon-iconm_changycd" style="position: relative; top: -1px"></i>
-                  {{ $t("header.commonFunctions") }}
-                </div>
                 <div class="first-order">
                   <i class="iconfont icon-iconm_gongncd" style="position: relative; top: -1px"></i>
                   {{ $t("header.functionMenu") }}
                 </div>
-                <ul>
+                <ul style="height:calc(100% - 50px)">
                   <li :class="menuName == i.menuName ? 'active' : ''" @click="openLeftBaner(i, index)" v-for="(i, index) in sidebarRoutersCopy"
                       :key="i.name" v-show="i.type == 1 && i.status == '0'">
                     <!-- <i
@@ -52,116 +48,84 @@
                     {{ i.menuName }}
                   </li>
                 </ul>
-                <!-- <div class="first-order">
-									<el-icon size="16" color="#0084FF">
-										<edit /> 
-									</el-icon>
-									推荐服务
-								</div> -->
-              </div>
-              <div class="menu-warp" v-show="leftBanerType == 1">
-                <div class="first-order-title">{{ menuName }}</div>
-                <!-- <ul class="second-level" v-for="i in activeLeftData.children" :key="i.menuId">
-									<li class="menu-title">
-											
-											{{ i.menuName }}
-										</li>
-									<div v-for="(j, index) in i.children" :key="index">
-										<li v-if="i.isNone" class="menu-ul" style="cursor: auto"></li>
-										
-										<li class="menu-ul" @click="routerPush(i,j)" style="cursor: pointer">
-											{{ j.menuName }}
-										</li>
-									</div>
-								</ul> -->
-                <ul class="second-level">
-                  <div v-for="(i, index) in activeLeftData" :key="index">
-                    <li v-if="i.isNone" class="menu-ul" style="cursor: auto"></li>
-                    <li class="menu-title" v-else-if="i.isTitle">
-                      <a v-if="i.icon && i.icon !== '#'" :class="'iconfont icon-' + i.icon"
-                         style="margin-right: 4px"></a><span>{{ i.menuName }}</span>
-                    </li>
-                    <li v-else class="menu-ul" @click="commonsBannerToRouter(i)" style="cursor: pointer; display: flex">
-                      <a :class="'iconfont icon-' + i.icon" style="
-                          margin-right: 4px;
-                          width: 20px;
-                          min-height: 20px;
-                          display: block;
-                        "></a>
-                      <span>{{ i.menuName }}</span>
-                    </li>
-                  </div>
-                </ul>
+
               </div>
-              <div class="menu-warp" v-show="leftBanerType == 2">
+              <!-- 中间 -->
+              <div class="menu-warp">
                 <div class="first-order-title">
-                  {{ $t("header.commonFunctions") }}
+                  <TitleInfo :content="menuName" :size="16"></TitleInfo>
                 </div>
-                <div class="commons-warp">
-                  <div>
-                    <div class="header-button-box cp" v-for="(i, index) in commonsRouterList" :key="i.name" @click="commonsBannerToRouter(i)">
-                      <span>{{ i.menuName }}</span>
-                      <div class="right-icon" @click.stop="deleteCommonsRouter(i, index)">
-                        <!-- <el-icon color="#46A6FF"><CirclePlus /></el-icon> -->
-                        <el-icon color="#BBBBBB" v-show="isEidtType">
-                          <Close />
-                        </el-icon>
+                <!-- style="height:450px;overflow: auto;" -->
+                <div>
+                  <div class="aaa">
+                    <ul class="second-level bbb" v-for="i in activeLeftData.children" :key="i.menuId">
+                      <li class="menu-title">
+                        {{ i.menuName }}
+                      </li>
+                      <div v-for="(j, index) in i.children" :key="index">
+                        <li v-if="i.isNone" class="menu-ul" style="cursor: auto"></li>
+                        <li class="menu-ul">
+                          <i style="cursor: pointer;position:relative;top:0px" @click.stop="editMenu(j)">
+                            <svg-icon :icon-class="isHaveCollect(j) ? 'shoucang1' :'shoucang'" />
+                          </i>
+                          <span style="margin-left:6px;cursor: pointer" @click="commonsBannerToRouter(j)">{{ j.menuName }}</span>
+                        </li>
                       </div>
-                    </div>
-                    <div class="header-add-button-box" v-if="!isEidtType" @click="isEidtType = true">
-                      <el-icon color="#46A6FF">
-                        <CirclePlus />
-                      </el-icon>
-                      {{ $t("header.edit") }}
-                    </div>
+                    </ul>
                   </div>
                 </div>
-                <div class="first-order-title" v-if="isEidtType">
-                  {{ $t("header.toAdd") }}
+              </div>
+
+              <div class="right-banner">
+                <div class="first-order-title">
+                  <TitleInfo :content="'常用功能'" :size="16"></TitleInfo>
                 </div>
-                <div class="all-menu-warp" v-if="isEidtType">
-                  <div v-for="(i, index) in sidebarRoutersCopy" :key="i.name" v-show="i.type === 1">
-                    <div class="all-menu-title" v-for="(j, jindex) in i.children" :key="j.name">
-                      <div class="title">
-                        {{ j.menuName }}
-                      </div>
-                      <div class="all-menu-lists">
-                        <div class="header-button-box" v-for="(n, nindex) in j.children" v-show="n.visible == '0'" :key="n.name">
-                          <span>{{ n.menuName }}</span>
-
-                          <div class="right-icon" @click="addCommonsRouter(index, jindex, nindex, n)">
-                            <el-icon color="#46A6FF">
-                              <CirclePlus />
-                            </el-icon>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
+
+                <div class="collect" id="collect">
+                  <div v-for="(menu, index) in commonsRouterList" :key="menu.menuId" class="item">
+                    <span>{{menu.menuName}}</span>
+                    <span style="cursor:pointer;position:relative;top:2px;" @click="editMenu(menu)">
+                      <el-icon color="#46A6FF" :size="16">
+                        <CircleClose />
+                      </el-icon>
+                    </span>
                   </div>
                 </div>
-                <div class="btn-warp" v-if="isEidtType">
-                  <el-button type="" @click="isEidtType = false">取消</el-button>
-                  <el-button type="primary" @click="userMenuEdit">保存</el-button>
-                </div>
               </div>
             </div>
           </div>
         </div>
       </ul>
       <div class="fr">
+        <div style="float:right;height: 50px;line-height: 50px;padding-right:20px;color:#fff;font-size:14px;cursor: pointer;" @click="plugDowload">
+          插件下载
+        </div>
         <div style="float:right;height: 50px;padding-right:20px">
-          <el-badge :value="jobData.sumCount" :max="99" style="cursor: pointer;margin-top:15px;" @click="handleOpenDrawer">
+          <el-badge :value="jobData.sumCount" :max="99" style="cursor: pointer;margin-top:15px;" v-if="jobData.sumCount" @click="handleOpenDrawer">
             <el-icon :size="20" color="#fff">
               <Opportunity />
             </el-icon>
           </el-badge>
+          <div style="margin:15px 0 15px 0;cursor: pointer;" v-else @click="handleOpenDrawer">
+            <el-icon :size="20" color="#fff">
+              <Opportunity />
+            </el-icon>
+          </div>
         </div>
         <!-- :value="12" -->
-        <el-badge :value="badgeNum" style="cursor: pointer" class="badge" @click="noticeTableModal = true">
-          <el-icon :size="20" color="#fff">
-            <BellFilled />
-          </el-icon>
-        </el-badge>
+        <div>
+          <el-badge :value="badgeNum" style="cursor: pointer" class="badge" v-if="badgeNum" @click="noticeTableModal = true">
+            <el-icon :size="20" color="#fff">
+              <BellFilled />
+            </el-icon>
+          </el-badge>
+          <div style="margin:15px 24px 15px 0" v-else @click="noticeTableModal = true">
+            <el-icon :size="20" color="#fff">
+              <BellFilled />
+            </el-icon>
+          </div>
+        </div>
+
         <notice v-model="noticeTableModal" @changeNum="(e) => (badgeNum = e)" @openNotice="noticeTableModal = true"></notice>
         <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
           <div class="dropdown-box" style="color:#fff">
@@ -185,6 +149,7 @@
         </el-dropdown>
       </div>
     </header>
+
     <el-drawer v-model="openDrawer" direction="rtl" :show-close="false" custom-class="drawerClass" modal-class="modelClass">
       <!-- <template #header>
         <h4>set title by slot</h4>
@@ -193,7 +158,7 @@
 
         <div class="job-box">
           <div style="margin-bottom:20px">
-            <TitleInfo :content="'工作事项'"></TitleInfo>
+            <TitleInfoOne :content="'工作事项'"></TitleInfoOne>
           </div>
           <div class="job-list">
             <div class="job-item" style="margin-right:5px" @click="handlePushRouter(1)">
@@ -307,7 +272,7 @@
 
         </div>
         <div style="margin:20px 0">
-          <TitleInfo :content="'通知提醒'"></TitleInfo>
+          <TitleInfoOne :content="'通知提醒'"></TitleInfoOne>
         </div>
         <div class="notice">
           <div class="item" v-for="(item,index) in noticeData" :key="item.id">
@@ -332,7 +297,9 @@ import { ElMessageBox, ElNotification, ElMessage } from "element-plus";
 import useUserStore from "@/store/modules/user";
 import "@/components/headerBar/header.scss";
 import notice from "@/components/notice/index";
-import TitleInfo from "@/components/TitleInfo/indexOne.vue";
+import TitleInfo from "@/components/TitleInfo/index.vue";
+import TitleInfoOne from "@/components/TitleInfo/indexOne.vue";
+import Sortable from "sortablejs";
 
 const router = useRouter();
 const userStore = useUserStore();
@@ -343,16 +310,16 @@ const sidebarRoutersCopy = ref([]);
 const isChildMenu = ref(false);
 const autoListChidrenNum = ref(0);
 const isEidtType = ref(false);
-const leftBanerType = ref(2);
+const leftBanerType = ref(1);
 const noticeTableModal = ref(false);
 const userData = ref(Cookies.get("nickName") || "");
 const commonsRouterList = ref([]);
 const activeLeftData = ref({});
 const openLeftBaner = (i, index) => {
-  leftBanerType.value = 1;
+  // leftBanerType.value = 1;
   activeLeftData.value = i;
   menuName.value = i.menuName;
-  routerInit(i);
+  // routerInit(i);
 };
 
 const badgeNum = ref(0);
@@ -366,6 +333,40 @@ const getLogo = () => {
   });
 };
 getLogo();
+
+const openMenuBox = () => {
+  isChildMenu.value = !isChildMenu.value;
+  nextTick(() => {
+    initSort();
+  });
+};
+
+const getCollectData = () => {
+  proxy.post("/sysUserMenu/list", { type: 1 }).then((res) => {
+    commonsRouterList.value = res;
+  });
+};
+
+const initSort = () => {
+  const el = document.getElementById("collect");
+  Sortable.create(el, {
+    onEnd({ newIndex, oldIndex }) {
+      if (newIndex == oldIndex) return;
+      commonsRouterList.value.splice(
+        newIndex,
+        0,
+        commonsRouterList.value.splice(oldIndex, 1)[0]
+      );
+      let newArray = commonsRouterList.value.slice(0);
+      commonsRouterList.value = [];
+      nextTick(() => {
+        commonsRouterList.value = newArray;
+        userMenuEdit();
+      });
+    },
+  });
+};
+
 const userMenuEdit = () => {
   proxy
     .post("/sysUserMenu/edit", {
@@ -373,14 +374,34 @@ const userMenuEdit = () => {
       menuIdList: commonsRouterList.value.map((item) => item.menuId),
     })
     .then((res) => {
-      ElMessage({
-        message: "保存成功",
-        type: "success",
-      });
-      isEidtType.value = false;
+      getCollectData();
+      // ElMessage({
+      //   message: "操作成功",
+      //   type: "success",
+      // });
     });
 };
 
+const editMenu = (menu) => {
+  let menuIndex = -1;
+  const flag = commonsRouterList.value.some((item, index) => {
+    if (item.menuId == menu.menuId) {
+      menuIndex = index;
+      return true;
+    }
+  });
+  if (flag) {
+    commonsRouterList.value.splice(menuIndex, 1);
+  } else {
+    commonsRouterList.value.push(menu);
+  }
+  userMenuEdit();
+};
+
+const isHaveCollect = (menu) => {
+  return commonsRouterList.value.some((item) => item.menuId == menu.menuId);
+};
+
 const deleteCommonsRouter = (i, index) => {
   commonsRouterList.value.splice(index, 1);
 };
@@ -526,6 +547,10 @@ onMounted(() => {
       };
     });
     sidebarRoutersCopy.value = proxy.handleTree(res.data, "menuId");
+    if (sidebarRoutersCopy.value && sidebarRoutersCopy.value.length > 0) {
+      openLeftBaner(sidebarRoutersCopy.value[0], 0);
+    }
+
     //循环删除 i.status != 0 || i.visible != 0 的元素
     sidebarRoutersCopy.value.map((item) => {
       if (item.children) {
@@ -541,9 +566,7 @@ onMounted(() => {
       }
     });
   });
-  proxy.post("/sysUserMenu/list", { type: 1 }).then((res) => {
-    commonsRouterList.value = res;
-  });
+  getCollectData();
   proxy.get("/statistics/workStatistics").then((res) => {
     for (const key in res.data) {
       res.data[key] = Number(res.data[key]);
@@ -586,7 +609,6 @@ const getNoticeData = () => {
     }
   });
   proxy.get("/statistics/getRecentPurchaseArrivalList").then((res) => {
-    console.log(res, "ss");
     if (res && res.data && res.data.length > 0) {
       noticeData.value = [
         ...noticeData.value,
@@ -621,6 +643,23 @@ const openDetails = (row) => {
     });
   }
 };
+
+const plugDowload = () => {
+  proxy.msgTip("请稍后", 2);
+  // 静态资源下载
+  fetch("/static/printer.zip")
+    .then((res) => res.blob())
+    .then((res) => {
+      const url = window.URL.createObjectURL(res);
+      let filename = "printer.zip";
+      const link = document.createElement("a");
+      link.style.display = "none";
+      link.href = url;
+      link.setAttribute("download", filename);
+      document.body.appendChild(link);
+      link.click();
+    });
+};
 </script>
 
 <style lang="scss">

+ 84 - 28
src/components/headerBar/header.scss

@@ -9,7 +9,7 @@
 }
 
 .header-bar {
-	background: #20222a;
+	background: #1b374c;
 	position: fixed;
 	top: 0;
 	left: 0;
@@ -57,7 +57,7 @@
 						height: 50px;
 						line-height: 50px;
 						padding: 0 50px;
-						font-size: 12px;
+						font-size: 16px;
 						cursor: pointer;
 					}
 
@@ -71,7 +71,7 @@
 					height: 50px;
 					padding: 0 20px;
 					line-height: 50px;
-					font-size: 14px;
+					font-size: 16px;
 					font-weight: bold;
 					background: #f9f9f9;
 					cursor: pointer;
@@ -84,6 +84,38 @@
 				}
 			}
 
+			.right-banner {
+				width: 300px;
+				height: 500px;
+				overflow-y: auto;
+				padding: 0 20px;
+
+				&::-webkit-scrollbar {
+					width: 2px !important;
+					height: 2px !important;
+				}
+
+				.first-order-title {
+					height: 50px;
+					line-height: 50px;
+					// color: #333333;
+					// font-size: 15px;
+					// font-weight: bold;
+				}
+
+				.collect {
+					.item {
+						margin-bottom: 10px;
+						font-size: 14px;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 2px 5px;
+						// border: 1px solid #eee;
+					}
+				}
+			}
+
 			.el-alert {
 				line-height: 20px;
 				text-align: center;
@@ -99,15 +131,19 @@
 		}
 
 		.menu-warp {
-			width: calc(100vw - 230px);
+			width: calc(100vw - 230px - 300px);
 			background: #fff;
 			// overflow: hidden;
 			box-sizing: border-box;
-			padding: 0 40px;
+			padding: 0 20px;
 			height: 500px;
 			// overflow-y: auto;
 			overflow: auto;
 
+			&::-webkit-scrollbar {
+				width: 2px !important;
+				height: 2px !important;
+			}
 
 			.btn-warp {
 				margin: 40px 0 20px;
@@ -182,30 +218,47 @@
 			}
 
 			.first-order-title {
-				height: 55px;
-				line-height: 55px;
-				color: #333333;
-				font-size: 15px;
-				font-weight: bold;
+				height: 50px;
+				line-height: 50px;
+				// color: #333333;
+				// font-size: 15px;
+				// font-weight: bold;
+			}
+
+			.aaa {
+				-moz-column-count: 4;
+				/* Firefox */
+				-webkit-column-count: 4;
+				/* Safari 和 Chrome */
+				column-count: 4;
+				-moz-column-gap: 50px;
+				-webkit-column-gap: 50px;
+				column-gap: 50px;
+
+				.bbb {
+					-moz-page-break-inside: avoid;
+					-webkit-column-break-inside: avoid;
+					break-inside: avoid;
+				}
 			}
 
 			.second-level {
-				height: 420px;
-				display: flex;
-				flex-wrap: wrap;
-				flex-direction: column;
-				flex-grow: 0;
-				flex-basis: auto;
-				float: left;
+				// height: 420px;
+				// display: flex;
+				// flex-wrap: wrap;
+				// flex-direction: column;
+				// flex-grow: 0;
+				// flex-basis: auto;
+				// float: left;
 			}
 
 			.menu-title {
 				font-weight: 600;
-				color: #0084ff;
+				color: #1b374c;
 				height: 40px;
 				line-height: 40px;
-				border-bottom: 1px solid #ddd;
-				font-size: 14px;
+				border-bottom: 1px solid #efebeb;
+				font-size: 15px;
 				width: 140px;
 				margin: 0 5vw 0 0;
 
@@ -217,19 +270,22 @@
 			}
 
 			.menu-ul {
-				float: left;
-				width: 140px;
-				list-style: none;
-				margin: 0 5vw 0 0;
-				padding: 0;
+				// float: left;
+				// width: 140px;
+				// list-style: none;
+				// margin: 0 5vw 0 0;
+				// padding: 0;
+				padding-left: 10px;
+				// display: flex;
+				// align-items: center;
 				height: 36px;
 				line-height: 36px;
-				font-size: 12px;
+				font-size: 14px;
 				font-weight: 400;
-				cursor: pointer;
+				// cursor: pointer;
 			}
 
-			.menu-ul:hover {
+			.menu-ul span:hover {
 				color: #0084ff;
 			}
 		}